Merge 73541fbf63 into ebd06becbf

2025-02-11 21:05:35 +09:00
5 changed files with 9 additions and 49 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,7 +9,6 @@
 - Enhance: アンテナ、リスト等の名前をカラム名のデフォルト値にするように `#13992`
 - Enhance: クライアントエラー画面の多言語対応
 - Enhance: 開発者モードでメニューからファイルIDをコピー出来るように `#15441'
- Enhance: ノートに埋め込まれたメディアのコンテキストメニューから管理者用のファイル管理画面を開けるように ( #15440 )
 - Fix: コンディショナルロールを手動で割り当てできる導線を削除 `#13529`
 - Fix: 埋め込みプレイヤーから外部ページに移動できない問題を修正

--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@ -217,9 +217,10 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	const details: MenuItem[] = [];
 	if ($i?.id === props.audio.userId) {
-		details.push({
+		menu.push({
+			type: 'divider',
+		}, {
 			type: 'link',
 			text: i18n.ts._fileViewer.title,
 			icon: 'ti ti-info-circle',
@ -227,19 +228,6 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	if (iAmModerator) {
-		details.push({
-			type: 'link',
-			text: i18n.ts.moderation,
-			icon: 'ti ti-photo-exclamation',
-			to: `/admin/file/${props.audio.id}`,
-		});
-	}
-
-	if (details.length > 0) {
-		menu.push({ type: 'divider' }, ...details);
-	}
-
 	if (defaultStore.state.devMode) {
 		menu.push({ type: 'divider' }, {
 			icon: 'ti ti-id',
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@ -133,9 +133,10 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	const details: MenuItem[] = [];
 	if ($i?.id === props.image.userId) {
-		details.push({
+		menuItems.push({
+			type: 'divider',
+		}, {
 			type: 'link',
 			text: i18n.ts._fileViewer.title,
 			icon: 'ti ti-info-circle',
@ -143,19 +144,6 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	if (iAmModerator) {
-		details.push({
-			type: 'link',
-			text: i18n.ts.moderation,
-			icon: 'ti ti-photo-exclamation',
-			to: `/admin/file/${props.image.id}`,
-		});
-	}
-
-	if (details.length > 0) {
-		menuItems.push({ type: 'divider' }, ...details);
-	}
-
 	if (defaultStore.state.devMode) {
 		menuItems.push({ type: 'divider' }, {
 			icon: 'ti ti-id',
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@ -242,9 +242,10 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	const details: MenuItem[] = [];
 	if ($i?.id === props.video.userId) {
-		details.push({
+		menu.push({
+			type: 'divider',
+		}, {
 			type: 'link',
 			text: i18n.ts._fileViewer.title,
 			icon: 'ti ti-info-circle',
@ -252,19 +253,6 @@ function showMenu(ev: MouseEvent) {
 		});
 	}

-	if (iAmModerator) {
-		details.push({
-			type: 'link',
-			text: i18n.ts.moderation,
-			icon: 'ti ti-photo-exclamation',
-			to: `/admin/file/${props.video.id}`,
-		});
-	}
-
-	if (details.length > 0) {
-		menu.push({ type: 'divider' }, ...details);
-	}
-
 	if (defaultStore.state.devMode) {
 		menu.push({ type: 'divider' }, {
 			icon: 'ti ti-id',
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@ -109,9 +109,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<div>
 							<a style="display: inline-block;" class="pepabo" title="GMO Pepabo" href="https://pepabo.com/" target="_blank"><img style="width: 100%;" src="https://assets.misskey-hub.net/sponsors/gmo_pepabo.svg" alt="GMO Pepabo"></a>
 						</div>
-						<div>
-							<a style="display: inline-block;" class="purpledotdigital" title="Purple Dot Digital" href="https://purpledotdigital.com/" target="_blank"><img style="width: 100%;" src="https://assets.misskey-hub.net/sponsors/purple-dot-digital.jpg" alt="Purple Dot Digital"></a>
-						</div>
 					</div>
 				</FormSection>
 				<FormSection>