refs #1665 Handle move notification type for Pleroma

h3poteto · Apr 10, 2023 · 03b15ae · 03b15ae
1 parent 12f6af5
commit 03b15ae
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 0 deletions.
diff --git a/megalodon/src/entities/notification.ts b/megalodon/src/entities/notification.ts
@@ -9,6 +9,7 @@ namespace Entity {
     status?: Status
     emoji?: string
     type: NotificationType
+    target?: Account
   }
 
   export type NotificationType = string

diff --git a/megalodon/src/notification.ts b/megalodon/src/notification.ts
@@ -11,6 +11,7 @@ namespace NotificationType {
   export const PollVote: Entity.NotificationType = 'poll_vote'
   export const PollExpired: Entity.NotificationType = 'poll_expired'
   export const Update: Entity.NotificationType = 'update'
+  export const Move: Entity.NotificationType = 'move'
 }
 
 export default NotificationType
diff --git a/megalodon/src/pleroma/api_client.ts b/megalodon/src/pleroma/api_client.ts
@@ -70,6 +70,8 @@ namespace PleromaAPI {
           return NotificationType.FollowRequest
         case PleromaNotificationType.Update:
           return NotificationType.Update
+        case PleromaNotificationType.Move:
+          return NotificationType.Move
         default:
           return t
       }
@@ -92,6 +94,8 @@ namespace PleromaAPI {
           return PleromaNotificationType.FollowRequest
         case NotificationType.Update:
           return PleromaNotificationType.Update
+        case NotificationType.Move:
+          return PleromaNotificationType.Move
         default:
           return t
       }
@@ -190,6 +194,14 @@ namespace PleromaAPI {
           status: status(n.status),
           type: decodeNotificationType(n.type)
         }
+      } else if (n.target) {
+        return {
+          id: n.id,
+          account: n.account,
+          created_at: n.created_at,
+          target: n.target,
+          type: decodeNotificationType(n.type)
+        }
       } else {
         return {
           id: n.id,

diff --git a/megalodon/src/pleroma/entities/notification.ts b/megalodon/src/pleroma/entities/notification.ts
@@ -9,6 +9,7 @@ namespace PleromaEntity {
     status?: Status
     emoji?: string
     type: NotificationType
+    target?: Account
   }
 
   export type NotificationType = string

diff --git a/megalodon/src/pleroma/notification.ts b/megalodon/src/pleroma/notification.ts
@@ -9,6 +9,7 @@ namespace PleromaNotificationType {
   export const PleromaEmojiReaction: PleromaEntity.NotificationType = 'pleroma:emoji_reaction'
   export const FollowRequest: PleromaEntity.NotificationType = 'follow_request'
   export const Update: PleromaEntity.NotificationType = 'update'
+  export const Move: PleromaEntity.NotificationType = 'move'
 }
 
 export default PleromaNotificationType
diff --git a/megalodon/test/unit/pleroma/api_client.spec.ts b/megalodon/test/unit/pleroma/api_client.spec.ts
@@ -58,6 +58,14 @@ describe('api_client', () => {
           {
             src: MegalodonNotificationType.FollowRequest,
             dist: PleromaNotificationType.FollowRequest
+          },
+          {
+            src: MegalodonNotificationType.Update,
+            dist: PleromaNotificationType.Update
+          },
+          {
+            src: MegalodonNotificationType.Move,
+            dist: PleromaNotificationType.Move
           }
         ]
         cases.forEach(c => {
@@ -95,6 +103,14 @@ describe('api_client', () => {
           {
             src: PleromaNotificationType.FollowRequest,
             dist: MegalodonNotificationType.FollowRequest
+          },
+          {
+            src: PleromaNotificationType.Update,
+            dist: MegalodonNotificationType.Update
+          },
+          {
+            src: PleromaNotificationType.Move,
+            dist: MegalodonNotificationType.Move
           }
         ]
         cases.forEach(c => {