locales/ja-JP.yml

@@ -279,7 +279,6 @@ emptyDrive: "ドライブは空です"
 emptyFolder: "フォルダーは空です"
 unableToDelete: "削除できません"
 inputNewFileName: "新しいファイル名を入力してください"
-inputNewDescription: "新しいキャプションを入力してください"
 inputNewFolderName: "新しいフォルダ名を入力してください"
 circularReferenceFolder: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
 hasChildFilesOrFolders: "このフォルダは空でないため、削除できません。"
@@ -547,8 +546,6 @@ disablePlayer: "プレイヤーを閉じる"
 expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
-describeFile: "キャプションを付く"
-enterFileDescription: "キャプションを入力"
 author: "作者"
 leaveConfirm: "未保存の変更があります。破棄しますか？"
 manage: "管理"

src/client/components/drive.file.vue

@@ -87,10 +87,6 @@ export default defineComponent({
 				text: this.file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
 				icon: this.file.isSensitive ? 'fas fa-eye' : 'fas fa-eye-slash',
 				action: this.toggleSensitive
-			}, {
-				text: this.$ts.describeFile,
-				icon: 'fas fa-i-cursor',
-				action: this.describe
 			}, null, {
 				text: this.$ts.copyUrl,
 				icon: 'fas fa-link',
@@ -154,23 +150,6 @@ export default defineComponent({
 			});
 		},
 
-		describe() {
-			os.dialog({
-				title: this.$ts.describeFile,
-				input: {
-					placeholder: this.$ts.inputNewDescription,
-					default: this.file.comment !== null ? this.file.comment : "",
-					allowEmpty: true
-				}
-			}).then(({ canceled, result: comment }) => {
-				if (canceled) return;
-				os.api('drive/files/update', {
-					fileId: this.file.id,
-					comment: comment.length == 0 ? null : comment
-				});
-			});
-		},
-
 		toggleSensitive() {
 			os.api('drive/files/update', {
 				fileId: this.file.id,

src/client/components/image-viewer.vue

@@ -2,7 +2,7 @@
 <MkModal ref="modal" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="xubzgfga">
 		<header>{{ image.name }}</header>
-		<img :src="image.url" :alt="image.comment" :title="image.comment" @click="$refs.modal.close()"/>
+		<img :src="image.url" :alt="image.name" :title="image.name" @click="$refs.modal.close()"/>
 		<footer>
 			<span>{{ image.type }}</span>
 			<span>{{ bytes(image.size) }}</span>

src/client/components/media-image.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="qjewsnkg" v-if="hide" @click="hide = false">
-	<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.comment" :alt="image.comment"/>
+	<ImgWithBlurhash class="bg" :hash="image.blurhash" :title="image.name"/>
 	<div class="text">
 		<div>
 			<b><i class="fas fa-exclamation-triangle"></i> {{ $ts.sensitive }}</b>
@@ -14,7 +14,7 @@
 		:title="image.name"
 		@click.prevent="onClick"
 	>
-		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.comment" :title="image.comment" :cover="false"/>
+		<ImgWithBlurhash :hash="image.blurhash" :src="url" :alt="image.name" :title="image.name" :cover="false"/>
 		<div class="gif" v-if="image.type === 'image/gif'">GIF</div>
 	</a>
 	<i class="fas fa-eye-slash" @click="hide = true"></i>

src/client/components/post-form-attaches.vue

@@ -89,22 +89,6 @@ export default defineComponent({
 				file.name = result;
 			});
 		},
-
-		async describe(file) {
-			const { canceled, result } = await os.dialog({
-				title: this.$ts.enterFileDescription,
-				input: {
-					default: file.comment !== null ? file.comment : ""
-				},
-				allowEmpty: false
-			});
-			if (canceled) return;
-			os.api('drive/files/update', {
-				fileId: file.id,
-				comment: result.length == 0 ? null : result
-			});
-		},
-
 		showFileMenu(file, ev: MouseEvent) {
 			if (this.menu) return;
 			this.menu = os.modalMenu([{
@@ -115,10 +99,6 @@ export default defineComponent({
 				text: file.isSensitive ? this.$ts.unmarkAsSensitive : this.$ts.markAsSensitive,
 				icon: file.isSensitive ? 'fas fa-eye-slash' : 'fas fa-eye',
 				action: () => { this.toggleSensitive(file) }
-			},{
-				text: this.$ts.describeFile,
-				icon: 'fas fa-i-cursor',
-				action: () => { this.describe(file) }
 			}, {
 				text: this.$ts.attachCancel,
 				icon: 'fas fa-times-circle',

src/remote/activitypub/models/image.ts

@@ -28,7 +28,7 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<Drive
 	const instance = await fetchMeta();
 	const cache = instance.cacheRemoteFiles;
 
-	let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive, false, !cache, image.name);
+	let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive, false, !cache);
 
 	if (file.isLink) {
 		// URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、

src/remote/activitypub/renderer/document.ts

@@ -4,6 +4,5 @@ import { DriveFiles } from '../../../models';
 export default (file: DriveFile) => ({
 	type: 'Document',
 	mediaType: file.type,
-	url: DriveFiles.getPublicUrl(file),
-	name: file.comment,
+	url: DriveFiles.getPublicUrl(file)
 });

src/server/api/endpoints/drive/files/update.ts

@@ -49,14 +49,6 @@ export const meta = {
 				'ja-JP': 'このメディアが「閲覧注意」(NSFW)かどうか',
 				'en-US': 'Whether this media is NSFW'
 			}
-		},
-
-		comment: {
-			validator: $.optional.nullable.str,
-			default: undefined as any,
-			desc: {
-				'ja-JP': 'コメント'
-			}
 		}
 	},
 
@@ -100,8 +92,6 @@ export default define(meta, async (ps, user) => {
 
 	if (ps.name) file.name = ps.name;
 
-	if (ps.comment !== undefined) file.comment = ps.comment;
-
 	if (ps.isSensitive !== undefined) file.isSensitive = ps.isSensitive;
 
 	if (ps.folderId !== undefined) {
@@ -123,7 +113,6 @@ export default define(meta, async (ps, user) => {
 
 	await DriveFiles.update(file.id, {
 		name: file.name,
-		comment: file.comment,
 		folderId: file.folderId,
 		isSensitive: file.isSensitive
 	});

src/services/drive/upload-from-url.ts

@@ -25,12 +25,6 @@ export default async (
 		name = null;
 	}
 
-	// If the comment is same as the name, skip comment
-	// (image.name is passed in when receiving attachment)
-	if (comment !== null && name == comment) {
-		comment = null;
-	}
-
 	// Create temp file
 	const [path, cleanup] = await createTemp();