From b1ca25d64639744827debdf750884c7fb0d0f522 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 21 Aug 2023 10:54:19 +0900
Subject: [PATCH 01/51] =?UTF-8?q?[feat]=20mfm=20crop=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.ts    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 1c417991e095..997b74462df6 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -185,6 +185,14 @@ export default function(props: {
 						style = `transform: rotate(${degrees}deg); transform-origin: center center;`;
 						break;
 					}
+					case "crop": {
+						const top = parseFloat(token.props.args.top ?? "0");
+						const right = parseFloat(token.props.args.right ?? "0");
+						const bottom = parseFloat(token.props.args.bottom ?? "0");
+						const left = parseFloat(token.props.args.left ?? "0");
+						style = `clip-path: inset(${top}% ${right}% ${bottom}% ${left}%);`;
+						break;
+					}
 					case 'position': {
 						if (!defaultStore.state.advancedMfm) break;
 						const x = parseFloat(token.props.args.x ?? '0');

From 18921a9c0c6330348f9e2e4b490f621ffc8dd2ea Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Tue, 26 Sep 2023 12:02:48 +0900
Subject: [PATCH 02/51] =?UTF-8?q?[add]=20mfm=E3=81=AE=E3=82=BF=E3=82=B0?=
 =?UTF-8?q?=E3=81=ABcrop=E3=82=92=E8=BF=BD=E8=A8=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/scripts/mfm-tags.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/mfm-tags.ts b/packages/frontend/src/scripts/mfm-tags.ts
index a84198282da1..0aaed07eebe0 100644
--- a/packages/frontend/src/scripts/mfm-tags.ts
+++ b/packages/frontend/src/scripts/mfm-tags.ts
@@ -1 +1 @@
-export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];
+export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'crop', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'font', 'blur', 'rainbow', 'sparkle', 'rotate'];

From d68fb7b58202d761c7ba34d19083557a3d9ed906 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Tue, 26 Sep 2023 12:50:33 +0900
Subject: [PATCH 03/51] =?UTF-8?q?[change]=20=E3=83=81=E3=83=A3=E3=83=B3?=
 =?UTF-8?q?=E3=83=8D=E3=83=AB=E3=81=B8=E3=81=AE=E6=8A=95=E7=A8=BF=E3=81=A7?=
 =?UTF-8?q?=E3=82=82=E5=8F=AF=E8=A6=96=E6=80=A7=E3=81=AF=E3=83=AA=E3=82=AF?=
 =?UTF-8?q?=E3=82=A8=E3=82=B9=E3=83=88=E5=86=85=E5=AE=B9=E3=81=AB=E6=BA=96?=
 =?UTF-8?q?=E6=8B=A0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/NoteCreateService.ts  |  3 ---
 packages/frontend/src/components/MkPostForm.vue | 16 +++++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 648ff7648332..5d2f875a4925 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -234,9 +234,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (data.createdAt == null) data.createdAt = new Date();
 		if (data.visibility == null) data.visibility = 'public';
 		if (data.localOnly == null) data.localOnly = false;
