pleroma-fe

commit: 15bed586dcd1d10a6a05c664cf5bab72cdbf2a46
parent fa2884a8052bfe4f4d9d069ff9d1d15765c3bba8
Author: Shpuld Shpuldson <shp@cock.li>
Date:   Sun, 15 Nov 2020 13:57:02 +0200

report notification wip

Diffstat:
M
src/components/interactions/interactions.js
2
++
M
src/components/interactions/interactions.vue
9
+++++++++
M
src/services/entity_normalizer/entity_normalizer.service.js
7
+++++++
M
src/services/notification_utils/notification_utils.js
6
+++++-

4 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js
@@ -4,6 +4,8 @@ const tabModeDict = {
   mentions: ['mention'],
   'likes+repeats': ['repeat', 'like'],
   follows: ['follow'],
+  reactions: ['pleroma:emoji_reaction'],
+  reports: ['pleroma:report'],
   moves: ['move']
 }
 
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue
@@ -22,6 +22,15 @@
         :label="$t('interactions.follows')"
       />
       <span
+        key="reactions"
+        :label="$t('interactions.emoji_reactions')"
+      />
+      <span
+        v-if="canSeeReports"
+        key="reports"
+        :label="$t('interactions.reports')"
+      />
+      <span
         v-if="!allowFollowingMove"
         key="moves"
         :label="$t('interactions.moves')"
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -367,6 +367,13 @@ export const parseNotification = (data) => {
       : parseUser(data.target)
     output.from_profile = parseUser(data.account)
     output.emoji = data.emoji
+    if (data.report) {
+      output.report = data.report
+      output.report.content = data.report.content
+      output.report.acct = parseUser(data.report.acct)
+      output.report.actor = parseUser(data.report.actor)
+      output.report.statuses = data.report.statuses.map(parseStatus)
+    }
   } else {
     const parsedNotice = parseStatus(data.notice)
     output.type = data.ntype
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
@@ -14,7 +14,8 @@ export const visibleTypes = store => {
     rootState.config.notificationVisibility.follows && 'follow',
     rootState.config.notificationVisibility.followRequest && 'follow_request',
     rootState.config.notificationVisibility.moves && 'move',
-    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
+    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
+    rootState.config.notificationVisibility.reports && 'pleroma:report'
   ].filter(_ => _))
 }
 
@@ -91,6 +92,9 @@ export const prepareNotificationObject = (notification, i18n) => {
     case 'follow_request':
       i18nString = 'follow_request'
       break
+    case 'pleroma:report':
+      i18nString = 'reported'
+      break
   }
 
   if (notification.type === 'pleroma:emoji_reaction') {