diff --git a/src/components/ICONS.jsx b/src/components/ICONS.jsx
index 60fbb7c95..92b11ea5c 100644
--- a/src/components/ICONS.jsx
+++ b/src/components/ICONS.jsx
@@ -175,4 +175,5 @@ export const ICONS = {
'user-x': () => import('@iconify-icons/mingcute/user-x-line'),
minimize: () => import('@iconify-icons/mingcute/arrows-down-line'),
celebrate: () => import('@iconify-icons/mingcute/celebrate-line'),
+ suitcase: () => import('@iconify-icons/mingcute/suitcase-line'),
};
diff --git a/src/components/name-text.jsx b/src/components/name-text.jsx
index 82fa8c073..218e369e8 100644
--- a/src/components/name-text.jsx
+++ b/src/components/name-text.jsx
@@ -123,7 +123,7 @@ function NameText({
)}
{showAcct && (
<>
-
+ {' '}
{acct2 ? '' : '@'}
{acct1}
diff --git a/src/components/notification.jsx b/src/components/notification.jsx
index 1becf77cf..0bff55519 100644
--- a/src/components/notification.jsx
+++ b/src/components/notification.jsx
@@ -34,6 +34,7 @@ const NOTIFICATION_ICONS = {
emoji_reaction: 'emoji2',
'pleroma:emoji_reaction': 'emoji2',
annual_report: 'celebrate',
+ move: 'suitcase',
};
/*
@@ -263,6 +264,13 @@ const contentText = {
emoji_reaction: emojiText,
'pleroma:emoji_reaction': emojiText,
annual_report: ({ year }) => Your {year} #Wrapstodon is here!,
+ move: ({ account, targetAccount }) => {
+ return (
+
+ {account} moved to {targetAccount}.
+
+ );
+ },
};
// account_suspension, domain_block, user_domain_block
@@ -311,6 +319,7 @@ function Notification({
id,
status,
account,
+ target, // Pleroma move event
report,
event,
moderation_warning,
@@ -416,6 +425,11 @@ function Notification({
text = text({
...notification.annualReport,
});
+ } else if (type === 'move') {
+ text = text({
+ account: ,
+ targetAccount: ,
+ });
} else {
text = text({
account: account ? (
diff --git a/src/locales/en.po b/src/locales/en.po
index 34b2b02bc..24deb9d8e 100644
--- a/src/locales/en.po
+++ b/src/locales/en.po
@@ -963,7 +963,7 @@ msgid "Nothing to show"
msgstr ""
#: src/components/generic-accounts.jsx:145
-#: src/components/notification.jsx:445
+#: src/components/notification.jsx:459
#: src/pages/accounts.jsx:41
#: src/pages/search.jsx:317
#: src/pages/search.jsx:350
@@ -1412,142 +1412,146 @@ msgstr ""
msgid "View all notifications"
msgstr ""
-#: src/components/notification.jsx:71
+#: src/components/notification.jsx:72
msgid "{account} reacted to your post with {emojiObject}"
msgstr ""
-#: src/components/notification.jsx:78
+#: src/components/notification.jsx:79
msgid "{account} published a post."
msgstr ""
-#: src/components/notification.jsx:86
+#: src/components/notification.jsx:87
msgid "{count, plural, =1 {{postsCount, plural, =1 {{postType, select, reply {{account} boosted your reply.} other {{account} boosted your post.}}} other {{account} boosted {postsCount} of your posts.}}} other {{postType, select, reply {<0><1>{0}1> people0> boosted your reply.} other {<2><3>{1}3> people2> boosted your post.}}}}"
msgstr ""
-#: src/components/notification.jsx:129
+#: src/components/notification.jsx:130
msgid "{count, plural, =1 {{account} followed you.} other {<0><1>{0}1> people0> followed you.}}"
msgstr ""
-#: src/components/notification.jsx:143
+#: src/components/notification.jsx:144
msgid "{account} requested to follow you."
msgstr ""
-#: src/components/notification.jsx:152
+#: src/components/notification.jsx:153
msgid "{count, plural, =1 {{postsCount, plural, =1 {{postType, select, reply {{account} liked your reply.} other {{account} liked your post.}}} other {{account} liked {postsCount} of your posts.}}} other {{postType, select, reply {<0><1>{0}1> people0> liked your reply.} other {<2><3>{1}3> people2> liked your post.}}}}"
msgstr ""
-#: src/components/notification.jsx:194
+#: src/components/notification.jsx:195
msgid "A poll you have voted in or created has ended."
msgstr ""
-#: src/components/notification.jsx:195
+#: src/components/notification.jsx:196
msgid "A poll you have created has ended."
msgstr ""
-#: src/components/notification.jsx:196
+#: src/components/notification.jsx:197
msgid "A poll you have voted in has ended."
msgstr ""
-#: src/components/notification.jsx:197
+#: src/components/notification.jsx:198
msgid "A post you interacted with has been edited."
msgstr ""
-#: src/components/notification.jsx:205
+#: src/components/notification.jsx:206
msgid "{count, plural, =1 {{postsCount, plural, =1 {{postType, select, reply {{account} boosted & liked your reply.} other {{account} boosted & liked your post.}}} other {{account} boosted & liked {postsCount} of your posts.}}} other {{postType, select, reply {<0><1>{0}1> people0> boosted & liked your reply.} other {<2><3>{1}3> people2> boosted & liked your post.}}}}"
msgstr ""
-#: src/components/notification.jsx:247
+#: src/components/notification.jsx:248
msgid "{account} signed up."
msgstr ""
-#: src/components/notification.jsx:249
+#: src/components/notification.jsx:250
msgid "{account} reported {targetAccount}"
msgstr ""
-#: src/components/notification.jsx:254
+#: src/components/notification.jsx:255
msgid "Lost connections with <0>{name}0>."
msgstr ""
-#: src/components/notification.jsx:260
+#: src/components/notification.jsx:261
msgid "Moderation warning"
msgstr ""
-#: src/components/notification.jsx:265
+#: src/components/notification.jsx:266
msgid "Your {year} #Wrapstodon is here!"
msgstr "Your {year} #Wrapstodon is here!"
-#: src/components/notification.jsx:271
+#: src/components/notification.jsx:269
+msgid "{account} moved to {targetAccount}."
+msgstr "{account} moved to {targetAccount}."
+
+#: src/components/notification.jsx:279
msgid "An admin from <0>{from}0> has suspended <1>{targetName}1>, which means you can no longer receive updates from them or interact with them."
msgstr ""
-#: src/components/notification.jsx:277
+#: src/components/notification.jsx:285
msgid "An admin from <0>{from}0> has blocked <1>{targetName}1>. Affected followers: {followersCount}, followings: {followingCount}."
msgstr ""
-#: src/components/notification.jsx:283
+#: src/components/notification.jsx:291
msgid "You have blocked <0>{targetName}0>. Removed followers: {followersCount}, followings: {followingCount}."
msgstr ""
-#: src/components/notification.jsx:291
+#: src/components/notification.jsx:299
msgid "Your account has received a moderation warning."
msgstr ""
-#: src/components/notification.jsx:292
+#: src/components/notification.jsx:300
msgid "Your account has been disabled."
msgstr ""
-#: src/components/notification.jsx:293
+#: src/components/notification.jsx:301
msgid "Some of your posts have been marked as sensitive."
msgstr ""
-#: src/components/notification.jsx:294
+#: src/components/notification.jsx:302
msgid "Some of your posts have been deleted."
msgstr ""
-#: src/components/notification.jsx:295
+#: src/components/notification.jsx:303
msgid "Your posts will be marked as sensitive from now on."
msgstr ""
-#: src/components/notification.jsx:296
+#: src/components/notification.jsx:304
msgid "Your account has been limited."
msgstr ""
-#: src/components/notification.jsx:297
+#: src/components/notification.jsx:305
msgid "Your account has been suspended."
msgstr ""
-#: src/components/notification.jsx:372
+#: src/components/notification.jsx:381
msgid "[Unknown notification type: {type}]"
msgstr ""
-#: src/components/notification.jsx:441
+#: src/components/notification.jsx:455
#: src/components/status.jsx:1036
#: src/components/status.jsx:1046
msgid "Boosted/Liked by…"
msgstr ""
-#: src/components/notification.jsx:442
+#: src/components/notification.jsx:456
msgid "Liked by…"
msgstr ""
-#: src/components/notification.jsx:443
+#: src/components/notification.jsx:457
msgid "Boosted by…"
msgstr ""
-#: src/components/notification.jsx:444
+#: src/components/notification.jsx:458
msgid "Followed by…"
msgstr ""
-#: src/components/notification.jsx:515
-#: src/components/notification.jsx:531
+#: src/components/notification.jsx:529
+#: src/components/notification.jsx:545
msgid "Learn more <0/>"
msgstr ""
-#: src/components/notification.jsx:540
+#: src/components/notification.jsx:554
msgid "View #Wrapstodon"
msgstr "View #Wrapstodon"
-#: src/components/notification.jsx:770
+#: src/components/notification.jsx:784
#: src/components/status.jsx:267
msgid "Read more →"
msgstr ""