-		if (data.channel != null) data.visibility = 'public';
-		if (data.channel != null) data.visibleUsers = [];
-		if (data.channel != null) data.localOnly = true;
 
 		if (data.visibility === 'public' && data.channel == null) {
 			const sensitiveWords = (await this.metaService.fetch()).sensitiveWords;
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 0527811ab030..c0a65d14741d 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -15,16 +15,16 @@
 		</div>
 		<div :class="$style.headerRight">
 			<template v-if="!(channel != null && fixed)">
-				<button v-if="channel == null" ref="visibilityButton" v-click-anime v-tooltip="i18n.ts.visibility" :class="['_button', $style.headerRightItem, $style.visibility]" @click="setVisibility">
+				<button v-if="channel != null" class="_button" :class="[$style.headerRightItem, $style.visibility]" disabled>
+					<span><i class="ti ti-device-tv"></i></span>
+					<span :class="$style.headerRightButtonText">{{ channel.name }}</span>
+				</button>
+				<button ref="visibilityButton" v-click-anime v-tooltip="i18n.ts.visibility" :class="['_button', $style.headerRightItem, $style.visibility]" @click="setVisibility">
 					<span v-if="visibility === 'public'"><i class="ti ti-world"></i></span>
 					<span v-if="visibility === 'home'"><i class="ti ti-home"></i></span>
 					<span v-if="visibility === 'followers'"><i class="ti ti-lock"></i></span>
 					<span v-if="visibility === 'specified'"><i class="ti ti-mail"></i></span>
-					<span :class="$style.headerRightButtonText">{{ i18n.ts._visibility[visibility] }}</span>
-				</button>
-				<button v-else class="_button" :class="[$style.headerRightItem, $style.visibility]" disabled>
-					<span><i class="ti ti-device-tv"></i></span>
-					<span :class="$style.headerRightButtonText">{{ channel.name }}</span>
+					<span v-if="channel == null" :class="$style.headerRightButtonText">{{ i18n.ts._visibility[visibility] }}</span>
 				</button>
 			</template>
 			<button v-click-anime v-tooltip="i18n.ts._visibility.disableFederation" class="_button" :class="[$style.headerRightItem, { [$style.danger]: localOnly }]" :disabled="channel != null || visibility === 'specified'" @click="toggleLocalOnly">
@@ -288,7 +288,7 @@ if (props.reply && props.reply.text != null) {
 }
 
 if (props.channel) {
-	visibility = 'public';
+	//visibility = 'public';
 	localOnly = true; // TODO: チャンネルが連合するようになった折には消す
 }
 
@@ -422,9 +422,7 @@ function upload(file: File, name?: string): void {
 
 function setVisibility() {
 	if (props.channel) {
-		visibility = 'public';
 		localOnly = true; // TODO: チャンネルが連合するようになった折には消す
-		return;
 	}
 
 	os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), {

From a74177a99340d8e608360cea3d8df0f210ef69fb Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Wed, 4 Oct 2023 14:08:50 +0900
Subject: [PATCH 04/51] =?UTF-8?q?[change]=20cw=E3=82=92input=E3=81=8B?=
 =?UTF-8?q?=E3=82=89textarea=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPostForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index c6f5bec70669..b5383bc83a48 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 	</div>
 	<MkInfo v-if="hasNotSpecifiedMentions" warn :class="$style.hasNotSpecifiedMentions">{{ i18n.ts.notSpecifiedMentionWarning }} - <button class="_textButton" @click="addMissingMention()">{{ i18n.ts.add }}</button></MkInfo>
-	<input v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown">
+	<textarea v-show="useCw" ref="cwInputEl" v-model="cw" :class="$style.cw" :placeholder="i18n.ts.annotation" @keydown="onKeydown" />
 	<div :class="[$style.textOuter, { [$style.withCw]: useCw }]">
 		<textarea ref="textareaEl" v-model="text" :class="[$style.text]" :disabled="posting || posted" :placeholder="placeholder" data-cy-post-form-text @keydown="onKeydown" @paste="onPaste" @compositionupdate="onCompositionUpdate" @compositionend="onCompositionEnd"/>
 		<div v-if="maxTextLength - textLength < 100" :class="['_acrylic', $style.textCount, { [$style.textOver]: textLength > maxTextLength }]">{{ maxTextLength - textLength }}</div>

From 2b56110216d638706ab49b0b147a684fd2b3f100 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 17 Feb 2024 16:04:18 +0900
Subject: [PATCH 05/51] =?UTF-8?q?[feat]=20=E3=82=B9=E3=83=91=E3=83=A0?=
 =?UTF-8?q?=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/core/activitypub/models/ApNoteService.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 05d5ca15db17..c5c340a53e3d 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -171,6 +171,22 @@ export class ApNoteService {
 		}
 
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
+		if (apMentions.length >= 5){
+			throw new Error('too many mensions included.');
+			this.logger.error('Too many mensions included', {
+				value,
+				object,
+			});
+		}
+		if (apMentions.includes((user) => user.isSuspended)) {
+			throw new Error('includes suspended user.')
+			this.logger.error('Suspended user mention included', {
+				value,
+				object,
+			});
+
+		}
+
 		const apHashtags = extractApHashtags(note.tag);
 
 		// 添付ファイル

From 95f6cdbff0971b5c1c65a4294017138f29f046b7 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 17 Feb 2024 16:35:53 +0900
Subject: [PATCH 06/51] =?UTF-8?q?[feat]=20=E3=82=B9=E3=83=91=E3=83=A0?=
 =?UTF-8?q?=E5=AF=BE=E7=AD=96=20-=20=E5=8D=98=E4=B8=80=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/core/activitypub/models/ApNoteService.ts      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index c5c340a53e3d..fd45a25794f3 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -170,8 +170,9 @@ export class ApNoteService {
 			}
 		}
 
+		// SPAM対策
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
-		if (apMentions.length >= 5){
+		if (apMentions.length >= 5 && actor.followersCount === 0 && actor.followingCount === 0){
 			throw new Error('too many mensions included.');
 			this.logger.error('Too many mensions included', {
 				value,
@@ -184,7 +185,13 @@ export class ApNoteService {
 				value,
 				object,
 			});
-
+		}
+		if (actor.username === actor.name && /^[a-z0-9]+$/.test(actor.username) && apMentions.length > 0 && actor.followersCount === 0 && actor.followingCount === 0){
+			throw new Error('suspected SPAM')
+			this.logger.error('Suspected SPAM', {
+				value,
+				object,
+			});
 		}
 
 		const apHashtags = extractApHashtags(note.tag);

From cd7c08c74b3c2e69296f1cf23ef801f6cec7b591 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 17 Feb 2024 16:38:43 +0900
Subject: [PATCH 07/51] =?UTF-8?q?[feat]=20DiscordWebHook=20-=20=E7=8F=BE?=
 =?UTF-8?q?=E7=8A=B6WebHook=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=8C=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=81=AE=E3=81=A7=E4=B8=8D=E5=AE=8C=E5=85=A8=E3=81=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=A7=E6=94=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebhookDeliverProcessorService.ts         | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
index a41f5565c8ed..c1b7c0f14cc3 100644
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
@@ -36,26 +36,39 @@ export class WebhookDeliverProcessorService {
 	public async process(job: Bull.Job<WebhookDeliverJobData>): Promise<string> {
 		try {
 			this.logger.debug(`delivering ${job.data.webhookId}`);
+			const isDiscord = job.data.to.startsWith('https://discordapp.com') || job.data.to.startsWith('https://discord.com')
 
-			const res = await this.httpRequestService.send(job.data.to, {
-				method: 'POST',
-				headers: {
-					'User-Agent': 'Misskey-Hooks',
-					'X-Misskey-Host': this.config.host,
-					'X-Misskey-Hook-Id': job.data.webhookId,
-					'X-Misskey-Hook-Secret': job.data.secret,
-					'Content-Type': 'application/json',
-				},
-				body: JSON.stringify({
-					server: this.config.url,
-					hookId: job.data.webhookId,
-					userId: job.data.userId,
-					eventId: job.data.eventId,
-					createdAt: job.data.createdAt,
-					type: job.data.type,
-					body: job.data.content,
-				}),
-			});
+			if (isDiscord && job.data.type !== 'note') throw Error('Not new post')
+
+			const res = (isDiscord)
+				? await this.httpRequestService.send(job.data.to, {
+					method: 'POST',
+					headers: {
+						'Content-Type': 'application/json',
+					},
+					body: JSON.stringify({
+						content: `[@${job.data.content.note.user.name}](https://misskey.sweshelo.jp/notes/${job.data.content.note.id})\n> ${job.data.content.note.text}`,
+					})
+				})
+				: await this.httpRequestService.send(job.data.to, {
+					method: 'POST',
+					headers: {
+						'User-Agent': 'Misskey-Hooks',
+						'X-Misskey-Host': this.config.host,
+						'X-Misskey-Hook-Id': job.data.webhookId,
+						'X-Misskey-Hook-Secret': job.data.secret,
+						'Content-Type': 'application/json',
+					},
+					body: JSON.stringify({
+						server: this.config.url,
+						hookId: job.data.webhookId,
+						userId: job.data.userId,
+						eventId: job.data.eventId,
+						createdAt: job.data.createdAt,
+						type: job.data.type,
+						body: job.data.content,
+					}),
+				});
 
 			this.webhooksRepository.update({ id: job.data.webhookId }, {
 				latestSentAt: new Date(),

From 7e21fdf723ab0d3fca2ad1bb36f318db6dd1d910 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 19 Feb 2024 13:14:24 +0900
Subject: [PATCH 08/51] =?UTF-8?q?[feat]=20SPAM=E5=AF=BE=E7=AD=96=E9=96=A2?=
 =?UTF-8?q?=E9=80=A3=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=92=E8=A6=8B=E3=82=84?=
 =?UTF-8?q?=E3=81=99=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activitypub/models/ApNoteService.ts  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index b67e41b050b9..013cda013c6d 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -172,26 +172,29 @@ export class ApNoteService {
 
 		// SPAM対策
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
-		if (apMentions.length >= 5 && actor.followersCount === 0 && actor.followingCount === 0){
-			throw new Error('too many mensions included.');
+		const hasNoFF = actor.followersCount === 0 && actor.followingCount === 0;
+		if (apMentions.length >= 5 && hasNoFF){
 			this.logger.error('Too many mensions included', {
-				value,
-				object,
+				account: `@${actor.username}@${actor.host}`,
+				note: `https://${actor.host}/notes/${note.id}`,
+				mentions: apMentions.map((user) => user.uri),
 			});
+			throw new Error('too many mensions included.');
 		}
-		if (apMentions.includes((user) => user.isSuspended)) {
-			throw new Error('includes suspended user.')
+		if (apMentions.includes((user) => user.isSuspended) && hasNoFF) {
 			this.logger.error('Suspended user mention included', {
-				value,
-				object,
+				account: `@${actor.username}@${actor.host}`,
+				note: `${note.id}`,
+				suspended: apMentions.find((user)  => user.isSuspended)
 			});
+			throw new Error('includes suspended user.')
 		}
-		if (actor.username === actor.name && /^[a-z0-9]+$/.test(actor.username) && apMentions.length > 0 && actor.followersCount === 0 && actor.followingCount === 0){
-			throw new Error('suspected SPAM')
+		if (actor.username === actor.name && /^[a-z0-9]+$/.test(actor.username) && apMentions.length > 0 && hasNoFF){
 			this.logger.error('Suspected SPAM', {
-				value,
-				object,
+				account: `@${actor.username}@${actor.host}`,
+				note: `https://${actor.host}/notes/${note.id}`,
 			});
+			throw new Error('suspected SPAM')
 		}
 
 		const apHashtags = extractApHashtags(note.tag);

From 3528696fcdc793a43127d67756a426f64d7e0622 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 19 Feb 2024 13:29:39 +0900
Subject: [PATCH 09/51] =?UTF-8?q?[fix]=20=E3=83=AD=E3=82=B0=E6=95=B4?=
 =?UTF-8?q?=E5=BD=A2=20=E6=BC=8F=E3=82=8C=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/activitypub/models/ApNoteService.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 013cda013c6d..07023801a112 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -176,7 +176,7 @@ export class ApNoteService {
 		if (apMentions.length >= 5 && hasNoFF){
 			this.logger.error('Too many mensions included', {
 				account: `@${actor.username}@${actor.host}`,
-				note: `https://${actor.host}/notes/${note.id}`,
+				note: `${note.id}`,
 				mentions: apMentions.map((user) => user.uri),
 			});
 			throw new Error('too many mensions included.');
@@ -192,7 +192,7 @@ export class ApNoteService {
 		if (actor.username === actor.name && /^[a-z0-9]+$/.test(actor.username) && apMentions.length > 0 && hasNoFF){
 			this.logger.error('Suspected SPAM', {
 				account: `@${actor.username}@${actor.host}`,
-				note: `https://${actor.host}/notes/${note.id}`,
+				note: `${note.id}`,
 			});
 			throw new Error('suspected SPAM')
 		}

From 04349332189350ed224ad02aa778a473a28fc173 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 19:03:33 +0900
Subject: [PATCH 10/51] =?UTF-8?q?feat:=20=E5=A4=96=E9=83=A8=E3=82=B5?=
 =?UTF-8?q?=E3=83=BC=E3=83=90=E3=81=AE=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=92?=
 =?UTF-8?q?=E5=8D=B3=E5=BA=A7=E3=81=AB=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=A6=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=8F=AF=E8=83=BD=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/global/MkCustomEmoji.vue   | 107 ++++++++++++------
 .../global/MkMisskeyFlavoredMarkdown.ts       |   3 +
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index dbcb00460cdc..2e02751e117c 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -24,7 +24,7 @@ import { getProxiedImageUrl, getStaticImageUrl } from '@/scripts/media-proxy.js'
 import { defaultStore } from '@/store.js';
 import { customEmojisMap } from '@/custom-emojis.js';
 import * as os from '@/os.js';
-import { misskeyApiGet } from '@/scripts/misskey-api.js';
+import { misskeyApi, misskeyApiGet } from '@/scripts/misskey-api.js';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import * as sound from '@/scripts/sound.js';
 import { i18n } from '@/i18n.js';
@@ -39,6 +39,7 @@ const props = defineProps<{
 	useOriginalSize?: boolean;
 	menu?: boolean;
 	menuReaction?: boolean;
+  menuImport?: boolean;
 }>();
 
 const react = inject<((name: string) => void) | null>('react', null);
@@ -76,39 +77,81 @@ const url = computed(() => {
 const alt = computed(() => `:${customEmojiName.value}:`);
 const errored = ref(url.value == null);
 
+const importEmoji = async(emojiName) => {
+  // 同名の絵文字が存在しないかチェック
+  const localCheckResponse = Object.values(await misskeyApi('admin/emoji/list', {
+    query: emojiName
+  })).find((e) => e.name === emojiName)
+
+  // 存在しない場合 インポート
+  if (!localCheckResponse){
+    const emoji = (await misskeyApi('admin/emoji/list-remote', {
+      query: emojiName
+    })).find((e) => e.name === emojiName)
+	  await os.apiWithDialog('admin/emoji/copy', {
+		  emojiId: emoji.id,
+	  });
+  }
+
+  // リアクション
+  react(`:${emojiName}:`);
+  sound.playMisskeySfx('reaction');
+};
+
 function onClick(ev: MouseEvent) {
 	if (props.menu) {
-		os.popupMenu([{
-			type: 'label',
-			text: `:${props.name}:`,
-		}, {
-			text: i18n.ts.copy,
-			icon: 'ti ti-copy',
-			action: () => {
-				copyToClipboard(`:${props.name}:`);
-				os.success();
-			},
-		}, ...(props.menuReaction && react ? [{
-			text: i18n.ts.doReaction,
-			icon: 'ti ti-plus',
-			action: () => {
-				react(`:${props.name}:`);
-				sound.playMisskeySfx('reaction');
-			},
-		}] : []), {
-			text: i18n.ts.info,
-			icon: 'ti ti-info-circle',
-			action: async () => {
-				os.popup(MkCustomEmojiDetailedDialog, {
-					emoji: await misskeyApiGet('emoji', {
-						name: customEmojiName.value,
-					}),
-				}, {
-					anchor: ev.target,
-				});
-			},
-		}], ev.currentTarget ?? ev.target);
-	}
+    if(props.menuImport){
+      os.popupMenu([{
+        type: 'label',
+        text: `:${props.name}:`,
+        }, {
+        text: i18n.ts.copy,
+        icon: 'ti ti-copy',
+        action: () => {
+          copyToClipboard(`:${props.name}:`);
+          os.success();
+        },
+      }, ...(props.menuImport && react ? [{
+        text: i18n.ts.doReaction,
+        icon: 'ti ti-plus',
+        action: () => {
+          importEmoji(props.name)
+        },
+      }] : [])
+      ], ev.currentTarget ?? ev.target);
+    }else{
+      os.popupMenu([{
+        type: 'label',
+        text: `:${props.name}:`,
+        }, {
+        text: i18n.ts.copy,
+        icon: 'ti ti-copy',
+        action: () => {
+          copyToClipboard(`:${props.name}:`);
+          os.success();
+        },
+      }, ...(props.menuReaction && react ? [{
+        text: i18n.ts.doReaction,
+        icon: 'ti ti-plus',
+        action: () => {
+          react(`:${props.name}:`);
+          sound.playMisskeySfx('reaction');
+        },
+      }] : []), {
+        text: i18n.ts.info,
+        icon: 'ti ti-info-circle',
+        action: async () => {
+          os.popup(MkCustomEmojiDetailedDialog, {
+            emoji: await misskeyApiGet('emoji', {
+              name: customEmojiName.value,
+            }),
+          }, {
+            anchor: ev.target,
+          });
+        },
+      }], ev.currentTarget ?? ev.target);
+    }
+  }
 }
 </script>
 
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 9e94b02b8e44..abab403489e4 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -428,6 +428,9 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 							normal: props.plain,
 							host: props.author.host,
 							useOriginalSize: scale >= 2.5,
+              menu: props.enableEmojiMenu,
+              menuReaction: props.enableEmojiMenuReaction,
+              menuImport: true,
 						})];
 					}
 				}

From 5a7868ee13857f35bbe4da9833c2c7da9455d1e8 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 21:18:55 +0900
Subject: [PATCH 11/51] =?UTF-8?q?feat:=20=E5=90=8C=E4=B8=80=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AB=E8=A4=87=E6=95=B0=E5=9B=9E=E3=81=AE?=
 =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...update-note-reactions-unique-constraint.js | 13 ++++++++
 packages/backend/src/core/ReactionService.ts  | 23 +++++--------
 .../src/core/entities/NoteEntityService.ts    | 33 +++++++++++--------
 packages/backend/src/models/NoteReaction.ts   |  2 +-
 .../backend/src/models/json-schema/note.ts    |  9 +++++
 5 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 packages/backend/migration/1710500319651-update-note-reactions-unique-constraint.js

diff --git a/packages/backend/migration/1710500319651-update-note-reactions-unique-constraint.js b/packages/backend/migration/1710500319651-update-note-reactions-unique-constraint.js
new file mode 100644
index 000000000000..365bac5b36d7
--- /dev/null
+++ b/packages/backend/migration/1710500319651-update-note-reactions-unique-constraint.js
@@ -0,0 +1,13 @@
+export class UpdateNoteReactionsUniqueConstraint1710499309897 {
+  name = 'UpdateNoteReactionsUniqueConstraint1710499309897'
+
+  async up(queryRunner){
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_note_reaction_user_note_reaction" ON "note_reaction" ("userId", "noteId", "reaction")`);
+    await queryRunner.query(`DROP INDEX "IDX_ad0c221b25672daf2df320a817"`);
+  }
+
+  async down(queryRunner){
+    await queryRunner.query(`DROP INDEX "IDX_note_reaction_user_note_reaction"`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId")`);  }
+}
+
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 5014156a5c45..98546ba61d53 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -166,20 +166,15 @@ export class ReactionService {
 			await this.noteReactionsRepository.insert(record);
 		} catch (e) {
 			if (isDuplicateKeyValueError(e)) {
-				const exists = await this.noteReactionsRepository.findOneByOrFail({
-					noteId: note.id,
-					userId: user.id,
-				});
-
-				if (exists.reaction !== reaction) {
-					// 別のリアクションがすでにされていたら置き換える
-					await this.delete(user, note);
-					await this.noteReactionsRepository.insert(record);
-				} else {
-					// 同じリアクションがすでにされていたらエラー
-					throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
-				}
-			} else {
+				const exists = await this.noteReactionsRepository.findOneBy({
+          noteId: note.id,
+          userId: user.id,
+          reaction,
+        });
+
+        // 同じリアクションがすでにされていたらエラー
+        if (exists) throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
+      } else {
 				throw e;
 			}
 		}
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 5b6affc6a520..a818712b9e28 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -171,12 +171,12 @@ export class NoteEntityService implements OnModuleInit {
 
 	@bindThis
 	public async populateMyReaction(note: { id: MiNote['id']; reactions: MiNote['reactions']; reactionAndUserPairCache?: MiNote['reactionAndUserPairCache']; }, meId: MiUser['id'], _hint_?: {
-		myReactions: Map<MiNote['id'], string | null>;
+		myReactions: Map<MiNote['id'], string[]>;
 	}) {
 		if (_hint_?.myReactions) {
 			const reaction = _hint_.myReactions.get(note.id);
 			if (reaction) {
-				return this.reactionService.convertLegacyReaction(reaction);
+				return reaction.map(r => this.reactionService.convertLegacyReaction(r));
 			} else {
 				return undefined;
 			}
@@ -288,7 +288,7 @@ export class NoteEntityService implements OnModuleInit {
 			skipHide?: boolean;
 			withReactionAndUserPairCache?: boolean;
 			_hint_?: {
-				myReactions: Map<MiNote['id'], string | null>;
+				myReactions: Map<MiNote['id'], string[]>;
 				packedFiles: Map<MiNote['fileIds'][number], Packed<'DriveFile'> | null>;
 			};
 		},
@@ -320,6 +320,10 @@ export class NoteEntityService implements OnModuleInit {
 			.map(x => this.reactionService.decodeReaction(x).reaction.replaceAll(':', ''));
 		const packedFiles = options?._hint_?.packedFiles;
 
+    const myReactions = (meId && Object.keys(note.reactions).length)
+    ? await this.populateMyReaction(note, meId, options?._hint_)
+    : undefined
+
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			createdAt: this.idService.parse(note.id).date.toISOString(),
@@ -374,8 +378,9 @@ export class NoteEntityService implements OnModuleInit {
 
 				poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,
 
-				...(meId && Object.keys(note.reactions).length > 0 ? {
-					myReaction: this.populateMyReaction(note, meId, options?._hint_),
+				...(myReactions && myReactions.length > 0 ? {
+					myReaction: myReactions[0],
+          myReactions,
 				} : {}),
 			} : {}),
 		});
@@ -399,7 +404,7 @@ export class NoteEntityService implements OnModuleInit {
 		if (notes.length === 0) return [];
 
 		const meId = me ? me.id : null;
-		const myReactionsMap = new Map<MiNote['id'], string | null>();
+		const myReactionsMap = new Map<MiNote['id'], string[]>();
 		if (meId) {
 			const idsNeedFetchMyReaction = new Set<MiNote['id']>();
 
@@ -410,10 +415,10 @@ export class NoteEntityService implements OnModuleInit {
 				if (note.renote && (note.text == null && note.fileIds.length === 0)) { // pure renote
 					const reactionsCount = Object.values(note.renote.reactions).reduce((a, b) => a + b, 0);
 					if (reactionsCount === 0) {
-						myReactionsMap.set(note.renote.id, null);
+						myReactionsMap.set(note.renote.id, []);
 					} else if (reactionsCount <= note.renote.reactionAndUserPairCache.length) {
-						const pair = note.renote.reactionAndUserPairCache.find(p => p.startsWith(meId));
-						myReactionsMap.set(note.renote.id, pair ? pair.split('/')[1] : null);
+						const pair = note.renote.reactionAndUserPairCache.filter(p => p.startsWith(meId));
+						myReactionsMap.set(note.renote.id, pair ? pair.map(p => p.split('/')[1]) : []);
 					} else {
 						idsNeedFetchMyReaction.add(note.renote.id);
 					}
@@ -421,15 +426,15 @@ export class NoteEntityService implements OnModuleInit {
 					if (note.id < oldId) {
 						const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
 						if (reactionsCount === 0) {
-							myReactionsMap.set(note.id, null);
+							myReactionsMap.set(note.id, []);
 						} else if (reactionsCount <= note.reactionAndUserPairCache.length) {
-							const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
-							myReactionsMap.set(note.id, pair ? pair.split('/')[1] : null);
+							const pair = note.reactionAndUserPairCache.filter(p => p.startsWith(meId));
+							myReactionsMap.set(note.id, pair ? pair.map(p => p.split('/')[1]) : []);
 						} else {
 							idsNeedFetchMyReaction.add(note.id);
 						}
 					} else {
-						myReactionsMap.set(note.id, null);
+						myReactionsMap.set(note.id, []);
 					}
 				}
 			}
@@ -440,7 +445,7 @@ export class NoteEntityService implements OnModuleInit {
 			}) : [];
 
 			for (const id of idsNeedFetchMyReaction) {
-				myReactionsMap.set(id, myReactions.find(reaction => reaction.noteId === id)?.reaction ?? null);
+				myReactionsMap.set(id, myReactions.filter(reaction => reaction.noteId === id).map(r => r.reaction));
 			}
 		}
 
diff --git a/packages/backend/src/models/NoteReaction.ts b/packages/backend/src/models/NoteReaction.ts
index 42dfcaa9ad87..4719d86a2388 100644
--- a/packages/backend/src/models/NoteReaction.ts
+++ b/packages/backend/src/models/NoteReaction.ts
@@ -9,7 +9,7 @@ import { MiUser } from './User.js';
 import { MiNote } from './Note.js';
 
 @Entity('note_reaction')
-@Index(['userId', 'noteId'], { unique: true })
+@Index(['userId', 'noteId', 'reaction'], { unique: true })
 export class MiNoteReaction {
 	@PrimaryColumn(id())
 	public id: string;
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index bb4ccc7ee4db..cdf193c9259d 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -256,5 +256,14 @@ export const packedNoteSchema = {
 			type: 'string',
 			optional: true, nullable: true,
 		},
+
+    myReactions: {
+      type: 'array',
+      optional: true, nullable: true,
+      items: {
+        type: 'string',
+        optional: false, nullable: false
+      }
+    }
 	},
 } as const;

From b8850637f3da43f9970c10a35a822e4f5b38371d Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 21:36:07 +0900
Subject: [PATCH 12/51] =?UTF-8?q?fix:=20hint=E3=81=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E4=B8=8D=E6=AD=A3=E3=81=AAmyReactio?=
 =?UTF-8?q?ns=E3=82=92=E8=BF=94=E5=8D=B4=E3=81=99=E3=82=8B=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/core/entities/NoteEntityService.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index a818712b9e28..c8d1a272cd0a 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -185,9 +185,9 @@ export class NoteEntityService implements OnModuleInit {
 		const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
 		if (reactionsCount === 0) return undefined;
 		if (note.reactionAndUserPairCache && reactionsCount <= note.reactionAndUserPairCache.length) {
-			const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
+			const pair = note.reactionAndUserPairCache.filter(p => p.startsWith(meId));
 			if (pair) {
-				return this.reactionService.convertLegacyReaction(pair.split('/')[1]);
+				return pair.map(p => this.reactionService.convertLegacyReaction(p.split('/')[1]));
 			} else {
 				return undefined;
 			}
@@ -198,13 +198,15 @@ export class NoteEntityService implements OnModuleInit {
 			return undefined;
 		}
 
-		const reaction = await this.noteReactionsRepository.findOneBy({
-			userId: meId,
-			noteId: note.id,
+		const reaction = await this.noteReactionsRepository.find({
+      where: {
+        userId: meId,
+        noteId: note.id,
+      }
 		});
 
 		if (reaction) {
-			return this.reactionService.convertLegacyReaction(reaction.reaction);
+			return reaction.map(r => this.reactionService.convertLegacyReaction(r.reaction));
 		}
 
 		return undefined;

From 69d25252b720348ff50fc7649a587141118e95b5 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:08:35 +0900
Subject: [PATCH 13/51] =?UTF-8?q?fix:=20**front=20only**=20=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E5=90=8D=E3=82=92?=
 =?UTF-8?q?=E6=B8=A1=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNote.vue   |  5 +---
 .../src/components/MkNoteDetailed.vue         |  5 +---
 .../components/MkReactionsViewer.reaction.vue | 26 ++++++-------------
 .../frontend/src/scripts/use-note-capture.ts  |  8 ++++++
 packages/misskey-js/src/autogen/types.ts      |  3 ++-
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 03a283cab33b..93e930490cb8 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -116,13 +116,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<button v-else :class="$style.footerButton" class="_button" disabled>
 					<i class="ti ti-ban"></i>
 				</button>
-				<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.footerButton" class="_button" @mousedown="react()">
+				<button ref="reactButton" :class="$style.footerButton" class="_button" @mousedown="react()">
 					<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
 					<i v-else class="ti ti-plus"></i>
 				</button>
-				<button v-if="appearNote.myReaction != null" ref="reactButton" :class="$style.footerButton" class="_button" @click="undoReact(appearNote)">
-					<i class="ti ti-minus"></i>
-				</button>
 				<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" :class="$style.footerButton" class="_button" @mousedown="clip()">
 					<i class="ti ti-paperclip"></i>
 				</button>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index e3ef14120f79..68d374ed94f6 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -124,13 +124,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button v-else class="_button" :class="$style.noteFooterButton" disabled>
 				<i class="ti ti-ban"></i>
 			</button>
-			<button v-if="appearNote.myReaction == null" ref="reactButton" :class="$style.noteFooterButton" class="_button" @mousedown="react()">
+			<button ref="reactButton" :class="$style.noteFooterButton" class="_button" @mousedown="react()">
 				<i v-if="appearNote.reactionAcceptance === 'likeOnly'" class="ti ti-heart"></i>
 				<i v-else class="ti ti-plus"></i>
 			</button>
-			<button v-if="appearNote.myReaction != null" ref="reactButton" class="_button" :class="[$style.noteFooterButton, $style.reacted]" @click="undoReact(appearNote)">
-				<i class="ti ti-minus"></i>
-			</button>
 			<button v-if="defaultStore.state.showClipButtonInNoteFooter" ref="clipButton" class="_button" :class="$style.noteFooterButton" @mousedown="clip()">
 				<i class="ti ti-paperclip"></i>
 			</button>
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 0dcd8b0ea25b..eac6940a8c95 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	ref="buttonEl"
 	v-ripple="canToggle"
 	class="_button"
-	:class="[$style.root, { [$style.reacted]: note.myReaction == reaction, [$style.canToggle]: canToggle, [$style.small]: defaultStore.state.reactionsDisplaySize === 'small', [$style.large]: defaultStore.state.reactionsDisplaySize === 'large' }]"
+	:class="[$style.root, { [$style.reacted]: note.myReactions.includes(reaction), [$style.canToggle]: canToggle, [$style.small]: defaultStore.state.reactionsDisplaySize === 'small', [$style.large]: defaultStore.state.reactionsDisplaySize === 'large' }]"
 	@click="toggleReaction()"
 	@contextmenu.prevent.stop="menu"
 >
@@ -63,33 +63,23 @@ const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction
 async function toggleReaction() {
 	if (!canToggle.value) return;
 
-	const oldReaction = props.note.myReaction;
-	if (oldReaction) {
+	const oldReactions = props.note.myReactions;
+
+  // 取り消しの場合
+	if (oldReactions.find(r => r === props.reaction) || props.note.myReaction === props.reaction) {
 		const confirm = await os.confirm({
 			type: 'warning',
-			text: oldReaction !== props.reaction ? i18n.ts.changeReactionConfirm : i18n.ts.cancelReactionConfirm,
+			text: i18n.ts.cancelReactionConfirm,
 		});
 		if (confirm.canceled) return;
-
-		if (oldReaction !== props.reaction) {
-			sound.playMisskeySfx('reaction');
-		}
-
 		if (mock) {
 			emit('reactionToggled', props.reaction, (props.count - 1));
 			return;
 		}
-
 		misskeyApi('notes/reactions/delete', {
 			noteId: props.note.id,
-		}).then(() => {
-			if (oldReaction !== props.reaction) {
-				misskeyApi('notes/reactions/create', {
-					noteId: props.note.id,
-					reaction: props.reaction,
-				});
-			}
-		});
+      reaction: props.reaction,
+		})
 	} else {
 		sound.playMisskeySfx('reaction');
 
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index 524ac5d3fe75..2e1e3c1a22b3 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -38,6 +38,11 @@ export function useNoteCapture(props: {
 
 				if ($i && (body.userId === $i.id)) {
 					note.value.myReaction = reaction;
+          if (note.value.myReactions) {
+            note.value.myReactions.push(reaction);
+          }else{
+            note.value.myReactions = [reaction]
+          }
 				}
 				break;
 			}
@@ -53,6 +58,9 @@ export function useNoteCapture(props: {
 
 				if ($i && (body.userId === $i.id)) {
 					note.value.myReaction = null;
+          if (note.value.myReactions) {
+            note.value.myReactions = note.value.myReactions.filter(r => r !== reaction);
+          }
 				}
 				break;
 			}
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d0d8573b407c..935242367a17 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3982,7 +3982,8 @@ export type components = {
       url?: string;
       reactionAndUserPairCache?: string[];
       clippedCount?: number;
-      myReaction?: string | null;
+      myReaction?: string | null; // 互換性のために残す
+      myReactions?: string[];
     };
     NoteReaction: {
       /**

From b3da07c4a47babdb2e21fd02a294823222bebd68 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:26:29 +0900
Subject: [PATCH 14/51] =?UTF-8?q?fix:=20backend=20-=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E5=89=8A=E9=99=A4=E6=99=82?=
 =?UTF-8?q?=E3=81=AB=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E5=90=8D=E3=82=92=E6=B8=A1?=
 =?UTF-8?q?=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/ReactionService.ts  | 32 +++++++++++++------
 .../api/endpoints/notes/reactions/delete.ts   |  9 +++++-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 98546ba61d53..55a8cbaab27a 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -270,42 +270,56 @@ export class ReactionService {
 	}
 
 	@bindThis
-	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote) {
+	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, reaction?: string) {
 		// if already unreacted
-		const exist = await this.noteReactionsRepository.findOneBy({
-			noteId: note.id,
-			userId: user.id,
+		const exist = await this.noteReactionsRepository.find({
+      where: {
+			  noteId: note.id,
+			  userId: user.id,
+      }
 		});
 
 		if (exist == null) {
 			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
+    if (exist.length > 1 && !reaction) {
+      throw new IdentifiableError('b21ffbbf-037c-bfc2-e29a-3edd6174a36b', 'multi reacted')
+    }
+
+    const target = exist.length === 1
+    ? exist[0]
+    : exist.find(r => r.reaction === reaction)
+
+    if (!target) {
+      throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
+		}
+
 		// Delete reaction
-		const result = await this.noteReactionsRepository.delete(exist.id);
+		const result = await this.noteReactionsRepository.delete(target.id);
 
 		if (result.affected !== 1) {
 			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
 		// Decrement reactions count
-		const sql = `jsonb_set("reactions", '{${exist.reaction}}', (COALESCE("reactions"->>'${exist.reaction}', '0')::int - 1)::text::jsonb)`;
+		const sql = `jsonb_set("reactions", '{${target.reaction}}', (COALESCE("reactions"->>'${target.reaction}', '0')::int - 1)::text::jsonb)`;
 		await this.notesRepository.createQueryBuilder().update()
 			.set({
 				reactions: () => sql,
-				reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${exist.reaction}')`,
+				reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${target.reaction}')`,
 			})
 			.where('id = :id', { id: note.id })
 			.execute();
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
-			reaction: this.decodeReaction(exist.reaction).reaction,
+			reaction: this.decodeReaction(target.reaction).reaction,
 			userId: user.id,
 		});
 
 		//#region 配信
 		if (this.userEntityService.isLocalUser(user) && !note.localOnly) {
-			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(await this.apRendererService.renderLike(exist, note), user));
+			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(await this.apRendererService.renderLike(target, note), user));
 			const dm = this.apDeliverManagerService.createDeliverManager(user, content);
 			if (note.userHost !== null) {
 				const reactee = await this.usersRepository.findOneBy({ id: note.userId });
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
index e6c3bbbcf581..304f3d1407da 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
@@ -35,6 +35,12 @@ export const meta = {
 			code: 'NOT_REACTED',
 			id: '92f4426d-4196-4125-aa5b-02943e2ec8fc',
 		},
+
+    multiReacted: {
+      message: 'For notes with multiple reactions, please specify the reaction to be deleted.',
+      code: 'NO_REACTION_SPECIFIED',
+      id: 'b21ffbbf-037c-bfc2-e29a-3edd6174a36b',
+    }
 	},
 } as const;
 
@@ -42,6 +48,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		noteId: { type: 'string', format: 'misskey:id' },
+    reaction: { type: 'string' },
 	},
 	required: ['noteId'],
 } as const;
@@ -57,7 +64,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 				throw err;
 			});
-			await this.reactionService.delete(me, note).catch(err => {
+			await this.reactionService.delete(me, note, ps.reaction).catch(err => {
 				if (err.id === '60527ec9-b4cb-4a88-a6bd-32d3ad26817d') throw new ApiError(meta.errors.notReacted);
 				throw err;
 			});

From 8e8809aacc2f32d49d4b1f0c72b7cb55afad46e7 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:33:35 +0900
Subject: [PATCH 15/51] =?UTF-8?q?fix:=20=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E5=89=8A=E9=99=A4=E3=81=A7reaction?=
 =?UTF-8?q?=E3=81=8C=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=9F=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=81=AF=E5=BF=85=E3=81=9A=E3=81=9D=E3=82=8C=E3=82=92?=
 =?UTF-8?q?=E8=A6=8B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/ReactionService.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 55a8cbaab27a..6199313dc272 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -276,6 +276,7 @@ export class ReactionService {
       where: {
 			  noteId: note.id,
 			  userId: user.id,
+        reaction
       }
 		});
 
@@ -287,9 +288,7 @@ export class ReactionService {
       throw new IdentifiableError('b21ffbbf-037c-bfc2-e29a-3edd6174a36b', 'multi reacted')
     }
 
-    const target = exist.length === 1
-    ? exist[0]
-    : exist.find(r => r.reaction === reaction)
+    const target = exist[0]
 
     if (!target) {
       throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');

From eed71639d0310b002b8f68ce0ace1e5a59e8df6e Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:46:53 +0900
Subject: [PATCH 16/51] =?UTF-8?q?fix:=20=E3=82=AB=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AFreaction=E3=81=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E3=81=AA=E6=96=87=E5=AD=97=E5=88=97=E3=81=AB?=
 =?UTF-8?q?=E3=81=AA=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E8=80=83=E6=85=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index eac6940a8c95..0c4f2e67c63e 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -78,7 +78,7 @@ async function toggleReaction() {
 		}
 		misskeyApi('notes/reactions/delete', {
 			noteId: props.note.id,
-      reaction: props.reaction,
+      reaction: (isCustomEmoji.value) ? `:${emoji.value.name}:` : props.reaction,
 		})
 	} else {
 		sound.playMisskeySfx('reaction');

From d8df1e81fb238175c455d17ac8d1b39458e7c940 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:52:17 +0900
Subject: [PATCH 17/51] =?UTF-8?q?fix:=20myReactions=E3=81=8C=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E3=81=97=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB?=
 =?UTF-8?q?render=E3=81=95=E3=82=8C=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 0c4f2e67c63e..e660f2c0044f 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	ref="buttonEl"
 	v-ripple="canToggle"
 	class="_button"
-	:class="[$style.root, { [$style.reacted]: note.myReactions.includes(reaction), [$style.canToggle]: canToggle, [$style.small]: defaultStore.state.reactionsDisplaySize === 'small', [$style.large]: defaultStore.state.reactionsDisplaySize === 'large' }]"
+	:class="[$style.root, { [$style.reacted]: note.myReactions?.includes(reaction), [$style.canToggle]: canToggle, [$style.small]: defaultStore.state.reactionsDisplaySize === 'small', [$style.large]: defaultStore.state.reactionsDisplaySize === 'large' }]"
 	@click="toggleReaction()"
 	@contextmenu.prevent.stop="menu"
 >

From b468053a2f2cefdbe614f62ba47fe45a3ccac40e Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 15 Mar 2024 23:58:40 +0900
Subject: [PATCH 18/51] =?UTF-8?q?SPAM=E5=AF=BE=E7=AD=96=E3=81=A8webp?=
 =?UTF-8?q?=E3=81=A7=E8=AA=AD=E3=82=81=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=20=E6=9A=AB=E5=AE=9A=E5=AF=BE=E5=87=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activitypub/models/ApNoteService.ts  | 25 +++++++++++++++----
 .../src/components/global/MkAvatar.vue        |  8 +++++-
 packages/frontend/src/scripts/media-proxy.ts  |  4 +--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 07023801a112..73ce2e8f2b6b 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -52,6 +52,9 @@ export class ApNoteService {
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
 		private idService: IdService,
 		private apMfmService: ApMfmService,
 		private apResolverService: ApResolverService,
@@ -173,28 +176,40 @@ export class ApNoteService {
 		// SPAM対策
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
 		const hasNoFF = actor.followersCount === 0 && actor.followingCount === 0;
+
+		this.logger.info('CHECK', JSON.stringify({
+			note: note.id,
+			hasNoFF,
+			mentions: apMentions.map((user) => user.uri),
+			username: actor.username,
+			handle: actor.name,
+			pattern: /^[a-z0-9]+$/.test(actor.username),
+			length: actor.username.length === 10,
+			suspectSPAMUsername: actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10
+		}))
+
 		if (apMentions.length >= 5 && hasNoFF){
 			this.logger.error('Too many mensions included', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
 				mentions: apMentions.map((user) => user.uri),
 			});
-			throw new Error('too many mensions included.');
+			throw new StatusError('TOO_MANY_MENTIONS', 202, 'Too many mentions included.');
 		}
 		if (apMentions.includes((user) => user.isSuspended) && hasNoFF) {
 			this.logger.error('Suspended user mention included', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
-				suspended: apMentions.find((user)  => user.isSuspended)
+				suspended: apMentions.find((user)  => user.isSuspended),
 			});
-			throw new Error('includes suspended user.')
+			throw new StatusError('INCLUDES_SUSPENDED_USER_MENTEON', 202, 'To avoid SPAM, do not include mention of the suspended user.');
 		}
-		if (actor.username === actor.name && /^[a-z0-9]+$/.test(actor.username) && apMentions.length > 0 && hasNoFF){
+		if (actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10 && apMentions.length > 0 && hasNoFF){
 			this.logger.error('Suspected SPAM', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
 			});
-			throw new Error('suspected SPAM')
+			throw new StatusError('SUSPECTED_SPAM', 202, 'Violated SPAM policy.');
 		}
 
 		const apHashtags = extractApHashtags(note.tag);
diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue
index e8e1bc696bf0..a6a48c576338 100644
--- a/packages/frontend/src/components/global/MkAvatar.vue
+++ b/packages/frontend/src/components/global/MkAvatar.vue
@@ -84,7 +84,13 @@ const bound = computed(() => props.link
 const url = computed(() => {
 	if (props.user.avatarUrl == null) return null;
 	if (defaultStore.state.disableShowingAnimatedImages || defaultStore.state.dataSaver.avatar) return getStaticImageUrl(props.user.avatarUrl);
-	return props.user.avatarUrl;
+	const url = new URL(props.user.avatarUrl);
+	const pathname = url.pathname;
+	const lastDotIndex = pathname.lastIndexOf(".");
+	if (lastDotIndex > -1) {
+		url.pathname = pathname.substring(0, lastDotIndex);
+	}
+	return url.href;
 });
 
 function onClick(ev: MouseEvent): void {
diff --git a/packages/frontend/src/scripts/media-proxy.ts b/packages/frontend/src/scripts/media-proxy.ts
index 099a22163af4..7bb61dff5e49 100644
--- a/packages/frontend/src/scripts/media-proxy.ts
+++ b/packages/frontend/src/scripts/media-proxy.ts
@@ -16,8 +16,8 @@ export function getProxiedImageUrl(imageUrl: string, type?: 'preview' | 'emoji'
 	}
 
 	return `${mustOrigin ? localProxy : instance.mediaProxy}/${
-		type === 'preview' ? 'preview.webp'
-		: 'image.webp'
+		type === 'preview' ? 'preview'
+		: 'image'
 	}?${query({
 		url: imageUrl,
 		...(!noFallback ? { 'fallback': '1' } : {}),

From d50832a4ebf98424f3548eda1a94f0af32e8212b Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 16 Mar 2024 00:21:37 +0900
Subject: [PATCH 19/51] =?UTF-8?q?fix:=20myReactions=E3=81=8C=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E3=81=97=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB?=
 =?UTF-8?q?=E7=9B=B8=E4=B9=97=E3=82=8A=E3=81=8C=E4=B8=8D=E5=8F=AF=E3=81=AA?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index e660f2c0044f..94232ead3c64 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -63,7 +63,7 @@ const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction
 async function toggleReaction() {
 	if (!canToggle.value) return;
 
-	const oldReactions = props.note.myReactions;
+	const oldReactions = props.note.myReactions ?? [];
 
   // 取り消しの場合
 	if (oldReactions.find(r => r === props.reaction) || props.note.myReaction === props.reaction) {

From 19d564e7c735311133935518147e4601731430ef Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 16 Mar 2024 01:55:12 +0900
Subject: [PATCH 20/51] =?UTF-8?q?fix:=20=E5=AE=9A=E6=95=B0=E3=81=AE?=
 =?UTF-8?q?=E5=86=8D=E5=AE=9A=E7=BE=A9=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/activitypub/models/ApNoteService.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 7ccc165da9c6..e0be79013f17 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -212,7 +212,6 @@ export class ApNoteService {
 		}
 
 		// SPAM対策
-		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
 		const hasNoFF = actor.followersCount === 0 && actor.followingCount === 0;
 
 		this.logger.info('CHECK', JSON.stringify({
@@ -250,7 +249,6 @@ export class ApNoteService {
 			throw new StatusError('SUSPECTED_SPAM', 202, 'Violated SPAM policy.');
 		}
 
-		const apHashtags = extractApHashtags(note.tag);
 		// 添付ファイル
 		// TODO: attachmentは必ずしもImageではない
 		// TODO: attachmentは必ずしも配列ではない

From bb59cc5a07508e1ffef045270586500ccb364c4f Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 16 Mar 2024 02:31:32 +0900
Subject: [PATCH 21/51] =?UTF-8?q?feat:=20Public=E3=81=AA=E3=83=AA=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=AF=E4=BB=96=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=82=82TL=E8=A1=A8=E7=A4=BA=E5=8F=AF=E8=83=BD=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/server/api/endpoints/notes/user-list-timeline.ts       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index 43877e61efaf..86720fcdcf6e 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -92,10 +92,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			const list = await this.userListsRepository.findOneBy({
 				id: ps.listId,
-				userId: me.id,
 			});
 
-			if (list == null) {
+			if (list == null || (list.userId !== me.id && !list.isPublic)) {
 				throw new ApiError(meta.errors.noSuchList);
 			}
 

From 61258fc7d0cfa27bdebfb684350ec84f8b3d31ed Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sat, 16 Mar 2024 02:57:41 +0900
Subject: [PATCH 22/51] =?UTF-8?q?feat:=20nayize=E3=82=92=E5=BC=B7=E5=88=B6?=
 =?UTF-8?q?=E7=9A=84=E3=81=AB=E7=84=A1=E5=8A=B9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/global/MkMisskeyFlavoredMarkdown.ts      | 4 ++--
 packages/frontend/src/pages/settings/general.vue            | 2 ++
 packages/frontend/src/store.ts                              | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index f31a1efaae0a..802cc2e4c354 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -78,7 +78,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	 * @param scale How times large the text is
 	 * @param disableNyaize Whether nyaize is disabled or not
 	 */
-	const genEl = (ast: mfm.MfmNode[], scale: number, disableNyaize = false) => ast.map((token): VNode | string | (VNode | string)[] => {
+	const genEl = (ast: mfm.MfmNode[], scale: number, disableNyaize = defaultStore.state.denyaize) => ast.map((token): VNode | string | (VNode | string)[] => {
 		switch (token.type) {
 			case 'text': {
 				let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
@@ -462,7 +462,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 			}
 
 			case 'plain': {
-				return [h('span', genEl(token.children, scale, true))];
+				return [h('span', genEl(token.children, scale, defaultStore.state.denyaize))];
 			}
 
 			default: {
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index d13b6884bdd9..231816d2492f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -58,6 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-if="advancedMfm" v-model="enableQuickAddMfmFunction">{{ i18n.ts.enableQuickAddMfmFunction }}</MkSwitch>
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
+        <MkSwitch v-model="denyaize">{{ i18n.ts.denyaize }}</MkSwitch>
 				<MkRadios v-model="reactionsDisplaySize">
 					<template #label>{{ i18n.ts.reactionsDisplaySize }}</template>
 					<option value="small">{{ i18n.ts.small }}</option>
@@ -306,6 +307,7 @@ const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disable
 const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications'));
 const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect'));
 const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHorizontalSwipe'));
+const denyaize = computed(defaultStore.makeGetterSetter('denyaize'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index dfc4169a54bc..edc462388c75 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -221,7 +221,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	animatedMfm: {
 		where: 'device',
-		default: false,
+		default: true,
 	},
 	advancedMfm: {
 		where: 'device',
@@ -476,6 +476,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: { type: 'syuilo/bubble2', volume: 1 } as SoundStore,
 	},
+  denyaize: {
+    where: 'device',
+    default: false,
+  }
 }));
 
 // TODO: 他のタブと永続化されたstateを同期

From b3de1c0b8dc2817d6636bdfb83ebd7ae56ecffc2 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sun, 17 Mar 2024 00:56:07 +0900
Subject: [PATCH 23/51] autogen types

---
 packages/misskey-js/src/autogen/types.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index d4949665221d..7526014463d5 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3993,8 +3993,8 @@ export type components = {
       url?: string;
       reactionAndUserPairCache?: string[];
       clippedCount?: number;
-      myReaction?: string | null; // 互換性のために残す
-      myReactions?: string[];
+      myReaction?: string | null;
+      myReactions?: string[] | null;
     };
     NoteReaction: {
       /**
@@ -21212,6 +21212,7 @@ export type operations = {
         'application/json': {
           /** Format: misskey:id */
           noteId: string;
+          reaction?: string;
         };
       };
     };

From 70e93685f6a56d6278927e80f667e713cc1f1c58 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Sun, 17 Mar 2024 01:39:02 +0900
Subject: [PATCH 24/51] chore: eslint fix

---
 packages/backend/src/core/ReactionService.ts  |  38 ++---
 .../core/activitypub/models/ApNoteService.ts  |   8 +-
 .../src/core/entities/NoteEntityService.ts    |   2 +-
 .../WebhookDeliverProcessorService.ts         |   4 +-
 .../components/MkReactionsViewer.reaction.vue |   2 +-
 .../src/components/global/MkCustomEmoji.vue   | 161 +++++++++---------
 .../frontend/src/scripts/use-note-capture.ts  |   4 +-
 7 files changed, 105 insertions(+), 114 deletions(-)

diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index 988dc8dd895e..3509c3254e61 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -167,14 +167,14 @@ export class ReactionService {
 		} catch (e) {
 			if (isDuplicateKeyValueError(e)) {
 				const exists = await this.noteReactionsRepository.findOneBy({
-          noteId: note.id,
-          userId: user.id,
-          reaction,
-        });
-
-        // 同じリアクションがすでにされていたらエラー
-        if (exists) throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
-      } else {
+					noteId: note.id,
+					userId: user.id,
+					reaction,
+				});
+
+				// 同じリアクションがすでにされていたらエラー
+				if (exists) throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
+			} else {
 				throw e;
 			}
 		}
@@ -273,25 +273,25 @@ export class ReactionService {
 	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, reaction?: string) {
 		// if already unreacted
 		const exist = await this.noteReactionsRepository.find({
-      where: {
-			  noteId: note.id,
-			  userId: user.id,
-        reaction
-      }
+			where: {
+				noteId: note.id,
+				userId: user.id,
+				reaction
+			}
 		});
 
 		if (exist == null) {
 			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
-    if (exist.length > 1 && !reaction) {
-      throw new IdentifiableError('b21ffbbf-037c-bfc2-e29a-3edd6174a36b', 'multi reacted')
-    }
+		if (exist.length > 1 && !reaction) {
+			throw new IdentifiableError('b21ffbbf-037c-bfc2-e29a-3edd6174a36b', 'multi reacted');
+		}
 
-    const target = exist[0]
+		const target = exist[0];
 
-    if (!target) {
-      throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
+		if (!target) {
+			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
 		// Delete reaction
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index e0be79013f17..056093f48b65 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -223,9 +223,9 @@ export class ApNoteService {
 			pattern: /^[a-z0-9]+$/.test(actor.username),
 			length: actor.username.length === 10,
 			suspectSPAMUsername: actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10
-		}))
+		}));
 
-		if (apMentions.length >= 5 && hasNoFF){
+		if (apMentions.length >= 5 && hasNoFF) {
 			this.logger.error('Too many mensions included', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
@@ -237,11 +237,11 @@ export class ApNoteService {
 			this.logger.error('Suspended user mention included', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
-				suspended: apMentions.find((user)  => user.isSuspended),
+				suspended: apMentions.find((user) => user.isSuspended),
 			});
 			throw new StatusError('INCLUDES_SUSPENDED_USER_MENTEON', 202, 'To avoid SPAM, do not include mention of the suspended user.');
 		}
-		if (actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10 && apMentions.length > 0 && hasNoFF){
+		if (actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10 && apMentions.length > 0 && hasNoFF) {
 			this.logger.error('Suspected SPAM', {
 				account: `@${actor.username}@${actor.host}`,
 				note: `${note.id}`,
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index c8d1a272cd0a..25a2a8cf39ea 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -324,7 +324,7 @@ export class NoteEntityService implements OnModuleInit {
 
     const myReactions = (meId && Object.keys(note.reactions).length)
     ? await this.populateMyReaction(note, meId, options?._hint_)
-    : undefined
+    : undefined;
 
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
index 3700ab13560a..7491c8388a7a 100644
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
@@ -36,9 +36,9 @@ export class WebhookDeliverProcessorService {
 	public async process(job: Bull.Job<WebhookDeliverJobData>): Promise<string> {
 		try {
 			this.logger.debug(`delivering ${job.data.webhookId}`);
-			const isDiscord = job.data.to.startsWith('https://discordapp.com') || job.data.to.startsWith('https://discord.com')
+			const isDiscord = job.data.to.startsWith('https://discordapp.com') || job.data.to.startsWith('https://discord.com');
 
-			if (isDiscord && job.data.type !== 'note') throw Error('Not new post')
+			if (isDiscord && job.data.type !== 'note') throw Error('Not new post');
 
 			const res = (isDiscord)
 				? await this.httpRequestService.send(job.data.to, {
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index fb33ff79790e..dcb8b423c010 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -78,7 +78,7 @@ async function toggleReaction() {
 		misskeyApi('notes/reactions/delete', {
 			noteId: props.note.id,
       reaction: (isCustomEmoji.value) ? `:${emoji.value.name}:` : props.reaction,
-		})
+		});
 	} else {
 		sound.playMisskeySfx('reaction');
 
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 0252949889ba..22f7d98003aa 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -5,22 +5,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <img
-	v-if="errored && fallbackToImage"
-	:class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
-	src="/client-assets/dummy.png"
-	:title="alt"
+	v-if="errored && fallbackToImage" :class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
+	src="/client-assets/dummy.png" :title="alt"
 />
 <span v-else-if="errored">:{{ customEmojiName }}:</span>
 <img
-	v-else
-	:class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
-	:src="url"
-	:alt="alt"
-	:title="alt"
-	decoding="async"
-	@error="errored = true"
-	@load="errored = false"
-	@click="onClick"
+	v-else :class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]" :src="url" :alt="alt"
+	:title="alt" decoding="async" @error="errored = true" @load="errored = false" @click="onClick"
 />
 </template>
 
@@ -45,7 +36,7 @@ const props = defineProps<{
 	useOriginalSize?: boolean;
 	menu?: boolean;
 	menuReaction?: boolean;
-  menuImport?: boolean;
+	menuImport?: boolean;
 	fallbackToImage?: boolean;
 }>();
 
@@ -84,81 +75,81 @@ const url = computed(() => {
 const alt = computed(() => `:${customEmojiName.value}:`);
 const errored = ref(url.value == null);
 
-const importEmoji = async(emojiName) => {
-  // 同名の絵文字が存在しないかチェック
-  const localCheckResponse = Object.values(await misskeyApi('admin/emoji/list', {
-    query: emojiName
-  })).find((e) => e.name === emojiName)
-
-  // 存在しない場合 インポート
-  if (!localCheckResponse){
-    const emoji = (await misskeyApi('admin/emoji/list-remote', {
-      query: emojiName
-    })).find((e) => e.name === emojiName)
-	  await os.apiWithDialog('admin/emoji/copy', {
-		  emojiId: emoji.id,
-	  });
-  }
-
-  // リアクション
-  react(`:${emojiName}:`);
-  sound.playMisskeySfx('reaction');
+const importEmoji = async (emojiName) => {
+	// 同名の絵文字が存在しないかチェック
+	const localCheckResponse = Object.values(await misskeyApi('admin/emoji/list', {
+		query: emojiName,
+	})).find((_emoji) => _emoji.name === emojiName);
+
+	// 存在しない場合 インポート
+	if (!localCheckResponse) {
+		const emoji = (await misskeyApi('admin/emoji/list-remote', {
+			query: emojiName,
+		})).find((_emoji) => _emoji.name === emojiName);
+		await os.apiWithDialog('admin/emoji/copy', {
+			emojiId: emoji.id,
+		});
+	}
+
+	// リアクション
+	react(`:${emojiName}:`);
+	sound.playMisskeySfx('reaction');
 };
 
 function onClick(ev: MouseEvent) {
 	if (props.menu) {
-    if(props.menuImport){
-      os.popupMenu([{
-        type: 'label',
-        text: `:${props.name}:`,
-        }, {
-        text: i18n.ts.copy,
-        icon: 'ti ti-copy',
-        action: () => {
-          copyToClipboard(`:${props.name}:`);
-          os.success();
-        },
-      }, ...(props.menuImport && react ? [{
-        text: i18n.ts.doReaction,
-        icon: 'ti ti-plus',
-        action: () => {
-          importEmoji(props.name)
-        },
-      }] : [])
-      ], ev.currentTarget ?? ev.target);
-    }else{
-      os.popupMenu([{
-        type: 'label',
-        text: `:${props.name}:`,
-        }, {
-        text: i18n.ts.copy,
-        icon: 'ti ti-copy',
-        action: () => {
-          copyToClipboard(`:${props.name}:`);
-          os.success();
-        },
-      }, ...(props.menuReaction && react ? [{
-        text: i18n.ts.doReaction,
-        icon: 'ti ti-plus',
-        action: () => {
-          react(`:${props.name}:`);
-          sound.playMisskeySfx('reaction');
-        },
-      }] : []), {
-        text: i18n.ts.info,
-        icon: 'ti ti-info-circle',
-        action: async () => {
-          os.popup(MkCustomEmojiDetailedDialog, {
-            emoji: await misskeyApiGet('emoji', {
-              name: customEmojiName.value,
-            }),
-          }, {
-            anchor: ev.target,
-          });
-        },
-      }], ev.currentTarget ?? ev.target);
-    }
-  }
+		if (props.menuImport) {
+			os.popupMenu([{
+				type: 'label',
+				text: `:${props.name}:`,
+			}, {
+				text: i18n.ts.copy,
+				icon: 'ti ti-copy',
+				action: () => {
+					copyToClipboard(`:${props.name}:`);
+					os.success();
+				},
+			}, ...(props.menuImport && react ? [{
+				text: i18n.ts.doReaction,
+				icon: 'ti ti-plus',
+				action: () => {
+					importEmoji(props.name);
+				},
+			}] : []),
+			], ev.currentTarget ?? ev.target);
+		} else {
+			os.popupMenu([{
+				type: 'label',
+				text: `:${props.name}:`,
+			}, {
+				text: i18n.ts.copy,
+				icon: 'ti ti-copy',
+				action: () => {
+					copyToClipboard(`:${props.name}:`);
+					os.success();
+				},
+			}, ...(props.menuReaction && react ? [{
+				text: i18n.ts.doReaction,
+				icon: 'ti ti-plus',
+				action: () => {
+					react(`:${props.name}:`);
+					sound.playMisskeySfx('reaction');
+				},
+			}] : []), {
+				text: i18n.ts.info,
+				icon: 'ti ti-info-circle',
+				action: async () => {
+					os.popup(MkCustomEmojiDetailedDialog, {
+						emoji: await misskeyApiGet('emoji', {
+							name: customEmojiName.value,
+						}),
+					}, {
+						anchor: ev.target,
+					});
+				},
+			}], ev.currentTarget ?? ev.target);
+		}
+	}
 }
 </script>
 
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index 2e1e3c1a22b3..d30b0076217b 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -40,8 +40,8 @@ export function useNoteCapture(props: {
 					note.value.myReaction = reaction;
           if (note.value.myReactions) {
             note.value.myReactions.push(reaction);
-          }else{
-            note.value.myReactions = [reaction]
+          } else {
+            note.value.myReactions = [reaction];
           }
 				}
 				break;

From 39460c287f0855d1bc197baf734b0c78a3133f8f Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 13:28:17 +0900
Subject: [PATCH 25/51] =?UTF-8?q?feat:=20=E5=A4=96=E9=83=A8=E3=81=AE?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=81=A7=E3=82=82=E6=9C=80=E7=B5=82?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=99=82=E5=88=BB=E3=81=8B=E3=82=89=E3=82=AA?=
 =?UTF-8?q?=E3=83=B3=E3=83=A9=E3=82=A4=E3=83=B3=E7=8A=B6=E6=B3=81=E3=82=92?=
 =?UTF-8?q?=E6=8E=A8=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/entities/UserEntityService.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 14761357a5a8..ae39935638d9 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -271,8 +271,9 @@ export class UserEntityService implements OnModuleInit {
 	@bindThis
 	public getOnlineStatus(user: MiUser): 'unknown' | 'online' | 'active' | 'offline' {
 		if (user.hideOnlineStatus) return 'unknown';
-		if (user.lastActiveDate == null) return 'unknown';
-		const elapsed = Date.now() - user.lastActiveDate.getTime();
+    const activeDate = user.lastActiveDate ?? user.updatedAt
+		if (activeDate == null) return 'unknown';
+		const elapsed = Date.now() - activeDate.getTime();
 		return (
 			elapsed < USER_ONLINE_THRESHOLD ? 'online' :
 			elapsed < USER_ACTIVE_THRESHOLD ? 'active' :

From 8f8adec5fb21bbda9abd60b5a7c547b93fb0e5d4 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 13:56:38 +0900
Subject: [PATCH 26/51] =?UTF-8?q?delete:=20SPAM=E3=83=81=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E3=82=92=E4=B8=80=E9=83=A8=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activitypub/models/ApNoteService.ts  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 056093f48b65..5cf50872d373 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -213,34 +213,6 @@ export class ApNoteService {
 
 		// SPAM対策
 		const hasNoFF = actor.followersCount === 0 && actor.followingCount === 0;
-
-		this.logger.info('CHECK', JSON.stringify({
-			note: note.id,
-			hasNoFF,
-			mentions: apMentions.map((user) => user.uri),
-			username: actor.username,
-			handle: actor.name,
-			pattern: /^[a-z0-9]+$/.test(actor.username),
-			length: actor.username.length === 10,
-			suspectSPAMUsername: actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10
-		}));
-
-		if (apMentions.length >= 5 && hasNoFF) {
-			this.logger.error('Too many mensions included', {
-				account: `@${actor.username}@${actor.host}`,
-				note: `${note.id}`,
-				mentions: apMentions.map((user) => user.uri),
-			});
-			throw new StatusError('TOO_MANY_MENTIONS', 202, 'Too many mentions included.');
-		}
-		if (apMentions.includes((user) => user.isSuspended) && hasNoFF) {
-			this.logger.error('Suspended user mention included', {
-				account: `@${actor.username}@${actor.host}`,
-				note: `${note.id}`,
-				suspended: apMentions.find((user) => user.isSuspended),
-			});
-			throw new StatusError('INCLUDES_SUSPENDED_USER_MENTEON', 202, 'To avoid SPAM, do not include mention of the suspended user.');
-		}
 		if (actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10 && apMentions.length > 0 && hasNoFF) {
 			this.logger.error('Suspected SPAM', {
 				account: `@${actor.username}@${actor.host}`,

From 3606b50040a9e0eb49469ffc05777302bfd29461 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 14:14:02 +0900
Subject: [PATCH 27/51] =?UTF-8?q?fix:=20string=E3=81=8C=E6=9C=9F=E5=BE=85?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E7=AE=87=E6=89=80=E3=81=A7string[]?=
 =?UTF-8?q?=E3=82=92=E6=B8=A1=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/stream/channels/channel.ts      | 2 +-
 .../backend/src/server/api/stream/channels/global-timeline.ts   | 2 +-
 packages/backend/src/server/api/stream/channels/hashtag.ts      | 2 +-
 .../backend/src/server/api/stream/channels/home-timeline.ts     | 2 +-
 .../backend/src/server/api/stream/channels/hybrid-timeline.ts   | 2 +-
 .../backend/src/server/api/stream/channels/local-timeline.ts    | 2 +-
 packages/backend/src/server/api/stream/channels/user-list.ts    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 90ee1ecda5d3..e93e6e9054db 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -48,7 +48,7 @@ class ChannelChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index 723b89c90877..ca8aba6ace68 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -74,7 +74,7 @@ class GlobalTimelineChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 377b1a016239..136104cc799a 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -53,7 +53,7 @@ class HashtagChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index f45bf8622eb2..f821d249bad0 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -91,7 +91,7 @@ class HomeTimelineChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index d67da6f56531..a423d0ead70c 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -98,7 +98,7 @@ class HybridTimelineChannel extends Channel {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				console.log(note.renote.reactionAndUserPairCache);
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index 43d26124ef2c..cf145be805b5 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -73,7 +73,7 @@ class LocalTimelineChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index f7bb106c03eb..81dfdc5845a1 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -118,7 +118,7 @@ class UserListChannel extends Channel {
 		if (this.user && note.renoteId && !note.text) {
 			if (note.renote && Object.keys(note.renote.reactions).length > 0) {
 				const myRenoteReaction = await this.noteEntityService.populateMyReaction(note.renote, this.user.id);
-				note.renote.myReaction = myRenoteReaction;
+				note.renote.myReaction = myRenoteReaction?.find(() => true);
 			}
 		}
 

From 5d0773321c358dabe629c87de8e935eb87a6f2a0 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 14:15:34 +0900
Subject: [PATCH 28/51] =?UTF-8?q?fix:=20WebHook=E3=81=A7content=E3=81=8Cun?=
 =?UTF-8?q?known=E3=81=AA=E3=81=AE=E3=81=AB=E6=9A=AB=E5=AE=9A=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/queue/processors/WebhookDeliverProcessorService.ts    | 2 +-
 packages/backend/src/queue/types.ts                           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
index 7491c8388a7a..1e4e1c4d6f92 100644
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
@@ -47,7 +47,7 @@ export class WebhookDeliverProcessorService {
 						'Content-Type': 'application/json',
 					},
 					body: JSON.stringify({
-						content: `[@${job.data.content.note.user.name}](https://misskey.sweshelo.jp/notes/${job.data.content.note.id})\n> ${job.data.content.note.text}`,
+						content: `[@${job.data.content.note.user?.name}](https://misskey.sweshelo.jp/notes/${job.data.content.note.id})\n> ${job.data.content.note.text}`,
 					})
 				})
 				: await this.httpRequestService.send(job.data.to, {
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index ce57ba745eb4..498194f8a24b 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -108,7 +108,9 @@ export type EndedPollNotificationJobData = {
 
 export type WebhookDeliverJobData = {
 	type: string;
-	content: unknown;
+	content: {
+    note: MiNote
+  }; // TODO: 本当はノート以外にも取り得る
 	webhookId: MiWebhook['id'];
 	userId: MiUser['id'];
 	to: string;

From 7396ddcca89b0c96f61635f5c86d6992f4c7095b Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 14:15:45 +0900
Subject: [PATCH 29/51] =?UTF-8?q?fix:=20import=E3=82=A8=E3=83=A9=E3=83=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/activitypub/models/ApNoteService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 5cf50872d373..4ff4c9f3bc2d 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -7,7 +7,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import promiseLimit from 'promise-limit';
 import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { PollsRepository, EmojisRepository } from '@/models/_.js';
+import type { PollsRepository, EmojisRepository, UsersRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';

From 7864f5399b9644666c403bb056d230b124757df5 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 14:16:09 +0900
Subject: [PATCH 30/51] chore: version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41b865456dbb..c73471185c86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1",
+	"version": "2024.3.1-enma-0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 3b91db8af9655444187c1aff55b64fe22bae62ea Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 14:31:10 +0900
Subject: [PATCH 31/51] =?UTF-8?q?chore:=20locale=20denyaize=E3=82=AD?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml | 1 +
 locales/ja-JP.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d00f23632cc1..3e3ed016c3f1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -735,6 +735,7 @@ noCrawleDescription: "Ask search engines to not index your profile page, notes,
 lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
+denyaize: "Forcefully disable the nyaize (cat-marking) feature"
 disableShowingAnimatedImages: "Don't play animated images"
 highlightSensitiveMedia: "Highlight sensitive media"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 51380e49c523..5c188610a1ae 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -735,6 +735,7 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
+denyaize: "猫化(nyaize)を強制的に無効にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"

From 046c0600360895d9a509a762c6e9d5e68868b033 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 15:11:14 +0900
Subject: [PATCH 32/51] chore: ESLint

---
 packages/backend/src/core/entities/UserEntityService.ts | 2 +-
 packages/backend/src/queue/types.ts                     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index ae39935638d9..84559722be65 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -271,7 +271,7 @@ export class UserEntityService implements OnModuleInit {
 	@bindThis
 	public getOnlineStatus(user: MiUser): 'unknown' | 'online' | 'active' | 'offline' {
 		if (user.hideOnlineStatus) return 'unknown';
-    const activeDate = user.lastActiveDate ?? user.updatedAt
+    const activeDate = user.lastActiveDate ?? user.updatedAt;
 		if (activeDate == null) return 'unknown';
 		const elapsed = Date.now() - activeDate.getTime();
 		return (
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 498194f8a24b..f6d6f53d4910 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -108,9 +108,7 @@ export type EndedPollNotificationJobData = {
 
 export type WebhookDeliverJobData = {
 	type: string;
-	content: {
-    note: MiNote
-  }; // TODO: 本当はノート以外にも取り得る
+	content: any;
 	webhookId: MiWebhook['id'];
 	userId: MiUser['id'];
 	to: string;

From 4ab0106a502104a02e101cd8729128bee44884e9 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 16:16:35 +0900
Subject: [PATCH 33/51] =?UTF-8?q?fix:=20=E6=84=8F=E5=9B=B3=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=B5=E3=83=BC=E3=83=90=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=92=E3=82=A4=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/global/MkCustomEmoji.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 22f7d98003aa..3b2ecd81092f 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -85,6 +85,7 @@ const importEmoji = async (emojiName) => {
 	if (!localCheckResponse) {
 		const emoji = (await misskeyApi('admin/emoji/list-remote', {
 			query: emojiName,
+			host: props.host,
 		})).find((_emoji) => _emoji.name === emojiName);
 		await os.apiWithDialog('admin/emoji/copy', {
 			emojiId: emoji.id,

From b953702f237abdace4a094555ca545490d9895a6 Mon Sep 17 00:00:00 2001
From: emtkmkk <emtkmkk@gmail.com>
Date: Mon, 18 Mar 2024 07:46:05 +0000
Subject: [PATCH 34/51] =?UTF-8?q?feat:=20Nodeinfo=E3=81=AB=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/NodeinfoServerService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index c1e5af08c903..5ffdab67d9b0 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -120,6 +120,7 @@ export class NodeinfoServerService {
 					enableMcaptcha: meta.enableMcaptcha,
 					enableTurnstile: meta.enableTurnstile,
 					maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
+					maxReactionsPerAccount: 128,
 					enableEmail: meta.enableEmail,
 					enableServiceWorker: meta.enableServiceWorker,
 					proxyAccountName: proxyAccount ? proxyAccount.username : null,

From 325002af1f078bf14819b1f390882208baf0e327 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 18 Mar 2024 17:16:48 +0900
Subject: [PATCH 35/51] chore: locales

---
 locales/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index c1aa163f9822..cbf6f8c9581a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2956,6 +2956,10 @@ export interface Locale extends ILocale {
      * 添付画像のサムネイルをオリジナル画質にする
      */
     "loadRawImages": string;
+    /**
+     * 猫化(nyaize)を強制的に無効にする
+     */
+    "denyaize": string;
     /**
      * アニメーション画像を再生しない
      */

From 9f8c905c75cff3991fc7b3a19121256681390040 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 25 Mar 2024 19:18:50 +0900
Subject: [PATCH 36/51] =?UTF-8?q?feat:=20=E6=8B=9B=E5=BE=85=E9=96=A2?=
 =?UTF-8?q?=E9=80=A3=E3=81=AE=E5=BC=B7=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

招待コードをURLとしてコピー出来るように

招待URLへのQRコードを表示できるように
---
 locales/index.d.ts                            |  4 +
 locales/ja-JP.yml                             |  1 +
 packages/frontend/package.json                |  1 +
 .../frontend/src/components/MkInviteCode.vue  | 14 +++
 .../src/components/MkSignupDialog.form.vue    |  4 +-
 .../src/components/MkSignupDialog.vue         |  6 +-
 pnpm-lock.yaml                                | 97 +++++++++++--------
 7 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index cbf6f8c9581a..80551c091094 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4912,6 +4912,10 @@ export interface Locale extends ILocale {
      * リトライ
      */
     "gameRetry": string;
+    /**
+     * QRコード
+     */
+    "qrcode": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5c188610a1ae..3c2e1d8c16a9 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1224,6 +1224,7 @@ enableHorizontalSwipe: "スワイプしてタブを切り替える"
 loading: "読み込み中"
 surrender: "やめる"
 gameRetry: "リトライ"
+qrcode: "QRコード"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 682def8e8d7e..2954aef14fd6 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -17,6 +17,7 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
+		"@chenfengyuan/vue-qrcode": "^2.0.0",
 		"@discordapp/twemoji": "15.0.2",
 		"@github/webauthn-json": "2.1.1",
 		"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index 1c6f412dc156..6cb03a52969b 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -51,8 +51,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<div :class="$style.buttons">
 			<MkButton v-if="!invite.used && !isExpired" primary rounded @click="copyInviteCode()"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
+			<MkButton v-if="!invite.used && !isExpired" primary rounded @click="copyInviteCodeAsLink()"><i class="ti ti-copy"></i> {{ i18n.ts.copyLink }}</MkButton>
 			<MkButton v-if="!invite.used || moderator" danger rounded @click="deleteCode()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
+    <div v-if="!invite.used && !isExpired">
+			<div :class="$style.label">{{ i18n.ts.qrcode }}</div>
+      <vue-qrcode :value="inviteUrl" :options="option" tag="img"></vue-qrcode>
+    </div>
 	</div>
 </MkFolder>
 </template>
@@ -65,6 +70,7 @@ import MkButton from '@/components/MkButton.vue';
 import copyToClipboard from '@/scripts/copy-to-clipboard.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
+import VueQrcode from "@chenfengyuan/vue-qrcode";
 
 const props = defineProps<{
 	invite: Misskey.entities.InviteCode;
@@ -79,6 +85,8 @@ const isExpired = computed(() => {
 	return props.invite.expiresAt && new Date(props.invite.expiresAt) < new Date();
 });
 
+const inviteUrl = `${(new URL(window.location.href)).origin}/?invite=${props.invite.code}`
+
 function deleteCode() {
 	os.apiWithDialog('invite/delete', {
 		inviteId: props.invite.id,
@@ -90,6 +98,12 @@ function copyInviteCode() {
 	copyToClipboard(props.invite.code);
 	os.success();
 }
+
+function copyInviteCodeAsLink() {
+	copyToClipboard(inviteUrl);
+	os.success();
+}
+
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index 5f08e416c1ab..e071cd684873 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -93,8 +93,10 @@ import { i18n } from '@/i18n.js';
 
 const props = withDefaults(defineProps<{
 	autoSet?: boolean;
+  initialInvitationCode?: string;
 }>(), {
 	autoSet: false,
+  initialInvitationCode: '',
 });
 
 const emit = defineEmits<{
@@ -111,7 +113,7 @@ const turnstile = ref<Captcha | undefined>();
 const username = ref<string>('');
 const password = ref<string>('');
 const retypedPassword = ref<string>('');
-const invitationCode = ref<string>('');
+const invitationCode = ref<string>(props.initialInvitationCode);
 const email = ref('');
 const usernameState = ref<null | 'wait' | 'ok' | 'unavailable' | 'error' | 'invalid-format' | 'min-range' | 'max-range'>(null);
 const emailState = ref<null | 'wait' | 'ok' | 'unavailable:used' | 'unavailable:format' | 'unavailable:disposable' | 'unavailable:banned' | 'unavailable:mx' | 'unavailable:smtp' | 'unavailable' | 'error'>(null);
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index 97310d32a64e..f36abff193a7 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<XServerRules @done="isAcceptedServerRule = true" @cancel="dialog?.close()"/>
 			</template>
 			<template v-else>
-				<XSignup :autoSet="autoSet" @signup="onSignup" @signupEmailPending="onSignupEmailPending"/>
+				<XSignup :autoSet="autoSet" @signup="onSignup" @signupEmailPending="onSignupEmailPending" :initialInvitationCode="invitecodeParam"/>
 			</template>
 		</Transition>
 	</div>
@@ -55,6 +55,10 @@ const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 
 const isAcceptedServerRule = ref(false);
 
+// URLからinvitecodeパラメータを取得
+const urlParams = new URLSearchParams(window.location.search);
+const invitecodeParam = urlParams.get('invite') || '';
+
 function onSignup(res: Misskey.entities.SigninResponse) {
 	emit('done', res);
 	dialog.value?.close();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e29c1162be4..f0d1fdbce094 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -676,6 +676,9 @@ importers:
 
   packages/frontend:
     dependencies:
+      '@chenfengyuan/vue-qrcode':
+        specifier: ^2.0.0
+        version: 2.0.0(qrcode@1.5.3)(vue@3.4.21)
       '@discordapp/twemoji':
         specifier: 15.0.2
         version: 15.0.2
@@ -1891,7 +1894,7 @@ packages:
       '@babel/traverse': 7.23.5
       '@babel/types': 7.23.5
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1914,7 +1917,7 @@ packages:
       '@babel/traverse': 7.24.0
       '@babel/types': 7.24.0
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -2016,7 +2019,7 @@ packages:
       '@babel/core': 7.23.5
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -3198,7 +3201,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.9
       '@babel/types': 7.23.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -3216,7 +3219,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.24.0
       '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -3288,6 +3291,16 @@ packages:
     resolution: {integrity: sha512-BxOqI5LgsIQP1odU5KMwV9yoijleOPzHL18/YvNqF9KFSGF2K/DLlYAbDQsWqd/1nbaFuSkYD/191dpMtNh4vw==}
     dev: false
 
+  /@chenfengyuan/vue-qrcode@2.0.0(qrcode@1.5.3)(vue@3.4.21):
+    resolution: {integrity: sha512-33Cfr0zjbc3Dd8d5b1IgzXRAgXH0c2Gv19VI4snS25V/x9Z41eg769tC+Us1x+vqgQQhgD5YUjLnkpkrQfeMSw==}
+    peerDependencies:
+      qrcode: ^1.5.0
+      vue: ^3.0.0
+    dependencies:
+      qrcode: 1.5.3
+      vue: 3.4.21(typescript@5.3.3)
+    dev: false
+
   /@colors/colors@1.5.0:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -3869,7 +3882,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.19.0
       ignore: 5.2.4
@@ -4076,7 +4089,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -4087,7 +4100,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -6646,7 +6659,7 @@ packages:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.4.21(typescript@5.3.3)
-      vue-component-type-helpers: 1.8.27
+      vue-component-type-helpers: 2.0.7
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -7927,7 +7940,7 @@ packages:
       '@typescript-eslint/type-utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -7956,7 +7969,7 @@ packages:
       '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -7982,7 +7995,7 @@ packages:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8003,7 +8016,7 @@ packages:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.57.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -8038,7 +8051,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
       '@typescript-eslint/utils': 6.11.0(eslint@8.53.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.53.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8058,7 +8071,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.57.0
       ts-api-utils: 1.0.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -8087,7 +8100,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 6.11.0
       '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -8108,7 +8121,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -8537,7 +8550,7 @@ packages:
     engines: {node: '>= 6.0.0'}
     requiresBuild: true
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -8545,7 +8558,7 @@ packages:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
     engines: {node: '>= 14'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -8902,7 +8915,7 @@ packages:
     resolution: {integrity: sha512-TAlMYvOuwGyLK3PfBb5WKBXZmXz2fVCgv23d6zZFdle/q3gPjmxBaeuC0pY0Dzs5PWMSgfqqEZkrye19GlDTgw==}
     dependencies:
       archy: 1.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       fastq: 1.15.0
     transitivePeerDependencies:
       - supports-color
@@ -10341,7 +10354,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 5.5.0
-    dev: true
 
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -10354,6 +10366,7 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
+    dev: true
 
   /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
@@ -10561,7 +10574,7 @@ packages:
     hasBin: true
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -10891,7 +10904,7 @@ packages:
     peerDependencies:
       esbuild: '>=0.12 <1'
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -11200,7 +11213,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -11247,7 +11260,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -11866,7 +11879,7 @@ packages:
       debug:
         optional: true
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
 
   /for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -12410,7 +12423,6 @@ packages:
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
-    dev: true
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -12569,7 +12581,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12629,7 +12641,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -12638,7 +12650,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12800,7 +12812,7 @@ packages:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       denque: 2.1.0
       lodash.defaults: 4.2.0
       lodash.isarguments: 3.1.0
@@ -13240,7 +13252,7 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -14773,7 +14785,7 @@ packages:
     resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -17687,7 +17699,7 @@ packages:
     dependencies:
       '@hapi/hoek': 10.0.1
       '@hapi/wreck': 18.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       joi: 17.11.0
     transitivePeerDependencies:
       - supports-color
@@ -17888,7 +17900,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -18042,7 +18054,7 @@ packages:
       arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
@@ -18300,7 +18312,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
-    dev: true
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -18914,7 +18925,7 @@ packages:
       chalk: 4.1.2
       cli-highlight: 2.1.11
       dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       dotenv: 16.0.3
       glob: 10.3.10
       ioredis: 5.3.2
@@ -19247,7 +19258,7 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       mlly: 1.5.0
       pathe: 1.1.2
       picocolors: 1.0.0
@@ -19359,7 +19370,7 @@ packages:
       acorn-walk: 8.3.2
       cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       happy-dom: 13.6.2
       local-pkg: 0.4.3
       magic-string: 0.30.7
@@ -19445,6 +19456,10 @@ packages:
     resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
     dev: true
 
+  /vue-component-type-helpers@2.0.7:
+    resolution: {integrity: sha512-7e12Evdll7JcTIocojgnCgwocX4WzIYStGClBQ+QuWPinZo/vQolv2EMq4a3lg16TKfwWafLimG77bxb56UauA==}
+    dev: true
+
   /vue-demi@0.14.7(vue@3.4.21):
     resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
     engines: {node: '>=12'}
@@ -19485,7 +19500,7 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.57.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3

From e09e47d3ee1c34cf6edebc4b286b687c556c3f33 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Mon, 25 Mar 2024 20:00:08 +0900
Subject: [PATCH 37/51] chore: ESLint

---
 packages/frontend/src/components/MkInviteCode.vue              | 2 +-
 .../frontend/src/components/MkReactionsViewer.reaction.vue     | 3 ++-
 packages/frontend/src/components/MkSignupDialog.vue            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index 6cb03a52969b..88eba6e665eb 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -85,7 +85,7 @@ const isExpired = computed(() => {
 	return props.invite.expiresAt && new Date(props.invite.expiresAt) < new Date();
 });
 
-const inviteUrl = `${(new URL(window.location.href)).origin}/?invite=${props.invite.code}`
+const inviteUrl = `${(new URL(window.location.href)).origin}/?invite=${props.invite.code}`;
 
 function deleteCode() {
 	os.apiWithDialog('invite/delete', {
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index dcb8b423c010..ac304eb06ad3 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -53,6 +53,7 @@ const buttonEl = shallowRef<HTMLElement>();
 
 const emojiName = computed(() => props.reaction.replace(/:/g, '').replace(/@\./, ''));
 const emoji = computed(() => customEmojisMap.get(emojiName.value) ?? getUnicodeEmoji(props.reaction));
+const isCustomEmoji = computed(() => props.reaction.includes(':'));
 
 const canToggle = computed(() => {
 	return !props.reaction.match(/@\w/) && $i && emoji.value && checkReactionPermissions($i, props.note, emoji.value);
@@ -77,7 +78,7 @@ async function toggleReaction() {
 		}
 		misskeyApi('notes/reactions/delete', {
 			noteId: props.note.id,
-      reaction: (isCustomEmoji.value) ? `:${emoji.value.name}:` : props.reaction,
+			reaction: (isCustomEmoji.value) ? `:${emojiName.value}:` : props.reaction,
 		});
 	} else {
 		sound.playMisskeySfx('reaction');
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index f36abff193a7..3698114706da 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<XServerRules @done="isAcceptedServerRule = true" @cancel="dialog?.close()"/>
 			</template>
 			<template v-else>
-				<XSignup :autoSet="autoSet" @signup="onSignup" @signupEmailPending="onSignupEmailPending" :initialInvitationCode="invitecodeParam"/>
+				<XSignup :autoSet="autoSet" :initialInvitationCode="invitecodeParam" @signup="onSignup" @signupEmailPending="onSignupEmailPending"/>
 			</template>
 		</Transition>
 	</div>

From 723f21476cfedfac49e63f292ae9d9aac29bc0d8 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Tue, 26 Mar 2024 01:55:39 +0900
Subject: [PATCH 38/51] version 2024.3.1-enma-1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c73471185c86..cb41e20663d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1-enma-0",
+	"version": "2024.3.1-enma-1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From b6225e1af926fab8a686a572fb7437c02aad6a5a Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Thu, 28 Mar 2024 17:29:57 +0900
Subject: [PATCH 39/51] =?UTF-8?q?update:=20test=E3=82=92=E5=AE=9F=E8=A3=85?=
 =?UTF-8?q?=E3=81=AB=E5=8D=B3=E3=81=97=E3=81=9F=E5=86=85=E5=AE=B9=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/test/e2e/endpoints.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index d4695978053e..fbf94b0f588d 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -233,7 +233,7 @@ describe('Endpoints', () => {
 			assert.strictEqual(res.status, 204);
 		});
 
-		test('二重にリアクションすると上書きされる', async () => {
+		test('二重にリアクションできる', async () => {
 			const bobPost = await post(bob, { text: 'hi' });
 
 			await api('/notes/reactions/create', {
@@ -253,7 +253,10 @@ describe('Endpoints', () => {
 			}, alice);
 
 			assert.strictEqual(resNote.status, 200);
-			assert.deepStrictEqual(resNote.body.reactions, { '🚀': 1 });
+			assert.deepStrictEqual(resNote.body.reactions, {
+				'🚀': 1,
+				'🥰': 1,
+			});
 		});
 
 		test('存在しない投稿にはリアクションできない', async () => {

From 651e9b41f23a7d4e9181ceb5c6ab0db614e75437 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 29 Mar 2024 19:06:38 +0900
Subject: [PATCH 40/51] =?UTF-8?q?feat:=20=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=A0?=
 =?UTF-8?q?=E3=81=91=E3=82=92=E8=A1=8C=E3=81=86=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/MkInviteCode.vue  |  2 +-
 .../src/components/global/MkCustomEmoji.vue   | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index 88eba6e665eb..e1ea79d6ec6a 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -55,7 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkButton v-if="!invite.used || moderator" danger rounded @click="deleteCode()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
     <div v-if="!invite.used && !isExpired">
-			<div :class="$style.label">{{ i18n.ts.qrcode }}</div>
+			<div :class="$style.label">{{ i18n.ts.qrcode }} - {{ i18n.ts.qrcodeToInvite }}</div>
       <vue-qrcode :value="inviteUrl" :options="option" tag="img"></vue-qrcode>
     </div>
 	</div>
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 3b2ecd81092f..30185c4992ff 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -90,11 +90,12 @@ const importEmoji = async (emojiName) => {
 		await os.apiWithDialog('admin/emoji/copy', {
 			emojiId: emoji.id,
 		});
+	} else {
+		os.alert({
+			title: i18n.ts.error,
+			text: i18n.ts.emojiAlreadyExists,
+		})
 	}
-
-	// リアクション
-	react(`:${emojiName}:`);
-	sound.playMisskeySfx('reaction');
 };
 
 function onClick(ev: MouseEvent) {
@@ -111,10 +112,20 @@ function onClick(ev: MouseEvent) {
 					os.success();
 				},
 			}, ...(props.menuImport && react ? [{
+				text: i18n.ts.import,
+				icon: 'ti ti-download',
+				action: () => {
+					importEmoji(props.name);
+				},
+			}, {
 				text: i18n.ts.doReaction,
 				icon: 'ti ti-plus',
 				action: () => {
-					importEmoji(props.name);
+					importEmoji(props.name).then(() => {
+							// リアクション
+							react(`:${props.name}:`);
+							sound.playMisskeySfx('reaction');
+					});
 				},
 			}] : []),
 			], ev.currentTarget ?? ev.target);

From 2802b6a1a5f82abd793ff09960fe1139346dca34 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Fri, 29 Mar 2024 19:06:55 +0900
Subject: [PATCH 41/51] =?UTF-8?q?feat:=20=E3=83=AD=E3=82=B1=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=82=AD=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts | 8 ++++++++
 locales/ja-JP.yml  | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 80551c091094..29e4155b6028 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4916,6 +4916,14 @@ export interface Locale extends ILocale {
      * QRコード
      */
     "qrcode": string;
+    /**
+     * このQRコードをスキャンすると、新規登録時の招待コードが自動で入力されます。
+     */
+    "qrcodeToInvite": string;
+    /**
+     * 指定された絵文字は既に存在します。
+     */
+    "emojiAlreadyExists": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3c2e1d8c16a9..e3e3b2643cdd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1225,6 +1225,8 @@ loading: "読み込み中"
 surrender: "やめる"
 gameRetry: "リトライ"
 qrcode: "QRコード"
+qrcodeToInvite: "このQRコードをスキャンすると、新規登録時の招待コードが自動で入力されます。"
+emojiAlreadyExists: "指定された絵文字は既に存在します。"
 
 _bubbleGame:
   howToPlay: "遊び方"

From ba509ba87dc60eb501fecb1db38d023dc9ba8357 Mon Sep 17 00:00:00 2001
From: sweshelo <root@sweshelo.jp>
Date: Sun, 31 Mar 2024 16:28:52 +0900
Subject: [PATCH 42/51] fix: ESLint

---
 .../src/components/global/MkCustomEmoji.vue      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 30185c4992ff..7e4e08186baa 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -87,14 +87,16 @@ const importEmoji = async (emojiName) => {
 			query: emojiName,
 			host: props.host,
 		})).find((_emoji) => _emoji.name === emojiName);
-		await os.apiWithDialog('admin/emoji/copy', {
-			emojiId: emoji.id,
-		});
+		if (emoji) {
+			await os.apiWithDialog('admin/emoji/copy', {
+				emojiId: emoji.id,
+			});
+		}
 	} else {
 		os.alert({
 			title: i18n.ts.error,
 			text: i18n.ts.emojiAlreadyExists,
-		})
+		});
 	}
 };
 
@@ -122,9 +124,9 @@ function onClick(ev: MouseEvent) {
 				icon: 'ti ti-plus',
 				action: () => {
 					importEmoji(props.name).then(() => {
-							// リアクション
-							react(`:${props.name}:`);
-							sound.playMisskeySfx('reaction');
+						// リアクション
+						react(`:${props.name}:`);
+						sound.playMisskeySfx('reaction');
 					});
 				},
 			}] : []),

From 8cc3f65304a66c485d257a49cfbbb742ef3ff7f6 Mon Sep 17 00:00:00 2001
From: sweshelo <root@sweshelo.jp>
Date: Sun, 31 Mar 2024 16:43:06 +0900
Subject: [PATCH 43/51] version 2024.3.1-enma-2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c73471185c86..0f43ba14c046 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1-enma-0",
+	"version": "2024.3.1-enma-2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From fa2ecc4888f451e25df4b092cd1569cc7dc65534 Mon Sep 17 00:00:00 2001
From: sweshelo <root@sweshelo.jp>
Date: Tue, 2 Apr 2024 14:11:45 +0900
Subject: [PATCH 44/51] =?UTF-8?q?feat:=20=E8=A1=A8=E7=A4=BA=E4=B8=8A?=
 =?UTF-8?q?=E3=81=AEURL=E3=81=8C=E5=AE=9F=E9=9A=9B=E3=81=AEURL=E3=81=A8?=
 =?UTF-8?q?=E7=95=B0=E3=81=AA=E3=82=8B=E9=9A=9B=E3=81=AB=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNote.vue   | 41 ++++++++++++++++++-
 .../src/components/MkNoteDetailed.vue         | 40 +++++++++++++++++-
 .../src/components/MkPhishingCaution.vue      | 33 +++++++++++++++
 .../src/scripts/extract-url-from-mfm.ts       | 41 ++++++++++++++++---
 4 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 packages/frontend/src/components/MkPhishingCaution.vue

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 93e930490cb8..f410ebed0d02 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -70,6 +70,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							:enableEmojiMenu="true"
 							:enableEmojiMenuReaction="true"
 						/>
+						<MkPhishingCaution v-if="isSuspectPhishingLink" :cautionMessage="i18n.ts.shortPhishingCaution" />
 						<div v-if="translating || translation" :class="$style.translation">
 							<MkLoading v-if="translating" mini/>
 							<div v-else-if="translation">
@@ -82,7 +83,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkMediaList :mediaList="appearNote.files"/>
 					</div>
 					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
-					<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>
+					<MkUrlPreview v-for="url in previewUrls" :key="url" :url="url.href" :compact="true" :detail="false" :class="$style.urlPreview"/>
 					<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
 					<button v-if="isLong && collapsed" :class="$style.collapsed" class="_button" @click="collapsed = false">
 						<span :class="$style.collapsedLabel">{{ i18n.ts.showMore }}</span>
@@ -168,6 +169,7 @@ import MkPoll from '@/components/MkPoll.vue';
 import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
+import MkPhishingCaution from '@/components/MkPhishingCaution.vue';
 import { pleaseLogin } from '@/scripts/please-login.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
@@ -250,7 +252,8 @@ const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entiti
 const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
 const parsed = computed(() => appearNote.value.text ? mfm.parse(appearNote.value.text) : null);
-const urls = computed(() => parsed.value ? extractUrlFromMfm(parsed.value).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null);
+const urls = computed(() => parsed.value ? extractUrlFromMfm(parsed.value).filter((url) => appearNote.value.renote?.url !== url.href && appearNote.value.renote?.uri !== url.href) : null);
+const previewUrls = computed(() => urls.value.filter(url => url.preview))
 const isLong = shouldCollapsed(appearNote.value, urls.value ?? []);
 const collapsed = ref(appearNote.value.cw == null && isLong);
 const isDeleted = ref(false);
@@ -266,6 +269,40 @@ const renoteCollapsed = ref(
 		(appearNote.value.myReaction != null)
 	)
 );
+function isURL(str) {
+  try {
+    new URL(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+function getDomain(url) {
+  try {
+    const domain = new URL(url).hostname;
+    return domain;
+  } catch (e) {
+    return null;
+  }
+}
+const isSuspectPhishingLink = computed(() => {
+  return urls.value.some(url => {
+    // url.textが配列でない場合、配列に変換
+    const text = Array.isArray(url.text) ? url.text.join('') : url.text;
+
+    // textがURLでない場合、すぐに次のurlへ
+		console.log(text)
+		if (!isURL((text.startsWith('https://') || text.startsWith('http://')) ? text : `https://${text}`)) return false;
+
+    // hrefとtextのドメインを比較
+    const hrefDomain = getDomain(url.href);
+    const textDomain = getDomain(text);
+		console.log(hrefDomain, textDomain)
+
+    // ドメインが一致しない場合、フィッシングの疑いあり
+    return hrefDomain !== textDomain && textDomain;
+  });
+});
 
 /* Overload FunctionにLintが対応していないのでコメントアウト
 function checkMute(noteToCheck: Misskey.entities.Note, mutedWords: Array<string | string[]> | undefined | null, checkOnly: true): boolean;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 68d374ed94f6..66d6cea4bcb6 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -83,6 +83,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					:enableEmojiMenu="true"
 					:enableEmojiMenuReaction="true"
 				/>
+				<MkPhishingCaution v-if="isSuspectPhishingLink" :cautionMessage="i18n.ts.phishingCaution" />
 				<a v-if="appearNote.renote != null" :class="$style.rn">RN:</a>
 				<div v-if="translating || translation" :class="$style.translation">
 					<MkLoading v-if="translating" mini/>
@@ -95,7 +96,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkMediaList :mediaList="appearNote.files"/>
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
-				<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" style="margin-top: 6px;"/>
+				<MkUrlPreview v-for="url in previewUrls" :key="url" :url="url.href" :compact="true" :detail="true" style="margin-top: 6px;"/>
 				<div v-if="appearNote.renote" :class="$style.quote"><MkNoteSimple :note="appearNote.renote" :class="$style.quoteNote"/></div>
 			</div>
 			<MkA v-if="appearNote.channel && !inChannel" :class="$style.channel" :to="`/channels/${appearNote.channel.id}`"><i class="ti ti-device-tv"></i> {{ appearNote.channel.name }}</MkA>
@@ -202,6 +203,7 @@ import MkPoll from '@/components/MkPoll.vue';
 import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
+import MkPhishingCaution from '@/components/MkPhishingCaution.vue';
 import { pleaseLogin } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
 import { userPage } from '@/filters/user.js';
@@ -274,12 +276,46 @@ const muted = ref($i ? checkWordMute(appearNote.value, $i, $i.mutedWords) : fals
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null;
-const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null;
+const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url.href && appearNote.value.renote?.uri !== url.href) : null;
+const previewUrls = urls.filter(url => url.preview)
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
 const conversation = ref<Misskey.entities.Note[]>([]);
 const replies = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
 
+function isURL(str) {
+  try {
+    new URL(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+function getDomain(url) {
+  try {
+    const domain = new URL(url).hostname;
+    return domain;
+  } catch (e) {
+    return null;
+  }
+}
+const isSuspectPhishingLink = urls.some(url => {
+    // url.textが配列でない場合、配列に変換
+    const text = Array.isArray(url.text) ? url.text.join('') : url.text;
+
+    // textがURLでない場合、すぐに次のurlへ
+		console.log(text)
+		if (!isURL((text.startsWith('https://') || text.startsWith('http://')) ? text : `https://${text}`)) return false;
+
+    // hrefとtextのドメインを比較
+    const hrefDomain = getDomain(url.href);
+    const textDomain = getDomain(text);
+		console.log(hrefDomain, textDomain)
+
+    // ドメインが一致しない場合、フィッシングの疑いあり
+    return hrefDomain !== textDomain && textDomain;
+	});
+
 const keymap = {
 	'r': () => reply(true),
 	'e|a|plus': () => react(true),
diff --git a/packages/frontend/src/components/MkPhishingCaution.vue b/packages/frontend/src/components/MkPhishingCaution.vue
new file mode 100644
index 000000000000..ccbbfb159470
--- /dev/null
+++ b/packages/frontend/src/components/MkPhishingCaution.vue
@@ -0,0 +1,33 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.root"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i>{{ cautionMessage }}</div>
+</template>
+
+<script lang="ts" setup>
+
+defineProps<{
+	cautionMessage: string;
+}>();
+</script>
+
+<style lang="scss" module>
+.root {
+	font-size: 0.8em;
+	padding: 8px 12px;
+	margin-top: 10px;
+	margin-bottom: 10px;
+	background: var(--infoWarnBg);
+	color: var(--error);
+	border-radius: var(--radius);
+	overflow: clip;
+}
+
+.link {
+	margin-left: 4px;
+	color: var(--accent);
+}
+</style>
diff --git a/packages/frontend/src/scripts/extract-url-from-mfm.ts b/packages/frontend/src/scripts/extract-url-from-mfm.ts
index d5654ba850f8..88122953f7a0 100644
--- a/packages/frontend/src/scripts/extract-url-from-mfm.ts
+++ b/packages/frontend/src/scripts/extract-url-from-mfm.ts
@@ -12,13 +12,44 @@ const removeHash = (x: string) => x.replace(/#[^#]*$/, '');
 
 export function extractUrlFromMfm(nodes: mfm.MfmNode[], respectSilentFlag = true): string[] {
 	const urlNodes = mfm.extract(nodes, (node) => {
-		return (node.type === 'url') || (node.type === 'link' && (!respectSilentFlag || !node.props.silent));
+		return (node.type === 'url') || (node.type === 'link');
 	});
-	const urls: string[] = unique(urlNodes.map(x => x.props.url));
+	const urls = unique(urlNodes.map(x => {
+		return x.type === 'url'
+			? ({
+				href: x.props.url,
+				text: x.props.url,
+				preview: true,
+			})
+			: ({
+				href: x.props.url,
+				text: extractTextValues(x.children) ?? [],
+				preview: (!respectSilentFlag || !x.props.silent),
+			})
+	}));
 
 	return urls.reduce((array, url) => {
-		const urlWithoutHash = removeHash(url);
-		if (!array.map(x => removeHash(x)).includes(urlWithoutHash)) array.push(url);
+		const urlWithoutHash = removeHash(url.href);
+		if (!array.map(x => removeHash(x.href)).includes(urlWithoutHash)) array.push(url);
 		return array;
-	}, [] as string[]);
+	}, []);
+}
+
+function extractTextValues(obj: mfm.MfmNode) {
+  const textValues = [];
+
+  function traverse(o) {
+    if (Array.isArray(o)) {
+      o.forEach(item => traverse(item));
+    } else if (o && typeof o === 'object') {
+      if (o.type === 'text') {
+        textValues.push(o.props.text);
+      } else if (o.children) {
+        o.children.forEach(child => traverse(child));
+      }
+    }
+  }
+
+  traverse(obj);
+  return textValues;
 }

From ae87e9bf02c81043c73e6c52ae482279837486d3 Mon Sep 17 00:00:00 2001
From: rassi0429 <taitokokoa+rassi@gmail.com>
Date: Tue, 2 Apr 2024 16:44:10 +0900
Subject: [PATCH 45/51] =?UTF-8?q?feat:=20=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=81=AE=E4=BA=BA=E6=95=B0=E3=82=92=E3=82=A2=E3=82=A4=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MkReactionsViewer.reaction.vue | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index ac304eb06ad3..09bbb1fafa6d 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -13,12 +13,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@contextmenu.prevent.stop="menu"
 >
 	<MkReactionIcon :class="defaultStore.state.limitWidthOfReaction ? $style.limitWidth : ''" :reaction="reaction" :emojiUrl="note.reactionEmojis[reaction.substring(1, reaction.length - 1)]"/>
-	<span :class="$style.count">{{ count }}</span>
+	<span :class="$style.count">
+	</span>
+	<div v-for="u in users" :key="u.id" :class="$style.avatars" style="height: 42px; width: auto">
+		<MkAvatar :class="$style.avatar" :user="u"/>
+	</div>
 </button>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, shallowRef, watch } from 'vue';
+import { computed, inject, onMounted, shallowRef, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkCustomEmojiDetailedDialog from './MkCustomEmojiDetailedDialog.vue';
 import XDetails from '@/components/MkReactionsViewer.details.vue';
@@ -60,6 +64,15 @@ const canToggle = computed(() => {
 });
 const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':'));
 
+const reactions = await misskeyApiGet('notes/reactions', {
+	noteId: props.note.id,
+	type: props.reaction,
+	limit: 10,
+	_cacheKey_: props.count,
+});
+
+const users = ref([])
+
 async function toggleReaction() {
 	if (!canToggle.value) return;
 
@@ -124,10 +137,28 @@ function anime() {
 }
 
 watch(() => props.count, (newCount, oldCount) => {
+	console.log('count changed', oldCount, newCount);
+	misskeyApiGet('notes/reactions', {
+		noteId: props.note.id,
+		type: props.reaction,
+		limit: 10,
+		_cacheKey_: newCount,
+	}).then((reactions) => {
+		users.value = reactions.map(x => x.user);
+	});
+
 	if (oldCount < newCount) anime();
 });
 
 onMounted(() => {
+	misskeyApiGet('notes/reactions', {
+		noteId: props.note.id,
+		type: props.reaction,
+		limit: 10,
+	}).then((reactions) => {
+		users.value = reactions.map(x => x.user);
+	});
+
 	if (!props.isInitial) anime();
 });
 
@@ -154,6 +185,17 @@ if (!mock) {
 </script>
 
 <style lang="scss" module>
+.avatars {
+	display: flex;
+	align-items: center;
+}
+
+.avatar {
+	height: 20px;
+	width: 20px;
+	margin-left: 2px;
+}
+
 .root {
 	display: inline-flex;
 	height: 42px;

From 134842d5f5848435ffea9ef9c07d436146c9bc38 Mon Sep 17 00:00:00 2001
From: rassi0429 <taitokokoa+rassi@gmail.com>
Date: Wed, 3 Apr 2024 08:31:48 +0900
Subject: [PATCH 46/51] fix: initial api get

---
 .../src/components/MkReactionsViewer.reaction.vue    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 09bbb1fafa6d..993886d024ca 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -64,12 +64,12 @@ const canToggle = computed(() => {
 });
 const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':'));
 
-const reactions = await misskeyApiGet('notes/reactions', {
-	noteId: props.note.id,
-	type: props.reaction,
-	limit: 10,
-	_cacheKey_: props.count,
-});
+// const reactions = await misskeyApiGet('notes/reactions', {
+// 	noteId: props.note.id,
+// 	type: props.reaction,
+// 	limit: 10,
+// 	_cacheKey_: props.count,
+// });
 
 const users = ref([])
 

From f9e85b227b868ebf06b91023adf408a317981ee8 Mon Sep 17 00:00:00 2001
From: rassi0429 <taitokokoa+rassi@gmail.com>
Date: Tue, 2 Apr 2024 16:52:42 +0900
Subject: [PATCH 47/51] =?UTF-8?q?chore:=20=E3=82=A2=E3=82=A4=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E3=82=82=E3=81=86=E3=81=A1=E3=82=87=E3=81=84?=
 =?UTF-8?q?=E5=B0=8F=E3=81=95=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/MkReactionsViewer.reaction.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 993886d024ca..47139c2d8720 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -191,8 +191,8 @@ if (!mock) {
 }
 
 .avatar {
-	height: 20px;
-	width: 20px;
+	height: 14px;
+	width: 14px;
 	margin-left: 2px;
 }
 

From d2a617c054405730e1e277fe547637c4036decfc Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Wed, 3 Apr 2024 13:58:21 +0900
Subject: [PATCH 48/51] fix: ESLint

---
 packages/frontend/src/components/MkNote.vue         | 13 ++++++++-----
 packages/frontend/src/components/MkNoteDetailed.vue | 12 +++++++-----
 .../frontend/src/scripts/extract-url-from-mfm.ts    |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index f410ebed0d02..5565f2fd02bc 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -253,7 +253,7 @@ const isMyRenote = $i && ($i.id === note.value.userId);
 const showContent = ref(false);
 const parsed = computed(() => appearNote.value.text ? mfm.parse(appearNote.value.text) : null);
 const urls = computed(() => parsed.value ? extractUrlFromMfm(parsed.value).filter((url) => appearNote.value.renote?.url !== url.href && appearNote.value.renote?.uri !== url.href) : null);
-const previewUrls = computed(() => urls.value.filter(url => url.preview))
+const previewUrls = computed(() => urls.value.filter(url => url.preview));
 const isLong = shouldCollapsed(appearNote.value, urls.value ?? []);
 const collapsed = ref(appearNote.value.cw == null && isLong);
 const isDeleted = ref(false);
@@ -269,35 +269,38 @@ const renoteCollapsed = ref(
 		(appearNote.value.myReaction != null)
 	)
 );
+
 function isURL(str) {
   try {
     new URL(str);
     return true;
-  } catch (e) {
+  } catch (error) {
     return false;
   }
 }
+
 function getDomain(url) {
   try {
     const domain = new URL(url).hostname;
     return domain;
-  } catch (e) {
+  } catch (error) {
     return null;
   }
 }
+
 const isSuspectPhishingLink = computed(() => {
   return urls.value.some(url => {
     // url.textが配列でない場合、配列に変換
     const text = Array.isArray(url.text) ? url.text.join('') : url.text;
 
     // textがURLでない場合、すぐに次のurlへ
-		console.log(text)
+		console.log(text);
 		if (!isURL((text.startsWith('https://') || text.startsWith('http://')) ? text : `https://${text}`)) return false;
 
     // hrefとtextのドメインを比較
     const hrefDomain = getDomain(url.href);
     const textDomain = getDomain(text);
-		console.log(hrefDomain, textDomain)
+		console.log(hrefDomain, textDomain);
 
     // ドメインが一致しない場合、フィッシングの疑いあり
     return hrefDomain !== textDomain && textDomain;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 66d6cea4bcb6..c363a2f671bc 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -277,7 +277,7 @@ const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null;
 const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url.href && appearNote.value.renote?.uri !== url.href) : null;
-const previewUrls = urls.filter(url => url.preview)
+const previewUrls = urls.filter(url => url.preview);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
 const conversation = ref<Misskey.entities.Note[]>([]);
 const replies = ref<Misskey.entities.Note[]>([]);
@@ -287,30 +287,32 @@ function isURL(str) {
   try {
     new URL(str);
     return true;
-  } catch (e) {
+  } catch (error) {
     return false;
   }
 }
+
 function getDomain(url) {
   try {
     const domain = new URL(url).hostname;
     return domain;
-  } catch (e) {
+  } catch (error) {
     return null;
   }
 }
+
 const isSuspectPhishingLink = urls.some(url => {
     // url.textが配列でない場合、配列に変換
     const text = Array.isArray(url.text) ? url.text.join('') : url.text;
 
     // textがURLでない場合、すぐに次のurlへ
-		console.log(text)
+		console.log(text);
 		if (!isURL((text.startsWith('https://') || text.startsWith('http://')) ? text : `https://${text}`)) return false;
 
     // hrefとtextのドメインを比較
     const hrefDomain = getDomain(url.href);
     const textDomain = getDomain(text);
-		console.log(hrefDomain, textDomain)
+		console.log(hrefDomain, textDomain);
 
     // ドメインが一致しない場合、フィッシングの疑いあり
     return hrefDomain !== textDomain && textDomain;
diff --git a/packages/frontend/src/scripts/extract-url-from-mfm.ts b/packages/frontend/src/scripts/extract-url-from-mfm.ts
index 88122953f7a0..8adc62ce9056 100644
--- a/packages/frontend/src/scripts/extract-url-from-mfm.ts
+++ b/packages/frontend/src/scripts/extract-url-from-mfm.ts
@@ -25,7 +25,7 @@ export function extractUrlFromMfm(nodes: mfm.MfmNode[], respectSilentFlag = true
 				href: x.props.url,
 				text: extractTextValues(x.children) ?? [],
 				preview: (!respectSilentFlag || !x.props.silent),
-			})
+			});
 	}));
 
 	return urls.reduce((array, url) => {

From 7bc65c1f6c09dc954629dd69ad74caa144725101 Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Wed, 3 Apr 2024 14:43:56 +0900
Subject: [PATCH 49/51] fix: ESLint

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 47139c2d8720..03d354572b6b 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -71,7 +71,7 @@ const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction
 // 	_cacheKey_: props.count,
 // });
 
-const users = ref([])
+const users = ref([]);
 
 async function toggleReaction() {
 	if (!canToggle.value) return;

From 0a77af373bc50ddbaab7e8d24a0619a38d44296e Mon Sep 17 00:00:00 2001
From: sweshelo <sweshelo@gmail.com>
Date: Wed, 3 Apr 2024 14:55:04 +0900
Subject: [PATCH 50/51] chore: version enma-3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f43ba14c046..b3c4a627b4c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1-enma-2",
+	"version": "2024.3.1-enma-3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 275288303ba517e17e506a55bc4237b8fb757c53 Mon Sep 17 00:00:00 2001
From: sweshelo <root@sweshelo.jp>
Date: Wed, 3 Apr 2024 15:11:56 +0900
Subject: [PATCH 51/51] add: Locales

---
 locales/index.d.ts | 8 ++++++++
 locales/ja-JP.yml  | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 29e4155b6028..dbbfb63104e7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1184,6 +1184,14 @@ export interface Locale extends ILocale {
      * リモートユーザーのため、情報が不完全です。
      */
     "remoteUserCaution": string;
+    /**
+     * 表示されているURLと実際のURLが異なります。フィッシング詐欺などに注意してください。
+     */
+    "phishingCaution": string;
+    /**
+     * 表示上と実際のURLが異なります。
+     */
+    "shortPhishingCaution": string;
     /**
      * アクティビティ
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e3e3b2643cdd..6a02c6c82d5b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -292,6 +292,8 @@ termsOfService: "利用規約"
 start: "始める"
 home: "ホーム"
 remoteUserCaution: "リモートユーザーのため、情報が不完全です。"
+phishingCaution: "表示されているURLと実際のURLが異なります。フィッシング詐欺などに注意してください。"
+shortPhishingCaution: "表示上と実際のURLが異なります。"
 activity: "アクティビティ"
 images: "画像"
 image: "画像"