Delete disableRightClick

locales/en-US.yml

@@ -44,7 +44,6 @@ friendlyEnableWidgets: "Enable the widgets area"
 friendlyDisableWidgets: "Disable the widgets area"
 useBoldFont: "Bold Text"
 newNoteReceivedNotification: "When receive a new note notification"
-disableRightClick: "Prohibit right click"
 cherrypickUpdatedCacheClearTitle: "Clear the cache?"
 cherrypickUpdatedCacheClear: "It is <b>recommended to clear the cache</b> after the client is updated, as changes such as theme, color, and locale may not be reflected properly.\nYour account login status remains the same!"
 cherrypickUpdatedCacheClearLater: "If you want to clear the cache later, you can do it in <b>Settings</b> - <b>Clear Cache</b>!"

locales/index.d.ts

@@ -47,7 +47,6 @@ export interface Locale {
     "friendlyDisableWidgets": string;
     "useBoldFont": string;
     "newNoteReceivedNotification": string;
-    "disableRightClick": string;
     "cherrypickUpdatedCacheClearTitle": string;
     "cherrypickUpdatedCacheClear": string;
     "cherrypickUpdatedCacheClearLater": string;

locales/ja-JP.yml

@@ -44,7 +44,6 @@ friendlyEnableWidgets: "ウィジェット領域を有効化"
 friendlyDisableWidgets: "ウィジェット領域を無効化"
 useBoldFont: "文字を太くする"
 newNoteReceivedNotification: "新しいノート通知を表示するとき"
-disableRightClick: "右クリックを禁止"
 cherrypickUpdatedCacheClearTitle: "キャッシュをクリアしましょうか？"
 cherrypickUpdatedCacheClear: "テーマや色、ロケールなどの変更が正しく反映されない可能性があるため、クライアントが更新されたら<b>キャッシュをクリアすることをお勧め</b>します。\nアカウントログイン状態はそのまま維持されます！"
 cherrypickUpdatedCacheClearLater: "あとでキャッシュをクリアするには、<b>設定</b> - <b>キャッシュをクリア</b>でできます！"

locales/ko-KR.yml

@@ -44,7 +44,6 @@ friendlyEnableWidgets: "위젯 영역 활성화"
 friendlyDisableWidgets: "위젯 영역 비활성화"
 useBoldFont: "볼드체 텍스트"
 newNoteReceivedNotification: "새 노트 알림을 표시할 때"
-disableRightClick: "우클릭 방지"
 cherrypickUpdatedCacheClearTitle: "캐시를 지울까요?"
 cherrypickUpdatedCacheClear: "테마 및 색상, 로케일 등의 변경 사항이 제대로 반영되지 않을 수 있기 때문에, 클라이언트가 업데이트되면 <b>캐시를 지울 것을 권장</b>해요.\n계정 로그인 상태는 그대로 유지돼요!"
 cherrypickUpdatedCacheClearLater: "나중에 캐시를 지우려면 <b>설정</b> - <b>캐시 지우기</b>에서 할 수 있어요!"

packages/backend/migration/1697809019142-deleteDisableRightClick.js

@@ -0,0 +1,12 @@
+export class DeleteDisableRightClick1697809019142 {
+		name = 'DeleteDisableRightClick1697809019142'
+
+    async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "disableRightClick"`);
+    }
+
+    async down(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "disableRightClick"`);
+    }
+
+}

packages/backend/src/core/NoteCreateService.ts

