From 819b76026101ddc0363118f240049a0019ebb4d6 Mon Sep 17 00:00:00 2001
From: Ilja <ilja@ilja.space>
Date: Sat, 26 Feb 2022 01:53:01 +0100
Subject: [PATCH] Fix up and code review

* Check if it works properly
    * Notifs are shown as BE returns them
    * The Interaction view has Reports, but only when you're mod or admin
* Do some extra translations
* Fix some console spam
---
 src/components/interactions/interactions.js         |  3 ++-
 src/i18n/en.json                                    |  2 ++
 src/i18n/nl.json                                    | 13 +++++++++++++
 src/modules/reports.js                              |  5 +----
 src/services/api/api.service.js                     |  3 ++-
 .../notification_utils/notification_utils.js        |  2 +-
 .../notifications_fetcher.service.js                |  4 +---
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js
index 54275a7b..53ec7d49 100644
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@@ -13,7 +13,8 @@ const Interactions = {
   data () {
     return {
       allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
-      filterMode: tabModeDict['mentions']
+      filterMode: tabModeDict['mentions'],
+      canSeeReports: ['moderator', 'admin'].includes(this.$store.state.users.currentUser.role)
     }
   },
   methods: {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 3bdd42e3..9e74840f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -176,6 +176,8 @@
   "interactions": {
     "favs_repeats": "Repeats and Favorites",
     "follows": "New follows",
+    "emoji_reactions": "Emoji Reactions",
+    "reports": "Reports",
     "moves": "User migrates",
     "load_older": "Load older interactions"
   },
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index a01e57a0..8da07ac7 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -661,6 +661,8 @@
   "interactions": {
     "favs_repeats": "Herhalingen en Favorieten",
     "follows": "Nieuwe volgingen",
+    "emoji_reactions": "Emoji Reacties",
+    "reports": "Rapportages",
     "moves": "Gebruiker migreert",
     "load_older": "Oudere interacties laden"
   },
@@ -669,6 +671,17 @@
     "error": "Niet gevonden.",
     "remote_user_resolver": "Externe gebruikers zoeker"
   },
+  "report": {
+    "reporter": "Reporteerder:",
+    "reported_user": "Gerapporteerde gebruiker:",
+    "reported_statuses": "Gerapporteerde statussen:",
+    "notes": "Notas:",
+    "state": "Status:",
+    "state_open": "Open",
+    "state_closed": "Gesloten",
+    "state_resolved": "Opgelost"
+  },
+
   "selectable_list": {
     "select_all": "Alles selecteren"
   },
diff --git a/src/modules/reports.js b/src/modules/reports.js
index b25e9ee9..925792c0 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -43,11 +43,8 @@ const reports = {
     },
     setReportState ({ commit, dispatch, rootState }, { id, state }) {
       const oldState = rootState.reports.reports[id].state
-      console.log(oldState, state)
       commit('setReportState', { id, state })
-      rootState.api.backendInteractor.setReportState({ id, state }).then(report => {
-        console.log(report)
-      }).catch(e => {
+      rootState.api.backendInteractor.setReportState({ id, state }).catch(e => {
         console.error('Failed to set report state', e)
         dispatch('pushGlobalNotice', {
           level: 'error',
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index e60010fe..27ea5199 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1270,7 +1270,8 @@ const deleteChatMessage = ({ chatId, messageId, credentials }) => {
 }
 
 const setReportState = ({ id, state, credentials }) => {
-  // Can't use promisedRequest because on OK this does not return json
+  // TODO: Can't use promisedRequest because on OK this does not return json
+  // See https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1322
   return fetch(PLEROMA_ADMIN_REPORTS, {
     headers: {
       ...authHeaders(credentials),
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index dff97aa2..b338eb8b 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -93,7 +93,7 @@ export const prepareNotificationObject = (notification, i18n) => {
       i18nString = 'follow_request'
       break
     case 'pleroma:report':
-      i18nString = 'reported'
+      i18nString = 'submitted_report'
       break
   }
 
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 2da6d646..4ecb348e 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -24,9 +24,7 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
   const timelineData = rootState.statuses.notifications
   const hideMutedPosts = getters.mergedConfig.hideMutedPosts
 
-  if (rootState.users.currentUser.role === 'admin') {
-    args['includeTypes'] = mastoApiNotificationTypes
-  }
+  args['includeTypes'] = mastoApiNotificationTypes
   args['withMuted'] = !hideMutedPosts
 
   args['timeline'] = 'notifications'