Merge pull request 'Replace notes(userId) index with (userId, id)' (#28) from sugar/forkey:replace-notes-user-id-index-with-user-id-id into main

Reviewed-on: #28
Reviewed-by: leah <leah@noreply.woem.men>

locales/en-US.yml

@@ -765,7 +765,6 @@ lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", yo
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableCatSpeak: "Disable cat speak"
-markIncomingMediaInCwedPostAsSensitive: "Mark incoming media in cwed posts as sensitive"
 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."

locales/index.d.ts

@@ -3076,10 +3076,6 @@ export interface Locale extends ILocale {
      * 猫の話し方を無効にする
      */
     "disableCatSpeak": string;
-    /**
-     * cwed投稿の受信メディアを機密扱いとしてマークする
-     */
-    "markIncomingMediaInCwedPostAsSensitive": string;
     /**
      * アニメーション画像を再生しない
      */

locales/ja-JP.yml

@@ -765,7 +765,6 @@ lockedAccountInfo: "フォローを承認制にしても、ノートの公開範
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableCatSpeak: "猫の話し方を無効にする"
-markIncomingMediaInCwedPostAsSensitive: "cwed投稿の受信メディアを機密扱いとしてマークする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"

packages/backend/migration/1736888704471-NoteUserIdIdIndex.js

@@ -0,0 +1,11 @@
+export class NoteUserIdIdIndex1736888704471 {
+	name = 'NoteUserIdIdIndex1736888704471'
+
+	async up(queryRunner) {
+		await queryRunner.query(`CREATE INDEX "IDX_note_userId_id" ON "note" ("userId", "id") `);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "public"."IDX_note_userId_id"`);
+	}
+}

packages/backend/src/models/Note.ts

@@ -15,6 +15,7 @@ import type { MiDriveFile } from './DriveFile.js';
 @Index('IDX_NOTE_MENTIONS', { synchronize: false })
 @Index('IDX_NOTE_FILE_IDS', { synchronize: false })
 @Index('IDX_NOTE_VISIBLE_USER_IDS', { synchronize: false })
+@Index('IDX_note_userId_id', ['userId', 'id'])
 export class MiNote {
 	@PrimaryColumn(id())
 	public id: string;

packages/frontend/src/components/MkMediaList.vue

@@ -39,13 +39,11 @@ import XVideo from '@/components/MkMediaVideo.vue';
 import * as os from '@/os.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
 import { defaultStore } from '@/store.js';
-import { $i } from "@/account";
 
 const props = defineProps<{
 	mediaList: Misskey.entities.DriveFile[];
 	user?: Misskey.entities.UserLite;
 	raw?: boolean;
-	isNoteSensitive?: boolean;
 }>();
 
 const gallery = shallowRef<HTMLDivElement>();
@@ -92,12 +90,6 @@ async function calcAspectRatio() {
 }
 
 onMounted(() => {
-	if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true)) {
-		props.mediaList.forEach(media => {
-			media.isSensitive = props.isNoteSensitive;
-		});
-	}
-
 	calcAspectRatio();
 
 	lightbox = new PhotoSwipeLightbox({

packages/frontend/src/components/MkNote.vue

@@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</div>
 					<div v-if="appearNote.files && appearNote.files.length > 0">
-						<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :isNoteSensitive="note.cw"/>
+						<MkMediaList :mediaList="appearNote.files" :user="appearNote.user"/>
 					</div>
 					<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
 					<div v-if="isEnabledUrlPreview">

packages/frontend/src/components/MkNoteDetailed.vue

@@ -92,7 +92,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 				<div v-if="appearNote.files && appearNote.files.length > 0">
-					<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :isNoteSensitive="note.cw"/>
+					<MkMediaList :mediaList="appearNote.files" :user="appearNote.user"/>
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
 				<div v-if="isEnabledUrlPreview">

packages/frontend/src/components/MkSubNoteContent.vue

@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 	<details v-if="note.files && note.files.length > 0">
 		<summary>({{ i18n.tsx.withNFiles({ n: note.files.length }) }})</summary>
-		<MkMediaList :mediaList="note.files" :user="note.user" :isNoteSensitive="note.cw"/>
+		<MkMediaList :mediaList="note.files" :user="note.user"/>
 	</details>
 	<details v-if="note.poll">
 		<summary>{{ i18n.ts.poll }}</summary>

packages/frontend/src/pages/settings/general.vue

@@ -64,7 +64,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
 				<MkSwitch v-model="disableCatSpeak">{{ i18n.ts.disableCatSpeak }}</MkSwitch>
-				<MkSwitch v-model="markIncomingMediaInCwedPostAsSensitive">{{ i18n.ts.markIncomingMediaInCwedPostAsSensitive }}</MkSwitch>
 				<MkRadios v-model="reactionsDisplaySize">
 					<template #label>{{ i18n.ts.reactionsDisplaySize }}</template>
 					<option value="small">{{ i18n.ts.small }}</option>
@@ -302,7 +301,6 @@ const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('dis
 const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
 const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
 const disableCatSpeak = computed(defaultStore.makeGetterSetter('disableCatSpeak'));
-const markIncomingMediaInCwedPostAsSensitive = computed(defaultStore.makeGetterSetter('markIncomingMediaInCwedPostAsSensitive'));
 const highlightSensitiveMedia = computed(defaultStore.makeGetterSetter('highlightSensitiveMedia'));
 const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
 const warnMissingAltText = computed(defaultStore.makeGetterSetter('warnMissingAltText'));

packages/frontend/src/pages/settings/preferences-backups.vue

@@ -79,7 +79,6 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'imageNewTab',
 	'dataSaver',
 	'disableCatSpeak',
-	'markIncomingMediaInCwedPostAsSensitive',
 	'disableShowingAnimatedImages',
 	'emojiStyle',
 	'disableDrawer',

packages/frontend/src/pages/user/index.files.vue

@@ -33,8 +33,6 @@ import XVideo from '@/components/MkMediaVideo.vue';
 import XImage from '@/components/MkMediaImage.vue';
 import XBanner from '@/components/MkMediaBanner.vue';
 import { i18n } from '@/i18n.js';
-import { $i } from "@/account";
-import { defaultStore } from "@/store";
 
 const props = defineProps<{
 	user: Misskey.entities.UserDetailed;
@@ -53,11 +51,7 @@ onMounted(() => {
 		limit: 15,
 	}).then(notes => {
 		for (const note of notes) {
-			for (let file of note.files) {
-				if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true)) {
-					file.isSensitive = note.cw !== null;
-				}
-
+			for (const file of note.files) {
 				medias.value.push({
 					note,
 					file,

packages/frontend/src/pages/welcome.timeline.vue

@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
 				</div>
 				<div v-if="note.files.length > 0" :class="$style.richcontent">
-					<MkMediaList :mediaList="note.files" :user="note.user" :isNoteSensitive="note.cw"/>
+					<MkMediaList :mediaList="note.files" :user="note.user"/>
 				</div>
 				<div v-if="note.poll">
 					<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>

packages/frontend/src/store.ts

@@ -263,10 +263,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: false,
 	},
-	markIncomingMediaInCwedPostAsSensitive: {
-		where: 'account',
-		default: true,
-	},
 	emojiStyle: {
 		where: 'device',
 		default: 'twemoji', // twemoji / fluentEmoji / native