@@ -137,7 +137,6 @@ type Option = {
 	event?: IEvent | null;
 	localOnly?: boolean | null;
 	reactionAcceptance?: MiNote['reactionAcceptance'];
-	disableRightClick?: boolean | null;
 	cw?: string | null;
 	visibility?: string;
 	visibleUsers?: MinimumUser[] | null;
@@ -248,7 +247,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (data.createdAt == null) data.createdAt = new Date();
 		if (data.visibility == null) data.visibility = 'public';
 		if (data.localOnly == null) data.localOnly = false;
-		if (data.disableRightClick == null) data.disableRightClick = false;
 		if (data.channel != null) data.visibility = 'public';
 		if (data.channel != null) data.visibleUsers = [];
 		if (data.channel != null) data.localOnly = true;
@@ -394,7 +392,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 			userId: user.id,
 			localOnly: data.localOnly!,
 			reactionAcceptance: data.reactionAcceptance,
-			disableRightClick: data.disableRightClick!,
 			visibility: data.visibility as any,
 			visibleUserIds: data.visibility === 'specified'
 				? data.visibleUsers

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -309,7 +309,6 @@ export class ApNoteService {
 				cw,
 				text,
 				localOnly: false,
-				disableRightClick: false,
 				visibility,
 				visibleUsers,
 				apMentions,

packages/backend/src/core/entities/NoteEntityService.ts

@@ -351,7 +351,6 @@ export class NoteEntityService implements OnModuleInit {
 			localOnly: note.localOnly,
 			reactionAcceptance: note.reactionAcceptance,
 			visibleUserIds: note.visibility === 'specified' ? note.visibleUserIds : undefined,
-			disableRightClick: note.disableRightClick || undefined,
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
 			reactions: this.reactionService.convertLegacyReactions(note.reactions),

packages/backend/src/models/Note.ts

@@ -114,11 +114,6 @@ export class MiNote {
 	})
 	public reactionAcceptance: 'likeOnly' | 'likeOnlyForRemote' | 'nonSensitiveOnly' | 'nonSensitiveOnlyForLocalLikeOnlyForRemote' | null;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public disableRightClick: boolean;
-
 	@Column('smallint', {
 		default: 0,
 	})

packages/backend/src/models/json-schema/note.ts

@@ -80,10 +80,6 @@ export const packedNoteSchema = {
 			optional: true, nullable: true,
 			ref: 'Note',
 		},
-		disableRightClick: {
-			type: 'boolean',
-			optional: true, nullable: false,
-		},
 		isHidden: {
 			type: 'boolean',
 			optional: true, nullable: false,

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -111,7 +111,6 @@ export const paramDef = {
 		cw: { type: 'string', nullable: true, maxLength: 100 },
 		localOnly: { type: 'boolean', default: false },
 		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
-		disableRightClick: { type: 'boolean', default: false },
 		noExtractMentions: { type: 'boolean', default: false },
 		noExtractHashtags: { type: 'boolean', default: false },
 		noExtractEmojis: { type: 'boolean', default: false },
@@ -323,7 +322,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				cw: ps.cw,
 				localOnly: ps.localOnly,
 				reactionAcceptance: ps.reactionAcceptance,
-				disableRightClick: ps.disableRightClick,
 				visibility: ps.visibility,
 				visibleUsers,
 				channel,

packages/frontend/src/components/MkNote.vue

@@ -94,8 +94,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 				<div v-if="appearNote.files.length > 0">
-					<MkMediaList v-if="appearNote.disableRightClick" :mediaList="appearNote.files" @contextmenu.prevent/>
-					<MkMediaList v-else :mediaList="appearNote.files"/>
+					<MkMediaList :mediaList="appearNote.files"/>
 				</div>
 				<MkPoll v-if="appearNote.poll" :note="appearNote" :class="$style.poll"/>
 				<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" :class="$style.urlPreview"/>

packages/frontend/src/components/MkNoteDetailed.vue

@@ -113,8 +113,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</div>
 				<div v-if="appearNote.files.length > 0">
-					<MkMediaList v-if="appearNote.disableRightClick" :mediaList="appearNote.files" @contextmenu.prevent/>
-					<MkMediaList v-else :mediaList="appearNote.files"/>
+					<MkMediaList :mediaList="appearNote.files"/>
 				</div>
 				<MkPoll v-if="appearNote.poll" ref="pollViewer" :note="appearNote" :class="$style.poll"/>
 				<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="true" style="margin-top: 6px;"/>

packages/frontend/src/components/MkPostForm.vue

@@ -86,7 +86,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button v-tooltip="i18n.ts.useCw" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: useCw }]" @click="useCw = !useCw"><i class="ti ti-eye-off"></i></button>
 			<button v-tooltip="i18n.ts.mention" class="_button" :class="$style.footerButton" @click="insertMention"><i class="ti ti-at"></i></button>
 			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: withHashtags }]" @click="withHashtags = !withHashtags"><i class="ti ti-hash"></i></button>
-			<button v-tooltip="i18n.ts.disableRightClick" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: disableRightClick }]" @click="disableRightClick = !disableRightClick"><i class="ti ti-mouse-off"></i></button>
 			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" :class="$style.footerButton" @click="showActions"><i class="ti ti-plug"></i></button>
 			<button v-tooltip="i18n.ts.emoji" :class="['_button', $style.footerButton]" @click="insertEmoji"><i class="ti ti-mood-happy"></i></button>
 		</div>
@@ -201,7 +200,6 @@ let hasNotSpecifiedMentions = $ref(false);
 let recentHashtags = $ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]'));
 let imeText = $ref('');
 let showingOptions = $ref(false);
