MastodonBee - Account mapping fix and enhancement in events (#367)

muesli · Jan 28, 2021 · f20bfda · f20bfda
1 parent 7e793ce
commit f20bfda
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 6 deletions.
diff --git a/bees/mastodonbee/events.go b/bees/mastodonbee/events.go
@@ -109,9 +109,19 @@ func (mod *MastodonBee) handleNotification(notif *mastodon.Notification) {
 				},
 				{
 					Name:  "username",
+					Value: notif.Account.Username,
+					Type:  "string",
+				},
+				{
+					Name:  "display_name",
 					Value: notif.Account.DisplayName,
 					Type:  "string",
 				},
+				{
+					Name:  "acct",
+					Value: notif.Account.Acct,
+					Type:  "string",
+				},
 				{
 					Name:  "following",
 					Value: rel[0].Following,
@@ -153,9 +163,19 @@ func (mod *MastodonBee) handleNotification(notif *mastodon.Notification) {
 				},
 				{
 					Name:  "username",
+					Value: notif.Account.Username,
+					Type:  "string",
+				},
+				{
+					Name:  "display_name",
 					Value: notif.Account.DisplayName,
 					Type:  "string",
 				},
+				{
+					Name:  "acct",
+					Value: notif.Account.Acct,
+					Type:  "string",
+				},
 				{
 					Name:  "text",
 					Value: notif.Status.Content,
@@ -187,7 +207,17 @@ func (mod *MastodonBee) handleNotification(notif *mastodon.Notification) {
 				},
 				{
 					Name:  "username",
-					Value: notif.Status.Account.DisplayName,
+					Value: notif.Account.Username,
+					Type:  "string",
+				},
+				{
+					Name:  "display_name",
+					Value: notif.Account.DisplayName,
+					Type:  "string",
+				},
+				{
+					Name:  "acct",
+					Value: notif.Account.Acct,
 					Type:  "string",
 				},
 				{
@@ -226,7 +256,17 @@ func (mod *MastodonBee) handleNotification(notif *mastodon.Notification) {
 				},
 				{
 					Name:  "username",
-					Value: notif.Status.Account.DisplayName,
+					Value: notif.Account.Username,
+					Type:  "string",
+				},
+				{
+					Name:  "display_name",
+					Value: notif.Account.DisplayName,
+					Type:  "string",
+				},
+				{
+					Name:  "acct",
+					Value: notif.Account.Acct,
 					Type:  "string",
 				},
 				{

diff --git a/bees/mastodonbee/mastodonbeefactory.go b/bees/mastodonbee/mastodonbeefactory.go
@@ -175,7 +175,17 @@ func (factory *MastodonBeeFactory) Events() []bees.EventDescriptor {
 				},
 				{
 					Name:        "username",
-					Description: "Mastodon handle of the user which triggered the follow event",
+					Description: "Mastodon username of the user which triggered the follow event",
+					Type:        "string",
+				},
+				{
+					Name:        "display_name",
+					Description: "Mastodon display name of the user which triggered the follow event",
+					Type:        "string",
+				},
+				{
+					Name:        "acct",
+					Description: "Mastodon account of the user which triggered the follow event",
 					Type:        "string",
 				},
 				{
@@ -266,7 +276,17 @@ func (factory *MastodonBeeFactory) Events() []bees.EventDescriptor {
 				},
 				{
 					Name:        "username",
-					Description: "The Mastodon handle of the user that favourited your toot",
+					Description: "The Mastodon username of the user that favourited your toot",
+					Type:        "string",
+				},
+				{
+					Name:        "display_name",
+					Description: "The Mastodon display name of the user that favourited your toot",
+					Type:        "string",
+				},
+				{
+					Name:        "acct",
+					Description: "The Mastodon account of the user that favourited your toot",
 					Type:        "string",
 				},
 				{
@@ -335,7 +355,17 @@ func (factory *MastodonBeeFactory) Events() []bees.EventDescriptor {
 				},
 				{
 					Name:        "username",
-					Description: "Mastodon handle of the user that reblogged your toot",
+					Description: "Mastodon username of the user that reblogged your toot",
+					Type:        "string",
+				},
+				{
+					Name:        "display_name",
+					Description: "Mastodon display name of the user that reblogged your toot",
+					Type:        "string",
+				},
+				{
+					Name:        "acct",
+					Description: "Mastodon account of the user that reblogged your toot",
 					Type:        "string",
 				},
 				{
@@ -404,7 +434,17 @@ func (factory *MastodonBeeFactory) Events() []bees.EventDescriptor {
 				},
 				{
 					Name:        "username",
-					Description: "The Mastodon handle of the mention's author",
+					Description: "The Mastodon username of the mention's author",
+					Type:        "string",
+				},
+				{
+					Name:        "display_name",
+					Description: "The Mastodon display_name of the mention's author",
+					Type:        "string",
+				},
+				{
+					Name:        "acct",
+					Description: "The Mastodon account of the mention's author",
 					Type:        "string",
 				},
 				{