From f33785a09cdb337d437fee656cd91c475d8c893c Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 23 Oct 2021 02:44:52 +0900
Subject: [PATCH 1/3] Fix #7902 (#7903)

* Fix #7902

* Update notification.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 src/client/components/notification.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue
index bce6333d9..8c2787cf3 100644
--- a/src/client/components/notification.vue
+++ b/src/client/components/notification.vue
@@ -13,7 +13,8 @@
 			<i v-else-if="notification.type === 'mention'" class="fas fa-at"></i>
 			<i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i>
 			<i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i>
-			<XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/>
+			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
+			<XReactionIcon v-else-if="notification.type === 'reaction'" :reaction="notification.reaction ? notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : notification.reaction" :custom-emojis="notification.note.emojis" :no-style="true"/>
 		</div>
 	</div>
 	<div class="tail">

From 600394458cf4eef9d55e06e0303e1d8ce541b312 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 02:45:25 +0900
Subject: [PATCH 2/3] :art:

---
 src/client/components/updated.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/client/components/updated.vue b/src/client/components/updated.vue
index 5033d866f..2f92f743e 100644
--- a/src/client/components/updated.vue
+++ b/src/client/components/updated.vue
@@ -4,7 +4,7 @@
 		<div class="title">{{ $ts.misskeyUpdated }}</div>
 		<div class="version">✨{{ version }}🚀</div>
 		<MkButton full @click="whatIsNew">{{ $ts.whatIsNew }}</MkButton>
-		<MkButton primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton>
+		<MkButton class="gotIt" primary full @click="$refs.modal.close()">{{ $ts.gotIt }}</MkButton>
 	</div>
 </MkModal>
 </template>
@@ -54,5 +54,9 @@ export default defineComponent({
 	> .version {
 		margin: 1em 0;
 	}
+
+	> .gotIt {
+		margin: 8px 0 0 0;
+	}
 }
 </style>

From 4168addbb21f4be46980c39fda25dc3789e395d6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 23 Oct 2021 02:46:34 +0900
Subject: [PATCH 3/3] 12.93.1

---
 CHANGELOG.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd91091d..9c494fc53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 
 -->
 
+## 12.93.1 (2021/10/23)
+
+### Bugfixes
+- クライアント: 通知上でローカルのリアクションが表示されないのを修正
+
 ## 12.93.0 (2021/10/23)
 
 ### Improvements
diff --git a/package.json b/package.json
index 97bdacc72..ea89c595b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.93.0",
+	"version": "12.93.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",