-let disableRightClick = $ref(false);
 
 const draftKey = $computed((): string => {
 	let key = props.channel ? `channel:${props.channel.id}` : '';
@@ -361,7 +359,6 @@ function watchForDraft() {
 	watch($$(text), () => saveDraft());
 	watch($$(useCw), () => saveDraft());
 	watch($$(cw), () => saveDraft());
-	watch($$(disableRightClick), () => saveDraft());
 	watch($$(poll), () => saveDraft());
 	watch($$(event), () => saveDraft());
 	watch($$(files), () => saveDraft(), { deep: true });
@@ -690,7 +687,6 @@ function saveDraft() {
 			text: text,
 			useCw: useCw,
 			cw: cw,
-			disableRightClick: disableRightClick,
 			visibility: visibility,
 			localOnly: localOnly,
 			files: files,
@@ -763,7 +759,6 @@ async function post(ev?: MouseEvent) {
 		visibility: visibility,
 		visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
 		reactionAcceptance,
-		disableRightClick: disableRightClick,
 		noteId: props.updateMode ? props.initialNote?.id : undefined,
 	};
 
@@ -934,7 +929,6 @@ onMounted(() => {
 				text = draft.data.text;
 				useCw = draft.data.useCw;
 				cw = draft.data.cw;
-				disableRightClick = draft.data.disableRightClick;
 				visibility = draft.data.visibility;
 				localOnly = draft.data.localOnly;
 				files = (draft.data.files || []).filter(draftFile => draftFile);
@@ -973,7 +967,6 @@ onMounted(() => {
 			visibility = init.visibility;
 			localOnly = init.localOnly;
 			quoteId = init.renote ? init.renote.id : null;
-			disableRightClick = init.disableRightClick != null;
 		}
 
 		nextTick(() => watchForDraft());

packages/frontend/src/components/MkPostFormSimple.vue

@@ -105,7 +105,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<button v-tooltip="i18n.ts.useCw" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: useCw }]" @click="useCw = !useCw"><i class="ti ti-eye-off"></i></button>
 				<button v-tooltip="i18n.ts.mention" class="_button" :class="$style.footerButton" @click="insertMention"><i class="ti ti-at"></i></button>
 				<button v-tooltip="i18n.ts.hashtags" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: withHashtags }]" @click="withHashtags = !withHashtags"><i class="ti ti-hash"></i></button>
-				<button v-tooltip="i18n.ts.disableRightClick" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: disableRightClick }]" @click="disableRightClick = !disableRightClick"><i class="ti ti-mouse-off"></i></button>
 				<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugin" class="_button" :class="$style.footerButton" @click="showActions"><i class="ti ti-plug"></i></button>
 				<button v-tooltip="i18n.ts.emoji" :class="['_button', $style.footerButton]" @click="insertEmoji"><i class="ti ti-mood-happy"></i></button>
 			</div>
@@ -224,7 +223,6 @@ let hasNotSpecifiedMentions = $ref(false);
 let recentHashtags = $ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]'));
 let imeText = $ref('');
 let showingOptions = $ref(false);
-let disableRightClick = $ref(false);
 
 const draftKey = $computed((): string => {
 	let key = props.channel ? `channel:${props.channel.id}` : '';
@@ -382,7 +380,6 @@ function watchForDraft() {
 	watch($$(text), () => saveDraft());
 	watch($$(useCw), () => saveDraft());
 	watch($$(cw), () => saveDraft());
-	watch($$(disableRightClick), () => saveDraft());
 	watch($$(poll), () => saveDraft());
 	watch($$(event), () => saveDraft());
 	watch($$(files), () => saveDraft(), { deep: true });
@@ -711,7 +708,6 @@ function saveDraft() {
 			text: text,
 			useCw: useCw,
 			cw: cw,
-			disableRightClick: disableRightClick,
 			visibility: visibility,
 			localOnly: localOnly,
 			files: files,
@@ -784,7 +780,6 @@ async function post(ev?: MouseEvent) {
 		visibility: visibility,
 		visibleUserIds: visibility === 'specified' ? visibleUsers.map(u => u.id) : undefined,
 		reactionAcceptance,
-		disableRightClick: disableRightClick,
 		noteId: props.updateMode ? props.initialNote?.id : undefined,
 	};
 
@@ -988,7 +983,6 @@ onMounted(() => {
 				text = draft.data.text;
 				useCw = draft.data.useCw;
 				cw = draft.data.cw;
-				disableRightClick = draft.data.disableRightClick;
 				visibility = draft.data.visibility;
 				localOnly = draft.data.localOnly;
 				files = (draft.data.files || []).filter(draftFile => draftFile);
@@ -1027,7 +1021,6 @@ onMounted(() => {
 			visibility = init.visibility;
 			localOnly = init.localOnly;
 			quoteId = init.renote ? init.renote.id : null;
-			disableRightClick = init.disableRightClick != null;
 		}
 
 		nextTick(() => watchForDraft());

packages/frontend/src/components/MkSubNoteContent.vue

@@ -28,8 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<div v-show="showContent">
 			<div v-if="note.files.length > 0">
-				<MkMediaList v-if="note.disableRightClick" :mediaList="note.files" @contextmenu.prevent/>
-				<MkMediaList v-else :mediaList="note.files"/>
+				<MkMediaList :mediaList="note.files"/>
 			</div>
 			<div v-if="note.poll">
 				<MkPoll :note="note"/>