From 5a4ad5b56cb7a91ea9151976994ce1c32406a713 Mon Sep 17 00:00:00 2001
From: fumnanya <fmowete@outlook.com>
Date: Mon, 13 Jan 2025 19:19:16 +0100
Subject: [PATCH 1/5] WIP: add `severed_relationships`

---
 components/notification/NotificationCard.vue  | 11 +++++++
 .../RelationshipSeveranceCard.vue             | 29 +++++++++++++++++++
 locales/en.json                               |  5 ++++
 3 files changed, 45 insertions(+)
 create mode 100644 components/notification/RelationshipSeveranceCard.vue

diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index d919942ddc..25a5af95a2 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
+import RelationshipSeveranceCard from '~/components/notification/RelationshipSeveranceCard.vue'
 
 // Add undocumented 'annual_report' type introduced in v4.3
 // ref. https://github.com/mastodon/documentation/issues/1211#:~:text=api/v1/annual_reports
@@ -25,6 +26,7 @@ const supportedNotificationTypes: NotificationType[] = [
   'update',
   'status',
   'annual_report',
+  'severed_relationships',
 ]
 
 // well-known emoji reactions types Elk does not support yet
@@ -32,6 +34,7 @@ const unsupportedEmojiReactionTypes = ['pleroma:emoji_reaction', 'reaction']
 
 if (unsupportedEmojiReactionTypes.includes(notification.type) || !supportedNotificationTypes.includes(notification.type)) {
   console.warn(`[DEV] ${t('notification.missing_type')} '${notification.type}' (notification.id: ${notification.id})`)
+  console.warn(notification)
 }
 </script>
 
