From 668a84f32706c02d653fae4ac6897bdb1c3216d4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 20 Feb 2020 15:57:29 +0200
Subject: [PATCH] Change move namespacing, fix some emoji reactions related
 problems not noticed before

---
 src/components/interactions/interactions.js                 | 3 ++-
 src/components/interactions/interactions.vue                | 4 ++++
 src/components/notification/notification.vue                | 6 +++---
 src/i18n/en.json                                            | 1 +
 src/modules/statuses.js                                     | 6 +++---
 src/services/entity_normalizer/entity_normalizer.service.js | 4 ++--
 src/services/notification_utils/notification_utils.js       | 2 +-
 src/services/push/push.js                                   | 3 ++-
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js
index 7fe5e76d..9bac3d8d 100644
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@@ -4,7 +4,8 @@ const tabModeDict = {
   mentions: ['mention'],
   'likes+repeats': ['repeat', 'like'],
   follows: ['follow'],
-  moves: ['move']
+  moves: ['pleroma:move'],
+  emoji_reactions: ['pleroma:emoji_reaction']
 }
 
 const Interactions = {
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
index 57d5d87c..c586fce3 100644
--- a/src/components/interactions/interactions.vue
+++ b/src/components/interactions/interactions.vue
@@ -26,6 +26,10 @@
         key="moves"
         :label="$t('interactions.moves')"
       />
+      <span
+        key="emoji_reactions"
+        :label="$t('interactions.emoji_reactions')"
+      />
     </tab-switcher>
     <Notifications
       ref="notifications"
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 411c0271..edff28c9 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -74,7 +74,7 @@
               <i class="fa icon-user-plus lit" />
               <small>{{ $t('notifications.followed_you') }}</small>
             </span>
-            <span v-if="notification.type === 'move'">
+            <span v-if="notification.type === 'pleroma:move'">
               <i class="fa icon-arrow-curved lit" />
               <small>{{ $t('notifications.migrated_to') }}</small>
             </span>
@@ -87,7 +87,7 @@
             </span>
           </div>
           <div
-            v-if="notification.type === 'follow' || notification.type === 'move'"
+            v-if="notification.type === 'follow' || notification.type === 'pleroma:move'"
             class="timeago"
           >
             <span class="faint">
@@ -127,7 +127,7 @@
           </router-link>
         </div>
         <div
-          v-else-if="notification.type === 'move'"
+          v-else-if="notification.type === 'pleroma:move'"
           class="move-text"
         >
           <router-link :to="targetUserProfileLink">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 82acc1ab..06b602fb 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -161,6 +161,7 @@
     "favs_repeats": "Repeats and Favorites",
     "follows": "New follows",
     "moves": "User migrates",
+    "emoji_reactions": "Reactions",
     "load_older": "Load older interactions"
   },
   "post_status": {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 25b62ac7..f1286b72 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -81,8 +81,8 @@ const visibleNotificationTypes = (rootState) => {
     rootState.config.notificationVisibility.mentions && 'mention',
     rootState.config.notificationVisibility.repeats && 'repeat',
     rootState.config.notificationVisibility.follows && 'follow',
-    rootState.config.notificationVisibility.moves && 'move',
-    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reactions'
+    rootState.config.notificationVisibility.moves && 'pleroma:move',
+    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
   ].filter(_ => _)
 }
 
@@ -358,7 +358,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
           case 'follow':
             i18nString = 'followed_you'
             break
-          case 'move':
+          case 'pleroma:move':
             i18nString = 'migrated_to'
             break
         }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 84169a7b..820761ad 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -346,11 +346,11 @@ export const parseNotification = (data) => {
   if (masto) {
     output.type = mastoDict[data.type] || data.type
     output.seen = data.pleroma.is_seen
-    output.status = output.type === 'follow' || output.type === 'move'
+    output.status = output.type === 'follow' || output.type === 'pleroma:move'
       ? null
       : parseStatus(data.status)
     output.action = output.status // TODO: Refactor, this is unneeded
-    output.target = output.type !== 'move'
+    output.target = output.type !== 'pleroma:move'
       ? null
       : parseUser(data.target)
     output.from_profile = parseUser(data.account)
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index b17bd7bf..d842a36a 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -7,7 +7,7 @@ export const visibleTypes = store => ([
   store.state.config.notificationVisibility.mentions && 'mention',
   store.state.config.notificationVisibility.repeats && 'repeat',
   store.state.config.notificationVisibility.follows && 'follow',
-  store.state.config.notificationVisibility.moves && 'move',
+  store.state.config.notificationVisibility.moves && 'pleroma:move',
   store.state.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
 ].filter(_ => _))
 
diff --git a/src/services/push/push.js b/src/services/push/push.js
index 5836fc26..a83fe29e 100644
--- a/src/services/push/push.js
+++ b/src/services/push/push.js
@@ -66,7 +66,8 @@ function sendSubscriptionToBackEnd (subscription, token, notificationVisibility)
           favourite: notificationVisibility.likes,
           mention: notificationVisibility.mentions,
           reblog: notificationVisibility.repeats,
-          move: notificationVisibility.moves
+          'pleroma:move': notificationVisibility.moves,
+          'pleroma:emoji_reaction': notificationVisibility.emoji_reactions
         }
       }
     })