Parse pleroma custom emoji reactions in notifications

example/typescript/src/pleroma/mentions.ts

@@ -18,7 +18,7 @@ const excludes: Array<string> = [
   NotificationType.Reblog,
   NotificationType.PollVote,
   NotificationType.PollExpired,
-  NotificationType.EmojiReaction
+  NotificationType.Reaction
 ]
 
 client.getNotifications({ min_id: '9318', limit: 30, exclude_types: excludes }).then(res => console.log(res.data))

megalodon/src/entities/notification.ts

@@ -7,7 +7,6 @@ export type Notification = {
   created_at: string
   id: string
   status?: Status
-  emoji?: string
   reaction?: Reaction
   type: NotificationType
   target?: Account

megalodon/src/entities/reaction.ts

@@ -7,4 +7,5 @@ export type Reaction = {
   url?: string
   static_url?: string
   accounts?: Array<Account>
+  account_ids?: Array<string>
 }

megalodon/src/notification.ts

@@ -6,7 +6,6 @@ namespace NotificationType {
   export const Reblog: Entity.NotificationType = 'reblog'
   export const Mention: Entity.NotificationType = 'mention'
   export const Reaction: Entity.NotificationType = 'reaction'
-  export const EmojiReaction: Entity.NotificationType = 'emoji_reaction'
   export const FollowRequest: Entity.NotificationType = 'follow_request'
   export const Status: Entity.NotificationType = 'status'
   export const PollVote: Entity.NotificationType = 'poll_vote'

megalodon/src/pleroma/api_client.ts

@@ -67,7 +67,7 @@ namespace PleromaAPI {
         case PleromaNotificationType.Poll:
           return NotificationType.PollExpired
         case PleromaNotificationType.PleromaEmojiReaction:
-          return NotificationType.EmojiReaction
+          return NotificationType.Reaction
         case PleromaNotificationType.FollowRequest:
           return NotificationType.FollowRequest
         case PleromaNotificationType.Update:
@@ -92,7 +92,7 @@ namespace PleromaAPI {
           return PleromaNotificationType.Mention
         case NotificationType.PollExpired:
           return PleromaNotificationType.Poll
-        case NotificationType.EmojiReaction:
+        case NotificationType.Reaction:
           return PleromaNotificationType.PleromaEmojiReaction
         case NotificationType.FollowRequest:
           return PleromaNotificationType.FollowRequest
@@ -257,12 +257,13 @@ namespace PleromaAPI {
       const notificationType = decodeNotificationType(n.type)
       if (notificationType instanceof UnknownNotificationTypeError) return notificationType
       if (n.status && n.emoji) {
+        const r = mapReaction(n)
         return {
           id: n.id,
           account: account(n.account),
           created_at: n.created_at,
           status: status(n.status),
-          emoji: n.emoji,
+          reaction: r ? reaction(r) : undefined,
           type: notificationType
         }
       } else if (n.status) {
@@ -290,21 +291,49 @@ namespace PleromaAPI {
         }
       }
     }
+
+    export const mapReaction = (n: Entity.Notification): Entity.Reaction | undefined => {
+      if (!n.emoji) return undefined
+      const name = n.emoji.replace(/:/g, '')
+      let r = {
+        count: 1,
+        me: false,
+        name: name
+      }
+      if (n.emoji_url) {
+        r = Object.assign({}, r, {
+          url: n.emoji_url
+        })
+      }
+      return r
+    }
+
     export const poll = (p: Entity.Poll): MegalodonEntity.Poll => p
     export const pollOption = (p: Entity.PollOption): MegalodonEntity.PollOption => p
     export const preferences = (p: Entity.Preferences): MegalodonEntity.Preferences => p
     export const push_subscription = (p: Entity.PushSubscription): MegalodonEntity.PushSubscription => p
     export const reaction = (r: Entity.Reaction): MegalodonEntity.Reaction => {
-      const p = {
+      let p = {
         count: r.count,
         me: r.me,
         name: r.name
       }
+      if (r.url) {
+        p = Object.assign({}, p, {
+          url: r.url,
+          static_url: r.url
+        })
+      }
       if (r.accounts) {
-        return Object.assign({}, p, {
+        p = Object.assign({}, p, {
           accounts: r.accounts.map(a => account(a))
         })
       }
+      if (r.account_ids) {
+        p = Object.assign({}, p, {
+          accounts: r.account_ids
+        })
+      }
       return p
     }
     export const relationship = (r: Entity.Relationship): MegalodonEntity.Relationship => ({

megalodon/src/pleroma/entities/notification.ts

@@ -7,6 +7,7 @@ export type Notification = {
   id: string
   status?: Status
   emoji?: string
+  emoji_url?: string
   type: NotificationType
   target?: Account
 }

megalodon/src/pleroma/entities/reaction.ts

@@ -5,4 +5,6 @@ export type Reaction = {
   me: boolean
   name: string
   accounts?: Array<Account>
+  account_ids?: Array<string>
+  url?: string
 }

megalodon/test/integration/pleroma.spec.ts

@@ -180,7 +180,7 @@ describe('getNotifications', () => {
     },
     {
       event: emojiReaction,
-      expected: MegalodonNotificationType.EmojiReaction,
+      expected: MegalodonNotificationType.Reaction,
       title: 'emojiReaction'
     },
     {

megalodon/test/unit/pleroma/api_client.spec.ts

@@ -62,7 +62,7 @@ describe('api_client', () => {
             dist: PleromaNotificationType.Poll
           },
           {
-            src: MegalodonNotificationType.EmojiReaction,
+            src: MegalodonNotificationType.Reaction,
             dist: PleromaNotificationType.PleromaEmojiReaction
           },
           {
@@ -108,7 +108,7 @@ describe('api_client', () => {
           },
           {
             src: PleromaNotificationType.PleromaEmojiReaction,
-            dist: MegalodonNotificationType.EmojiReaction
+            dist: MegalodonNotificationType.Reaction
           },
           {
             src: PleromaNotificationType.FollowRequest,