@@ -134,5 +137,13 @@ if (unsupportedEmojiReactionTypes.includes(notification.type) || !supportedNotif
         </div>
       </div>
     </template>
+    <template v-else-if="notification.type === 'severed_relationships'">
+      <div flex p4 items-center>
+        <div i-material-symbols:heart-broken-outline-rounded text-xl me-4 color-red />
+        <div class="content-rich">
+          <RelationshipSeveranceCard :event="notification.event!" />
+        </div>
+      </div>
+    </template>
   </article>
 </template>
diff --git a/components/notification/RelationshipSeveranceCard.vue b/components/notification/RelationshipSeveranceCard.vue
new file mode 100644
index 0000000000..806ca4239a
--- /dev/null
+++ b/components/notification/RelationshipSeveranceCard.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+const { event } = defineProps<{
+  event: object
+}>()
+
+const { t } = useI18n()
+
+const type = event.type
+const from = currentServer
+const target = event.targetName
+const followers = event.followersCount
+const following = event.followingCount
+</script>
+
+<template>
+  <p v-if="type === 'account_suspension'">
+    {{ t('notification.relationship_severance.account_suspension', [from, target]) }}
+  </p>
+  <p v-else-if="type === 'domain_block'">
+    {{ t('notification.relationship_severance.domain_block', { from, target, followers, n: following }) }}
+  </p>
+  <p v-else-if="type === 'user_domain_block'">
+    {{ t("notification.relationship_severance.user_domain_block", { target, followers, n: following }) }}
+  </p>
+
+  <NuxtLink :to="`https://${currentServer}/severed_relationships`" target="_blank">
+    Learn more
+  </NuxtLink>
+</template>
diff --git a/locales/en.json b/locales/en.json
index 20520aa09d..dab00d31a9 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -339,6 +339,11 @@
     "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",
+    "relationship_severance": {
+      "account_suspension": "An admin from {0} has suspended {1}, which means you can no longer receive updates from them or interact with them.",
+      "domain_block": "An admin from {from} has blocked {target}, including {followers} of your followers and {n} account you follow.|An admin from {from} has blocked {target}, including {followers} of your followers and {n} accounts you follow.",
+      "user_domain_block": "You have blocked {target}, removing {followers} of your followers and {n} account you follow.|You have blocked {target}, removing {followers} of your followers and {n} accounts you follow."
+    },
     "reported": "{0} reported {1}",
     "request_to_follow": "requested to follow you",
     "signed_up": "signed up",

From 5aa2b31ecb6db85acf5fd1b1908e42e162199a48 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Fri, 17 Jan 2025 22:11:39 +0900
Subject: [PATCH 2/5] fix: resolve typecheck errors

---
 components/notification/NotificationCard.vue          |  7 +++++++
 components/notification/RelationshipSeveranceCard.vue | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 25a5af95a2..c5c50dac3e 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -141,6 +141,13 @@ if (unsupportedEmojiReactionTypes.includes(notification.type) || !supportedNotif
       <div flex p4 items-center>
         <div i-material-symbols:heart-broken-outline-rounded text-xl me-4 color-red />
         <div class="content-rich">
+          <!--
+            @vue-ignore
+            The type inference failed here (`any`) but since notification type is `severed_relationships`,
+            we are sure `typeof notification === SeveredRelationshipsNotification` here.
+            So we can assume the existence of `event` prop.
+            ref. https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event
+          -->
           <RelationshipSeveranceCard :event="notification.event!" />
         </div>
       </div>
diff --git a/components/notification/RelationshipSeveranceCard.vue b/components/notification/RelationshipSeveranceCard.vue
index 806ca4239a..5adc0dc467 100644
--- a/components/notification/RelationshipSeveranceCard.vue
+++ b/components/notification/RelationshipSeveranceCard.vue
@@ -1,6 +1,14 @@
 <script setup lang="ts">
+import type { mastodon } from 'masto'
+
+// TODO: masto.js needs to update those two props modified in Mastodon v4.3+
+// ref. RelationshipSeveranceEvent - Mastodon documentation
+// - https://docs.joinmastodon.org/entities/RelationshipSeveranceEvent/
 const { event } = defineProps<{
-  event: object
+  event: mastodon.v1.RelationshipSeveranceEvent & {
+    followersCount?: number | null
+    followingCount?: number | null
+  }
 }>()
 
 const { t } = useI18n()

From 0f9d9bd0f4264368fa27380ddaf7d7bd5d2a38fd Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sun, 19 Jan 2025 21:08:19 +0900
Subject: [PATCH 3/5] chore: update masto.js to v6.10.3

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index f22b416eb7..8b8f1b4546 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "iso-639-1": "^3.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^11.0.0",
-    "masto": "^6.10.1",
+    "masto": "^6.10.3",
     "node-emoji": "^2.1.3",
     "nuxt-security": "^2.0.0",
     "page-lifecycle": "^0.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f1caf8b245..751c0bb600 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -173,8 +173,8 @@ importers:
         specifier: ^11.0.0
         version: 11.0.0
       masto:
-        specifier: ^6.10.1
-        version: 6.10.1
+        specifier: ^6.10.3
+        version: 6.10.3
       node-emoji:
         specifier: ^2.1.3
         version: 2.1.3
@@ -6675,8 +6675,8 @@ packages:
   markdown-table@3.0.3:
     resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==}
 
-  masto@6.10.1:
-    resolution: {integrity: sha512-CBEAvWJfMLMgk0cURSGU/fRJDcFEZWo1LBfVYztBNEOyijoedQh4htKaon+XCE4aT7TLYPqOLmcllXwMjOvztA==}
+  masto@6.10.3:
+    resolution: {integrity: sha512-/ajJpdH0jXEqEBgSDTzYc4RS5CcDR0AGtweQmWNAaaFagdBHiNtJZHr7xFvdhR88C83qxispIGYNkLaL2GWumg==}
 
   md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
@@ -17671,7 +17671,7 @@ snapshots:
 
   markdown-table@3.0.3: {}
 
-  masto@6.10.1:
+  masto@6.10.3:
     dependencies:
       change-case: 4.1.2
       events-to-async: 2.0.1

From 2819e7934c36d8ca3bb695ac987d2ae76df7ac8d Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sun, 19 Jan 2025 21:10:09 +0900
Subject: [PATCH 4/5] chore: revert workaround of type patch on
 `mastodon.v1.RelationshipSeveranceEvent`

---
 components/notification/RelationshipSeveranceCard.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/components/notification/RelationshipSeveranceCard.vue b/components/notification/RelationshipSeveranceCard.vue
index 5adc0dc467..0395fb4209 100644
--- a/components/notification/RelationshipSeveranceCard.vue
+++ b/components/notification/RelationshipSeveranceCard.vue
@@ -1,14 +1,8 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 
-// TODO: masto.js needs to update those two props modified in Mastodon v4.3+
-// ref. RelationshipSeveranceEvent - Mastodon documentation
-// - https://docs.joinmastodon.org/entities/RelationshipSeveranceEvent/
 const { event } = defineProps<{
-  event: mastodon.v1.RelationshipSeveranceEvent & {
-    followersCount?: number | null
-    followingCount?: number | null
-  }
+  event: mastodon.v1.RelationshipSeveranceEvent
 }>()
 
 const { t } = useI18n()

From fc89b71d2227fa63dcb5b508ca47a97b5ed41d99 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Sat, 1 Feb 2025 15:50:46 +0900
Subject: [PATCH 5/5] i18n: make "Learn more" string translatable

---
 components/notification/RelationshipSeveranceCard.vue | 2 +-
 locales/en.json                                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/notification/RelationshipSeveranceCard.vue b/components/notification/RelationshipSeveranceCard.vue
index 0395fb4209..d2da10cb39 100644
--- a/components/notification/RelationshipSeveranceCard.vue
+++ b/components/notification/RelationshipSeveranceCard.vue
@@ -26,6 +26,6 @@ const following = event.followingCount
   </p>
 
   <NuxtLink :to="`https://${currentServer}/severed_relationships`" target="_blank">
-    Learn more
+    {{ t("notification.relationship_severance.learn_more") }}
   </NuxtLink>
 </template>
diff --git a/locales/en.json b/locales/en.json
index dab00d31a9..fd4af5174b 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -342,6 +342,7 @@
     "relationship_severance": {
       "account_suspension": "An admin from {0} has suspended {1}, which means you can no longer receive updates from them or interact with them.",
       "domain_block": "An admin from {from} has blocked {target}, including {followers} of your followers and {n} account you follow.|An admin from {from} has blocked {target}, including {followers} of your followers and {n} accounts you follow.",
+      "learn_more": "Learn more",
       "user_domain_block": "You have blocked {target}, removing {followers} of your followers and {n} account you follow.|You have blocked {target}, removing {followers} of your followers and {n} accounts you follow."
     },
     "reported": "{0} reported {1}",