From c6c844f3fd7d4e01e6a7ffb0e18e5718353af02d Mon Sep 17 00:00:00 2001
From: Nikita Karamov <me@kytta.dev>
Date: Wed, 3 May 2023 17:01:35 +0200
Subject: [PATCH] fix: notification templates for admin reports (#2045)

Co-authored-by: patak <matias.capeletto@gmail.com>
Co-authored-by: Daniel Roe <daniel@roe.dev>
---
 components/notification/NotificationCard.vue | 17 +++++++++++++++++
 composables/masto/routes.ts                  |  4 ++++
 locales/de-DE.json                           |  1 +
 locales/en.json                              |  1 +
 locales/ru-RU.json                           |  1 +
 package.json                                 |  2 +-
 pnpm-lock.yaml                               |  8 ++++----
 7 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index ed48ed4d..8f456f5d 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -39,6 +39,23 @@ const { notification } = defineProps<{
         <span>{{ $t("notification.signed_up") }}</span>
       </div>
     </template>
+    <template v-else-if="notification.type === 'admin.report'">
+      <NuxtLink :to="getReportRoute(notification.report?.id!)">
+        <div flex p3 items-center bg-shaded>
+          <div i-ri:flag-fill me-1 color-purple />
+          <i18n-t keypath="notification.reported">
+            <AccountDisplayName
+              :account="notification.account"
+              text-purple me-1 font-bold line-clamp-1 ws-pre-wrap break-all
+            />
+            <AccountDisplayName
+              :account="notification.report?.targetAccount!"
+              text-purple ms-1 font-bold line-clamp-1 ws-pre-wrap break-all
+            />
+          </i18n-t>
+        </div>
+      </NuxtLink>
+    </template>
     <template v-else-if="notification.type === 'follow_request'">
       <div flex ms-4 items-center class="-top-2.5" absolute inset-ie-2 px-2>
         <div i-ri:user-follow-fill text-xl me-1 />
diff --git a/composables/masto/routes.ts b/composables/masto/routes.ts
index 9bce5e1b..f2a4d8d0 100644
--- a/composables/masto/routes.ts
+++ b/composables/masto/routes.ts
@@ -29,6 +29,10 @@ export function getAccountFollowersRoute(account: mastodon.v1.Account) {
   })
 }
 
+export function getReportRoute(id: string | number) {
+  return `https://${currentUser.value?.server}/admin/reports/${encodeURIComponent(id)}`
+}
+
 export function getStatusRoute(status: mastodon.v1.Status) {
   return useRouter().resolve({
     name: 'status',
diff --git a/locales/de-DE.json b/locales/de-DE.json
index 5dc480fe..a537dadb 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -196,6 +196,7 @@
     "followed_you_count": "{n} Account folgt dir|{n} Accounts folgen dir",
     "missing_type": "Fehlender notification.type:",
     "reblogged_post": "hat deinen Beitrag geteilt",
+    "reported": "{0} hat {1} gemeldet",
     "request_to_follow": "möchte dir folgen",
     "signed_up": "hat sich registriert",
     "update_status": "hat diesen Beitrag aktualisiert"
diff --git a/locales/en.json b/locales/en.json
index 585882aa..810540dd 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -295,6 +295,7 @@
     "followed_you_count": "{0} people followed you|{0} person followed you|{0} people followed you",
     "missing_type": "MISSING notification.type:",
     "reblogged_post": "boosted your post",
+    "reported": "{0} reported {1}",
     "request_to_follow": "requested to follow you",
     "signed_up": "signed up",
     "update_status": "updated their post"
diff --git a/locales/ru-RU.json b/locales/ru-RU.json
index 0eec1898..9a1ec0d3 100644
--- a/locales/ru-RU.json
+++ b/locales/ru-RU.json
@@ -219,6 +219,7 @@
     "followed_you_count": "{0} читатель|{0} читателя|{0} читателей|{0} читателей",
     "missing_type": "ОТСУТСТВУЕТ notification.type:",
     "reblogged_post": "сделали реблог вашего поста",
+    "reported": "{0} пожаловался на {1}",
     "request_to_follow": "запрос на чтение",
     "signed_up": "зарегистрировались",
     "update_status": "обновили свой пост"
diff --git a/package.json b/package.json
index 3c8ee63a..e70158d5 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "iso-639-1": "^2.1.15",
     "js-yaml": "^4.1.0",
     "lru-cache": "^9.0.1",
-    "masto": "^5.11.1",
+    "masto": "^5.11.3",
     "nuxt-security": "^0.13.0",
     "nuxt-vitest": "^0.6.10",
     "page-lifecycle": "^0.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9edfe642..c3e51335 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -142,8 +142,8 @@ importers:
         specifier: ^9.0.1
         version: 9.0.1
       masto:
-        specifier: ^5.11.1
-        version: 5.11.1
+        specifier: ^5.11.3
+        version: 5.11.3
       nuxt-security:
         specifier: ^0.13.0
         version: 0.13.0(patch_hash=4zi7vnypkav7i5l74w6qfcndqy)(rollup@2.79.1)
@@ -9121,8 +9121,8 @@ packages:
     resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
     dev: true
 
-  /masto@5.11.1:
-    resolution: {integrity: sha512-M9sVPrac9VyzYL8MgunZBudiaKbQwCg96lGXxB57rFlH7xrjjXXvEaPhHF+3xnR27mnCaeA1FskyN0npRg8W4Q==}
+  /masto@5.11.3:
+    resolution: {integrity: sha512-GtSnrqm5fHPaaU0iwag4LCmvpp82rDng6yOZinmOJHHlUfo6Gnq5QY6x3lJCxCnsPIXpTu1yaX42bWrSQyoQPA==}
     dependencies:
       '@mastojs/ponyfills': 1.0.4
       change-case: 4.1.2