From c239c425b4d503912159be15a3d18d03e2976b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A6=E3=81=83?=
 =?UTF-8?q?=E3=83=BC=E3=80=82?=
 <56515516+mattyatea@users.noreply.github.com>
Date: Sun, 18 Aug 2024 04:17:27 +0900
Subject: [PATCH 1/8] =?UTF-8?q?enhance(profile):=20=E7=9B=B8=E4=BA=92?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AE=E6=A9=9F=E8=83=BD=E6=94=B9?=
 =?UTF-8?q?=E5=96=84=20(MisskeyIO#703)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                            |  4 +++
 locales/ja-JP.yml                             |  1 +
 .../endpoints/admin/unset-user-mutual-link.ts |  8 +++--
 .../frontend/src/components/MkMediaImage.vue  | 15 +++++++++
 packages/frontend/src/pages/admin-user.vue    | 31 +++++++++++++++++--
 .../frontend/src/pages/settings/profile.vue   |  6 ++--
 packages/frontend/src/pages/user/home.vue     |  1 +
 packages/misskey-js/src/autogen/types.ts      |  2 ++
 8 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 1efcd8d71..c53f67dd2 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5095,6 +5095,10 @@ export interface Locale extends ILocale {
      * 相互リンク
      */
     "mutualLink": string;
+    /**
+     * このファイルをドライブに保存する
+     */
+    "saveThisFile": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 727d687a3..7ad273c3b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1269,6 +1269,7 @@ blockThisUser: "このユーザーをブロックする"
 muteThisUser: "このユーザーをミュートする"
 here: "こちら"
 mutualLink: "相互リンク"
+saveThisFile: "このファイルをドライブに保存する"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/packages/backend/src/server/api/endpoints/admin/unset-user-mutual-link.ts b/packages/backend/src/server/api/endpoints/admin/unset-user-mutual-link.ts
index 735711c0e..ba2674656 100644
--- a/packages/backend/src/server/api/endpoints/admin/unset-user-mutual-link.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unset-user-mutual-link.ts
@@ -19,8 +19,9 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		userId: { type: 'string', format: 'misskey:id' },
+		itemId: { type: 'string', format: 'misskey:id' },
 	},
-	required: ['userId'],
+	required: ['userId', 'itemId'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -43,7 +44,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			await this.userProfilesRepository.update(user.id, {
-				mutualLinkSections: [],
+				mutualLinkSections: userProfile.mutualLinkSections.map(section => ({
+					...section,
+					mutualLinks: section.mutualLinks.filter(item => item.id !== ps.itemId),
+				})),
 			});
 
 			this.moderationLogService.log(me, 'unsetUserMutualLink', {
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 72ee04b5a..94b7c7459 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -62,6 +62,7 @@ import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { pleaseLogin } from '@/scripts/please-login.js';
 import { $i, iAmModerator } from '@/account.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
 
 const props = withDefaults(defineProps<{
 	image: Misskey.entities.DriveFile;
@@ -92,6 +93,20 @@ function showMenu(ev: MouseEvent) {
 		action: () => {
 			hide.value = true;
 		},
+	}, {
+		text: i18n.ts.saveThisFile,
+		icon: 'ti ti-cloud-upload',
+		action: () => {
+			os.selectDriveFolder(false).then(async folder => {
+				if (folder[0] == null) {
+					return;
+				}
+				misskeyApi('drive/files/upload-from-url', {
+					url: props.image.url,
+					folderId: folder ? folder[0].id : undefined,
+				});
+			});
+		},
 	}];
 
 	if ($i?.id === props.image.userId || iAmModerator) {
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 5035675f5..3a9a6c775 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -66,7 +66,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 								<MkButton v-if="user.host == null" @click="resetPassword"><i class="ti ti-key"></i> {{ i18n.ts.resetPassword }}</MkButton>
 								<MkButton inline danger @click="unsetUserAvatar"><i class="ti ti-user-circle"></i> {{ i18n.ts.unsetUserAvatar }}</MkButton>
 								<MkButton inline danger @click="unsetUserBanner"><i class="ti ti-photo"></i> {{ i18n.ts.unsetUserBanner }}</MkButton>
-								<MkButton inline danger @click="unsetUserMutualLink"><i class="ti ti-photo"></i> {{ i18n.ts.unsetUserMutualLink }}</MkButton>
+								<MkFolder v-if="user?.mutualLinkSections && user?.mutualLinkSections.reduce((acc, section) => acc + section.mutualLinks.length, 0) > 0">
+									<template #icon><i class="ti ti-link"></i></template>
+									<template #label>{{ i18n.ts._profile.mutualLinksEdit }}</template>
+
+									<div v-for="mutualLinkSection in user?.mutualLinkSections">
+										<div v-for="mutualLink in mutualLinkSection.mutualLinks" :key="mutualLink.id" :class="$style.fields">
+											<p> {{ mutualLink.url }} </p>
+											<img :class="$style.mutualLinkImg" :src="mutualLink.imgSrc" :alt="mutualLink.description"/>
+											<p> {{ mutualLink.description }} </p>
+											<MkButton inline danger @click="unsetUserMutualLink(mutualLink.id)"><i class="ti ti-link"></i> {{ i18n.ts.unsetUserMutualLink }}</MkButton>
+										</div>
+									</div>
+								</MkFolder>
 							</div>
 						</MkFolder>
 
@@ -365,15 +377,16 @@ async function unsetUserBanner() {
 	}).then(refreshUser);
 }
 
-async function unsetUserMutualLink() {
+async function unsetUserMutualLink(mutualLinkid: string) {
 	const confirm = await os.confirm({
 		type: 'warning',
 		text: i18n.ts.unsetUserMutualLinkConfirm,
 	});
 	if (confirm.canceled) return;
 
-	await os.apiWithDialog('admin/unset-user-mutual-banner', {
+	await os.apiWithDialog('admin/unset-user-mutual-link', {
 		userId: user.value.id,
+		itemId: mutualLinkid,
 	}).then(refreshUser);
 }
 
@@ -705,4 +718,16 @@ definePageMetadata(() => ({
 	border-radius: 6px;
 	cursor: pointer;
 }
+
+.mutualLinkImg {
+	max-width: 200px;
+	max-height: 40px;
+}
+.fields {
+	padding: 24px;
+	border-bottom: solid 0.5px var(--divider);
+	&:last-child {
+		border-bottom: none;
+	}
+}
 </style>
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index b2b91bbb7..dfeba525a 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -112,7 +112,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #item="{ element: sectionElement, index: sectionIndex }">
 						<div :class="$style.mutualLinkSectionRoot">
 							<button v-if="!mutualLinkSectionEditMode" class="_button" :class="$style.dragItemHandle" tabindex="-1"><i class="ti ti-menu"></i></button>
-							<button v-if="mutualLinkSectionEditMode" :disabled="fields.length <= 1" class="_button" :class="$style.dragItemRemove" @click="deleteMutualLinkSection(sectionIndex)"><i class="ti ti-x"></i></button>
+
+							{{sectionElement.length }}
+							<button v-if="mutualLinkSectionEditMode" :disabled="sectionElement.length <= 1" class="_button" :class="$style.dragItemRemove" @click="deleteMutualLinkSection(sectionIndex)"><i class="ti ti-x"></i></button>
 							<FormSlot :style="{flexGrow: 1}">
 								<MkFolder>
 									<template #label>{{ sectionElement.name || i18n.ts._profile.sectionNameNone }}</template>
@@ -136,7 +138,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 										<template #item="{ element: linkElement, index: linkIndex }">
 											<div :class="$style.mutualLinkRoot">
 												<button v-if="!mutualLinkSectionEditMode" class="_button" :class="$style.dragItemHandle" tabindex="-1"><i class="ti ti-menu"></i></button>
-												<button v-if="mutualLinkSectionEditMode" :disabled="fields.length <= 1" class="_button" :class="$style.dragItemRemove" @click="deleteMutualLink(sectionIndex,linkIndex)"><i class="ti ti-x"></i></button>
+												<button v-if="mutualLinkSectionEditMode" class="_button" :class="$style.dragItemRemove" @click="deleteMutualLink(sectionIndex,linkIndex)"><i class="ti ti-x"></i></button>
 
 												<div class="_gaps_s" :style="{flex: 1}">
 													<MkInfo v-if="linkIndex >= $i.policies.mutualLinkLimit" warn><Mfm :text="i18n.tsx._profile.policyDisplayLimitExceeded({ max: $i.policies.mutualLinkLimit })"/></MkInfo>
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 56a116a75..42e6bd9fd 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -624,6 +624,7 @@ onUnmounted(() => {
 					padding: 24px;
 					font-size: 0.9em;
 					border-top: solid 0.5px var(--divider);
+					margin-top: 0.5px;
 
 					> .field {
 						display: flex;
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 508cc739a..ff91ef10f 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -6855,6 +6855,8 @@ export type operations = {
         'application/json': {
           /** Format: misskey:id */
           userId: string;
+          /** Format: misskey:id */
+          itemId: string;
         };
       };
     };

From 63f1a8d8ec06377fcba681fd88708dd421543430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:13:13 +0900
Subject: [PATCH 2/8] Update cropperjs to v2.0.0-rc.0 (MisskeyIO#707)

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

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 8e12dd2b3..de0a870de 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -43,7 +43,7 @@
 		"chartjs-plugin-zoom": "2.0.1",
 		"chromatic": "11.7.0",
 		"compare-versions": "6.1.1",
-		"cropperjs": "2.0.0-beta.4",
+		"cropperjs": "2.0.0-rc.0",
 		"date-fns": "3.6.0",
 		"escape-regexp": "0.0.1",
 		"estree-walker": "3.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd3d7f9a5..17cc4e1b1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -782,8 +782,8 @@ importers:
         specifier: 6.1.1
         version: 6.1.1
       cropperjs:
-        specifier: 2.0.0-beta.4
-        version: 2.0.0-beta.4
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
       date-fns:
         specifier: 3.6.0
         version: 3.6.0
@@ -5280,8 +5280,8 @@ packages:
     resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
     engines: {node: '>=12.0.0'}
 
-  cropperjs@2.0.0-beta.4:
-    resolution: {integrity: sha512-tWIQnvbou6eJvQkajwhGLOOEw03dM/i23FmnUQtMKjuzbTDSMP61kcwM77Uit8MXEWcUb5PH8n4jawyrFvj5ag==}
+  cropperjs@2.0.0-rc.0:
+    resolution: {integrity: sha512-/1oQT6Ten55trDVsC3OsVqp09ugf0T/QP8NKcvq0wIUTqpfDqpqD/Nk+c5sdbSKeoGyCwnswZYJJkFgLVm0HFA==}
 
   cross-env@7.0.3:
     resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
@@ -15844,7 +15844,7 @@ snapshots:
     dependencies:
       luxon: 3.5.0
 
-  cropperjs@2.0.0-beta.4:
+  cropperjs@2.0.0-rc.0:
     dependencies:
       '@cropper/elements': 2.0.0-rc.1
       '@cropper/utils': 2.0.0-rc.1

From 8329498d4c5426f309b8b3569e830807b17f3c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A6=E3=81=83?=
 =?UTF-8?q?=E3=83=BC=E3=80=82?=
 <56515516+mattyatea@users.noreply.github.com>
Date: Sun, 18 Aug 2024 06:00:10 +0900
Subject: [PATCH 3/8] =?UTF-8?q?enhance(frontend):=20=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E6=99=82=E3=81=AB524=E3=81=8C=E8=BF=94?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E9=9A=9B=E3=81=AE=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=AB=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(Missk?=
 =?UTF-8?q?eyIO#710)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml                       | 1 +
 locales/index.d.ts                      | 4 ++++
 locales/ja-JP.yml                       | 1 +
 locales/ko-KR.yml                       | 1 +
 packages/frontend/src/scripts/upload.ts | 6 ++++++
 5 files changed, 13 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 0e8d053bf..fd6db2757 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -976,6 +976,7 @@ failedToUpload: "Upload failed"
 cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of it have been detected as potentially inappropriate."
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
 cannotUploadBecauseExceedsFileSizeLimit: "This file cannot be uploaded as it exceeds the file size limit."
+cannotUploadBecauseTimeout: "The file could not be uploaded due to a connection timeout."
 beta: "Beta"
 enableAutoSensitive: "Automatic marking as sensitive"
 enableAutoSensitiveDescription: "Allows automatic detection and marking of sensitive media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide."
diff --git a/locales/index.d.ts b/locales/index.d.ts
index c53f67dd2..e6dcc26dc 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -3928,6 +3928,10 @@ export interface Locale extends ILocale {
      * ファイルサイズの制限を超えているためアップロードできません。
      */
     "cannotUploadBecauseExceedsFileSizeLimit": string;
+    /**
+     * 接続がタイムアウトしたため、ファイルをアップロードできませんでした。
+     */
+    "cannotUploadBecauseTimeout": string;
     /**
      * ベータ
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 7ad273c3b..297b5c976 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -978,6 +978,7 @@ failedToUpload: "アップロード失敗"
 cannotUploadBecauseInappropriate: "不適切な内容を含む可能性があると判定されたためアップロードできません。"
 cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いためアップロードできません。"
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルサイズの制限を超えているためアップロードできません。"
+cannotUploadBecauseTimeout: "接続がタイムアウトしたため、ファイルをアップロードできませんでした。"
 beta: "ベータ"
 enableAutoSensitive: "自動センシティブ判定"
 enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにセンシティブフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 0f9111b2d..0adcf4984 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -975,6 +975,7 @@ failedToUpload: "업로드 실패"
 cannotUploadBecauseInappropriate: "이 파일은 부적절한 내용을 포함한다고 판단되어 업로드할 수 없습니다."
 cannotUploadBecauseNoFreeSpace: "드라이브 용량이 부족하여 업로드할 수 없습니다."
 cannotUploadBecauseExceedsFileSizeLimit: "파일 크기가 너무 크기 때문에 업로드할 수 없습니다."
+cannotUploadBecauseTimeout: "접속 시간이 초과되어 파일을 업로드할 수 없습니다."
 beta: "베타"
 enableAutoSensitive: "자동 NSFW 탐지"
 enableAutoSensitiveDescription: "이용 가능할 경우 기계학습을 통해 자동으로 미디어 NSFW를 설정합니다. 이 기능을 해제하더라도, 서버 정책에 따라 자동으로 설정될 수 있습니다."
diff --git a/packages/frontend/src/scripts/upload.ts b/packages/frontend/src/scripts/upload.ts
index 3e947183c..f61b72993 100644
--- a/packages/frontend/src/scripts/upload.ts
+++ b/packages/frontend/src/scripts/upload.ts
@@ -98,6 +98,12 @@ export function uploadFile(
 							title: i18n.ts.failedToUpload,
 							text: i18n.ts.cannotUploadBecauseExceedsFileSizeLimit,
 						});
+					} else if (xhr.status === 524) {
+						alert({
+							type: 'error',
+							title: i18n.ts.failedToUpload,
+							text: i18n.ts.cannotUploadBecauseTimeout,
+						});
 					} else if (ev.target?.response) {
 						const res = JSON.parse(ev.target.response);
 						if (res.error?.id === 'bec5bd69-fba3-43c9-b4fb-2894b66ad5d2') {

From b3376501d7a36348aae98d7d360bbd000c7ee552 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Sun, 18 Aug 2024 06:26:21 +0900
Subject: [PATCH 4/8] =?UTF-8?q?fix(backend):=20=E3=82=AF=E3=83=AA=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E5=91=A8=E3=82=8A=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(MisskeyIO#709)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/ClipService.ts      | 18 ++++--
 .../backend/src/core/UserSuspendService.ts    | 64 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts
index b69ca8362..df3de63e8 100644
--- a/packages/backend/src/core/ClipService.ts
+++ b/packages/backend/src/core/ClipService.ts
@@ -134,6 +134,10 @@ export class ClipService {
 			throw new ClipService.NoSuchClipError();
 		}
 
+		if (await this.clipNotesRepository.existsBy({ clipId, noteId })) {
+			throw new ClipService.AlreadyAddedError();
+		}
+
 		const policies = await this.roleService.getUserPolicies(me.id);
 
 		const currentClipCount = await this.clipsRepository.countBy({
@@ -143,6 +147,13 @@ export class ClipService {
 			throw new ClipService.ClipLimitExceededError();
 		}
 
+		const currentNoteCount = await this.clipNotesRepository.countBy({
+			clipId: clip.id,
+		});
+		if (currentNoteCount >= policies.noteEachClipsLimit) {
+			throw new ClipService.TooManyClipNotesError();
+		}
+
 		const currentNoteCounts = await this.clipNotesRepository
 			.createQueryBuilder('cn')
 			.select('COUNT(*)')
@@ -154,13 +165,6 @@ export class ClipService {
 			throw new ClipService.ClipNotesLimitExceededError();
 		}
 
-		const currentNoteCount = await this.clipNotesRepository.countBy({
-			clipId: clip.id,
-		});
-		if (currentNoteCount >= policies.noteEachClipsLimit) {
-			throw new ClipService.TooManyClipNotesError();
-		}
-
 		try {
 			await this.clipNotesRepository.insert({
 				id: this.idService.gen(),
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index f9cf38684..677db309d 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -9,7 +9,16 @@ import { bindThis } from '@/decorators.js';
 import { DI } from '@/di-symbols.js';
 import type Logger from '@/logger.js';
 import type { MiUser } from '@/models/User.js';
-import type { FollowingsRepository, FollowRequestsRepository } from '@/models/_.js';
+import type {
+	AntennasRepository,
+	ClipNotesRepository,
+	ClipsRepository,
+	FollowingsRepository,
+	FollowRequestsRepository,
+	UserListMembershipsRepository,
+	UserListsRepository,
+	WebhooksRepository,
+} from '@/models/_.js';
 import { QueueService } from '@/core/QueueService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
@@ -30,6 +39,24 @@ export class UserSuspendService {
 		@Inject(DI.followRequestsRepository)
 		private followRequestsRepository: FollowRequestsRepository,
 
+		@Inject(DI.antennasRepository)
+		private antennasRepository: AntennasRepository,
+
+		@Inject(DI.webhooksRepository)
+		private webhooksRepository: WebhooksRepository,
+
+		@Inject(DI.userListsRepository)
+		private userListsRepository: UserListsRepository,
+
+		@Inject(DI.clipsRepository)
+		private clipsRepository: ClipsRepository,
+
+		@Inject(DI.clipNotesRepository)
+		private clipNotesRepository: ClipNotesRepository,
+
+		@Inject(DI.userListMembershipsRepository)
+		private userListMembershipsRepository: UserListMembershipsRepository,
+
 		private queueService: QueueService,
 		private globalEventService: GlobalEventService,
 		private apRendererService: ApRendererService,
@@ -45,10 +72,41 @@ export class UserSuspendService {
 
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
 
-		await Promise.all([
+		const promises: Promise<unknown>[] = [];
+
+		let cursor = '';
+		while (true) { // eslint-disable-line @typescript-eslint/no-unnecessary-condition, no-constant-condition
+			const clipNotes = await this.clipNotesRepository.createQueryBuilder('c')
+				.select('c.id')
+				.innerJoin('c.note', 'n')
+				.where('n.userId = :userId', { userId: user.id })
+				.andWhere('c.id > :cursor', { cursor })
+				.orderBy('c.id', 'ASC')
+				.limit(500)
+				.getRawMany<{ id: string }>();
+
+			if (clipNotes.length === 0) break;
+
+			cursor = clipNotes.at(-1)?.id ?? '';
+
+			promises.push(this.clipNotesRepository.createQueryBuilder()
+				.delete()
+				.where('id IN (:...ids)', { ids: clipNotes.map((clipNote) => clipNote.id) })
+				.execute());
+		}
+
+		await Promise.allSettled([
 			this.followRequestsRepository.delete({ followeeId: user.id }),
 			this.followRequestsRepository.delete({ followerId: user.id }),
-		]).catch(() => null);
+
+			this.antennasRepository.delete({ userId: user.id }),
+			this.webhooksRepository.delete({ userId: user.id }),
+			this.userListsRepository.delete({ userId: user.id }),
+			this.clipsRepository.delete({ userId: user.id }),
+
+			...promises,
+			this.userListMembershipsRepository.delete({ userId: user.id }),
+		]);
 
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信

From 178f8347f6558edbcb698d08a8ce58d9fc9e659a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 18 Aug 2024 06:26:45 +0900
Subject: [PATCH 5/8] Bump up version to 2024.5.0-io.2c (MisskeyIO#708)

---
 package.json                     | 4 ++--
 packages/misskey-js/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4a9fc9d67..d0c6021c7 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.2b",
+	"version": "2024.5.0-io.2c",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/MisskeyIO/misskey.git"
 	},
-	"packageManager": "pnpm@9.1.2",
+	"packageManager": "pnpm@9.7.1",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index fbafae9fa..5aded1583 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.2b",
+	"version": "2024.5.0-io.2c",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {

From a57b5e1426cdad05725431ed4af9bae9727742ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 18 Aug 2024 08:02:13 +0900
Subject: [PATCH 6/8] chore(i18n): Add saveThisFile for en-US, ko-KR
 (MisskeyIO#713)

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

diff --git a/locales/en-US.yml b/locales/en-US.yml
index fd6db2757..b8065d302 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1261,6 +1261,7 @@ alwaysConfirmFollow: "Always confirm when following"
 inquiry: "Contact"
 here: "here"
 mutualLink: "Mutual Link"
+saveThisFile: "Save this file to Drive"
 _bubbleGame:
   howToPlay: "How to play"
   hold: "Hold"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 0adcf4984..4d465c6c9 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1254,6 +1254,7 @@ launchApp: "앱 실행"
 useNativeUIForVideoAudioPlayer: "브라우저 UI에서 미디어 재생"
 here: "여기"
 mutualLink: "서로링크"
+saveThisFile: "이 파일을 드라이브에 저장"
 _bubbleGame:
   howToPlay: "설명"
   hold: "홀드"

From 4e3d8246fc8f631726664eb6ebfadea33384ace7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A6=E3=81=83?=
 =?UTF-8?q?=E3=83=BC=E3=80=82?=
 <56515516+mattyatea@users.noreply.github.com>
Date: Sun, 18 Aug 2024 08:06:34 +0900
Subject: [PATCH 7/8] =?UTF-8?q?fix(frontend):=20=E3=81=93=E3=81=AE?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E3=83=89=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=96=E3=81=AB=E4=BF=9D=E5=AD=98=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=20=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(MisskeyIO#712)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkMediaImage.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 94b7c7459..2ee03c3e7 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -98,12 +98,9 @@ function showMenu(ev: MouseEvent) {
 		icon: 'ti ti-cloud-upload',
 		action: () => {
 			os.selectDriveFolder(false).then(async folder => {
-				if (folder[0] == null) {
-					return;
-				}
 				misskeyApi('drive/files/upload-from-url', {
 					url: props.image.url,
-					folderId: folder ? folder[0].id : undefined,
+					folderId: folder[0]?.id,
 				});
 			});
 		},

From 9153574bda8a6399d70db25bcec1734b499720c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 18 Aug 2024 08:06:50 +0900
Subject: [PATCH 8/8] Bump up version to 2024.5.0-io.2d (MisskeyIO#714)

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d0c6021c7..de357423f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.2c",
+	"version": "2024.5.0-io.2d",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 5aded1583..593adcc82 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.5.0-io.2c",
+	"version": "2024.5.0-io.2d",
 	"description": "Misskey SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",
 	"exports": {