From 10f8e04c7085283700878829dcb3e5d872285bac Mon Sep 17 00:00:00 2001
From: Esurio/1673beta <60435625+1673beta@users.noreply.github.com>
Date: Wed, 14 Aug 2024 17:18:12 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20Alt=E5=91=A8=E3=82=8A=E3=81=AE=E5=BC=B7?=
 =?UTF-8?q?=E5=8C=96=20(#142)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: apngの場合apngと表示するように

* 画像のタイトルには必ずファイル名を使用するように

* ファイル名とALTを同時に表示するように

* ALTがない時にはALTのブロックを非表示に

* 隠すボタンのスタイル調整

* altが存在するときに投稿フォームでインジケータを表示するように

* Altが設定されてない場合警告を出すように

* add locale

* update changelog

* fix: 画像のクロップ時にモバイルUIでは画像の全体が表示されない問題

* update changelog

---------

Co-authored-by: Esurio <esurio@esurio1673.net>
---
 CHANGELOG_engawa.md                           |  7 +++
 locales/en-US.yml                             |  5 ++
 locales/index.d.ts                            | 14 +++++
 locales/ja-JP.yml                             |  5 ++
 .../src/components/MkCropperDialog.vue        |  3 ++
 .../src/components/MkDriveFileThumbnail.vue   | 11 ++--
 .../src/components/MkImgWithBlurhash.vue      | 20 +++++++
 .../frontend/src/components/MkMediaImage.vue  |  9 ++--
 .../frontend/src/components/MkMediaList.vue   | 53 ++++++++++++++++++-
 .../frontend/src/components/MkPostForm.vue    | 13 ++++-
 .../src/components/MkPostFormAttaches.vue     |  2 +-
 .../frontend/src/pages/settings/general.vue   |  2 +
 packages/frontend/src/store.ts                |  4 ++
 13 files changed, 136 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG_engawa.md b/CHANGELOG_engawa.md
index 198ac15954..77c24011e8 100644
--- a/CHANGELOG_engawa.md
+++ b/CHANGELOG_engawa.md
@@ -27,6 +27,13 @@
 
 ### Client
 - 検索ウィジェットにオートフォーカスが当たらなくなりました
+- 画像がAPNGの場合GIFではなくAPNGと表示するように
+- 隠すボタンのスタイル調整
+- ファイル名とALTを同時に表示するように
+- ALTテキストが存在する場合投稿フォームのファイルにインジケータを表示するように
+- ALTテキストがない場合警告を出すオプションを追加
+- 画像のタイトルには必ずファイル名を使用するように
+- fix: クロッパーで画像の全体が表示されないことがある問題
 
 ### Server
 - 検索機能に新しいパラメータを追加( [1673beta/cherrypick#94](https://github.com/1673beta/cherrypick/issues/94) )
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 7cbc2611dd..e019b6ee02 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -3024,3 +3024,8 @@ _dice:
 _isIndexable:
   title: "Indexable"
   description: "This is kmyblue compatible feature. If you want to prevent your account from being indexed by search engines, please disable this option."
+
+_altWarning:
+  noAltWarning: "ファイルに代替テキストが設定されていません。"
+  showNoAltWarning: "画像に代替テキストが設定されていない場合に警告を表示する"
+  postAnyWay: "投稿フォームへ"
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 245caa0406..90a3be076b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11797,6 +11797,20 @@ export interface Locale extends ILocale {
          */
         "description": string;
     };
+    "_altWarning": {
+        /**
+         * ファイルに代替テキストが設定されていません。
+         */
+        "noAltWarning": string;
+        /**
+         * 画像に代替テキストが設定されていない場合に警告を表示する
+         */
+        "showNoAltWarning": string;
+        /**
+         * 投稿フォームへ
+         */
+        "postAnyWay": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fe86a0188f..6389c4affd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -3149,3 +3149,8 @@ _dice:
 _isIndexable:
   title: "公開ノートをインデックス化"
   description: "kmy互換機能。公開ノートをインデックス化するかどうかを設定します。"
+
+_altWarning:
+  noAltWarning: "ファイルに代替テキストが設定されていません。"
+  showNoAltWarning: "画像に代替テキストが設定されていない場合に警告を表示する"
+  postAnyWay: "投稿フォームへ"
diff --git a/packages/frontend/src/components/MkCropperDialog.vue b/packages/frontend/src/components/MkCropperDialog.vue
index 46e6003623..fcc7a5842f 100644
--- a/packages/frontend/src/components/MkCropperDialog.vue
+++ b/packages/frontend/src/components/MkCropperDialog.vue
@@ -113,6 +113,7 @@ const onImageLoad = () => {
 	loading.value = false;
 
 	if (cropper) {
+		cropper.getCropperCanvas();
 		cropper.getCropperImage()!.$center('contain');
 		cropper.getCropperSelection()!.$center();
 	}
@@ -159,6 +160,7 @@ onMounted(() => {
 	width: var(--vw);
 	height: var(--vh);
 	position: relative;
+	object-fit: contain;
 
 	> .loading {
 		position: absolute;
@@ -183,6 +185,7 @@ onMounted(() => {
 		> ::v-deep(cropper-canvas) {
 			width: 100%;
 			height: 100%;
+			object-fit: contain;
 
 			> cropper-selection > cropper-handle[action="move"] {
 				background: transparent;
diff --git a/packages/frontend/src/components/MkDriveFileThumbnail.vue b/packages/frontend/src/components/MkDriveFileThumbnail.vue
index 082de10d3c..a2073e8995 100644
--- a/packages/frontend/src/components/MkDriveFileThumbnail.vue
+++ b/packages/frontend/src/components/MkDriveFileThumbnail.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div ref="thumbnail" :class="$style.root">
-	<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.name" :title="file.name" :cover="fit !== 'contain'"/>
+	<ImgWithBlurhash v-if="isThumbnailAvailable" :hash="file.blurhash" :src="file.thumbnailUrl" :alt="file.comment" :title="file.name" :cover="fit !== 'contain'" :show-alt-indicator="showAltIndicator" />
 	<i v-else-if="is === 'image'" class="ti ti-photo" :class="$style.icon"></i>
 	<i v-else-if="is === 'video'" class="ti ti-video" :class="$style.icon"></i>
 	<i v-else-if="is === 'audio' || is === 'midi'" class="ti ti-file-music" :class="$style.icon"></i>
@@ -24,10 +24,13 @@ import { computed } from 'vue';
 import * as Misskey from 'cherrypick-js';
 import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue';
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
 	file: Misskey.entities.DriveFile;
-	fit: 'cover' | 'contain';
-}>();
+	fit: string;
+	showAltIndicator: boolean;
+}>(), {
+	showAltIndicator: false,
+})
 
 const is = computed(() => {
 	if (props.file.type.startsWith('image/')) return 'image';
diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue
index f5cea67abe..40b78f3ef2 100644
--- a/packages/frontend/src/components/MkImgWithBlurhash.vue
+++ b/packages/frontend/src/components/MkImgWithBlurhash.vue
@@ -16,6 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	>
 		<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined" tabindex="-1"/>
 		<img v-show="!hide" key="img" ref="img" :height="imgHeight ?? undefined" :width="imgWidth ?? undefined" :class="[$style.img, { [$style.noDrag]: noDrag }]" :src="src ?? undefined" :title="title ?? undefined" :alt="alt ?? undefined" loading="eager" decoding="async" tabindex="-1"/>
+		<i v-if="alt && showAltIndicator" :class="$style.altIndicator" class="ti ti-alt"></i>
 	</TransitionGroup>
 </div>
 </template>
@@ -82,6 +83,7 @@ const props = withDefaults(defineProps<{
 	forceBlurhash?: boolean;
 	onlyAvgColor?: boolean; // 軽量化のためにBlurhashを使わずに平均色だけを描画
 	noDrag?: boolean;
+	showAltIndicator?: boolean;
 }>(), {
 	transition: null,
 	src: null,
@@ -93,6 +95,7 @@ const props = withDefaults(defineProps<{
 	forceBlurhash: false,
 	onlyAvgColor: false,
 	noDrag: false,
+	showAltIndicator: false,
 });
 
 const viewId = uuid();
@@ -269,4 +272,21 @@ onUnmounted(() => {
 		-webkit-user-drag: none;
 	}
 }
+
+.altIndicator {
+	display: flex;
+	gap: 4px;
+	position: absolute;
+	border-radius: 8px;
+	overflow: hidden;
+	top: 0;
+	right: 0;
+	background-color: var(--bg);
+	-webkit-backdrop-filter: var(--blur, blur(15px));
+	backdrop-filter: var(--blur, blur(15px));
+	color: var(--accent);
+	font-size: 1em;
+	padding: 6px 8px;
+	text-align: center;
+}
 </style>
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 9ddce88ccd..0cc72025f3 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			:forceBlurhash="hide"
 			:cover="hide || cover"
 			:alt="image.comment || image.name"
-			:title="image.comment || image.name"
+			:title="image.name"
 			:width="image.properties.width"
 			:height="image.properties.height"
 			:style="hide ? 'filter: brightness(0.7);' : null"
@@ -44,7 +44,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</template>
 	<template v-else-if="controls">
 		<div :class="$style.indicators">
-			<div v-if="['image/gif', 'image/apng'].includes(image.type)" :class="$style.indicator">GIF</div>
+			<div v-if="['image/gif'].includes(image.type)" :class="$style.indicator">GIF</div>
+			<div v-if="['image/apng'].includes(image.type)" :class="$style.indicator">APNG</div>
 			<div v-if="image.comment" :class="$style.indicator">ALT</div>
 			<div v-if="image.isSensitive" :class="$style.indicator" style="color: var(--warn);" :title="i18n.ts.sensitive"><i class="ti ti-eye-exclamation"></i></div>
 		</div>
@@ -220,9 +221,9 @@ onUnmounted(() => {
 	display: block;
 	position: absolute;
 	border-radius: 6px;
-	background-color: var(--fg);
+	background-color: var(--bg);
 	color: var(--accentLighten);
-	font-size: 12px;
+	font-size: 18px;
 	opacity: .5;
 	padding: 5px 8px;
 	text-align: center;
diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue
index 3770b7ff7c..3d355efe38 100644
--- a/packages/frontend/src/components/MkMediaList.vue
+++ b/packages/frontend/src/components/MkMediaList.vue
@@ -153,8 +153,9 @@ onMounted(() => {
 			[itemData.w, itemData.h] = [itemData.h, itemData.w];
 		}
 		itemData.msrc = file.thumbnailUrl ?? undefined;
-		itemData.alt = file.comment ?? file.name;
+		itemData.alt = file.comment || undefined;
 		itemData.comment = file.comment ?? file.name;
+		itemData.title = file.name;
 		itemData.thumbCropped = true;
 
 		return itemData;
@@ -179,7 +180,25 @@ onMounted(() => {
 				el.appendChild(textBox);
 
 				pswp.on('change', () => {
-					textBox.textContent = pswp.currSlide?.data.comment;
+					const altText = pswp.currSlide?.data.alt || null;
+					textBox.textContent = altText;
+					if (!altText) {
+						el.style.display = 'none';
+					}
+				});
+			},
+		});
+		lightbox?.pswp?.ui?.registerElement({
+			name: 'fileName',
+			className: 'pswp__file-name-container',
+			appendTo: 'wrapper',
+			onInit: (el, pswp) => {
+				const textBox = document.createElement('p');
+				textBox.className = 'pswp__file-name _acrylic';
+				el.appendChild(textBox);
+
+				pswp.on('change', () => {
+					textBox.textContent = pswp.currSlide?.data.title;
 				});
 			},
 		});
@@ -338,6 +357,22 @@ defineExpose({
 	flex-direction: row;
 	align-items: center;
 
+	position: absolute;
+	bottom: 100px;
+	left: 50%;
+	transform: translateX(-50%);
+
+	width: 75%;
+	max-width: 800px;
+
+	z-index: 2;
+}
+
+.pswp__file-name-container {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+
 	position: absolute;
 	bottom: 20px;
 	left: 50%;
@@ -345,6 +380,8 @@ defineExpose({
 
 	width: 75%;
 	max-width: 800px;
+
+	z-index: 1;
 }
 
 .pswp__alt-text {
@@ -358,4 +395,16 @@ defineExpose({
 	text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
 	white-space: pre-line;
 }
+
+.pswp__file-name {
+	color: var(--fg);
+	margin: 0 auto;
+	text-align: center;
+	padding: var(--margin);
+	border-radius: var(--radius);
+	max-height: 16em;
+	overflow-y: auto;
+	text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
+	white-space: pre-line;
+}
 </style>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 99cf4235b3..b4d386dc2f 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -132,6 +132,7 @@ import { emojiPicker } from '@/scripts/emoji-picker.js';
 import { vibrate } from '@/scripts/vibrate.js';
 import * as sound from '@/scripts/sound.js';
 import { mfmFunctionPicker } from '@/scripts/mfm-function-picker.js';
+import { file } from '.storybook/fakes';
 
 
 const $i = signinRequired();
@@ -183,7 +184,7 @@ const visibilityButton = shallowRef<HTMLElement>();
 const posting = ref(false);
 const posted = ref(false);
 const text = ref(props.initialText ?? '');
-const files = ref(props.initialFiles ?? []);
+const files = ref(props.initialFiles ?? ([] as Misskey.entities.DriveFile[]));
 const poll = ref<PollEditorModelValue | null>(null);
 const event = ref<{
 	title: string;
@@ -791,6 +792,16 @@ async function post(ev?: MouseEvent) {
 		});
 		return;
 	}
+	if (defaultStore.state.showNoAltTextWarning && files.value.some((f) => f.comment == null || f.comment.length === 0)) {
+		const { canceled } = await os.confirm({
+			type: 'warning',
+			text: i18n.ts._altWarning.noAltWarning,
+			okText: i18n.ts.goBack,
+			cancelText: i18n.ts._altWarning.postAnyWay,
+		});
+
+		if (!canceled) return;
+	}
 
 	if (ev) {
 		const el = (ev.currentTarget ?? ev.target) as HTMLElement | null;
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index 0017e9c592..5d0bd39cd7 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<Sortable :modelValue="props.modelValue" :class="$style.files" itemKey="id" :animation="150" :delay="100" :delayOnTouchOnly="true" @update:modelValue="v => emit('update:modelValue', v)">
 		<template #item="{element}">
 			<div :class="$style.file" @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
-				<MkDriveFileThumbnail :data-id="element.id" :class="$style.thumbnail" :file="element" fit="cover"/>
+				<MkDriveFileThumbnail :data-id="element.id" :class="$style.thumbnail" :file="element" fit="cover" :show-alt-indicator="true" />
 				<div v-if="element.isSensitive" :class="$style.sensitive">
 					<i class="ti ti-eye-exclamation" style="margin: auto;"></i>
 				</div>
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 8b31a3d4a9..120ffcc65b 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -96,6 +96,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkSelect>
 				<MkSwitch v-model="showFixedPostFormInReplies">{{ i18n.ts.showFixedPostFormInReplies }}<template #caption>{{ i18n.ts.showFixedPostFormInRepliesDescription }}</template> <span class="_beta">CherryPick</span></MkSwitch>
 				<MkSwitch v-model="allMediaNoteCollapse">{{ i18n.ts.allMediaNoteCollapse }} <span class="_beta">CherryPick</span></MkSwitch>
+				<MkSwitch v-model="showNoAltTextWarning">{{ i18n.ts._altWarning.showNoAltWarning }}</MkSwitch>
 			</div>
 
 			<MkSelect v-model="instanceTicker">
@@ -471,6 +472,7 @@ const allMediaNoteCollapse = computed(defaultStore.makeGetterSetter('allMediaNot
 const nsfwOpenBehavior = computed(defaultStore.makeGetterSetter('nsfwOpenBehavior'));
 const renoteVisibilitySelection = computed(defaultStore.makeGetterSetter('renoteVisibilitySelection'));
 const forceRenoteVisibilitySelection = computed(defaultStore.makeGetterSetter('forceRenoteVisibilitySelection'));
+const showNoAltTextWarning = computed(defaultStore.makeGetterSetter('showNoAltTextWarning'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 0f0ce09d9a..bb2dfbee6f 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -136,6 +136,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: [] as string[],
 	},
+	showNoAltTextWarning: {
+		where: 'account',
+		default: true,
+	},
 
 	menu: {
 		where: 'deviceAccount',