Feat(frontend):同じノートを連続してリノートしようとしたときに警告する設定を追加

CHANGELOG_YOJO.md

@@ -25,8 +25,9 @@
 ### Client
 - Fix: 非ログインでリバーシの戦績が見れない不具合の修正 [#404](https://github.com/yojo-art/cherrypick/pull/404)
 - Fix: 翻訳に失敗したとき読み込み中のままになるのを修正
-- Enhance: ユーザー概要の...からサーバー情報にリンクを追加 [#406](https://github.com/yojo-art/cherrypick/pull/406)
 - Fix: ノート詳細の本文表示優先度を変更
+- Feat: 同じノートを連続してリノートしようとしたときに警告する設定を追加(設定→全般)
+- Enhance: ユーザー概要の...からサーバー情報にリンクを追加 [#406](https://github.com/yojo-art/cherrypick/pull/406)
 
 ### Server
 -

locales/index.d.ts

@@ -56,6 +56,10 @@ export interface Locale extends ILocale {
      * この作業は最初一度だけ行われます。
      */
     "cherrypickMigratedCacheClear": string;
+    /**
+     * 同じノートを連続してリノートしようとしたときに警告する
+     */
+    "showMultipleRenoteWarning": string;
     /**
      * リノートの公開範囲オプションを表示
      */
@@ -11932,6 +11936,20 @@ export interface Locale extends ILocale {
          */
         "notificationDeleteTitle": string;
     };
+    "_renoteConfirm": {
+        /**
+         * このノートはリノートしたばかりです
+         */
+        "title": string;
+        /**
+         * リノートしますか？
+         */
+        "caption": string;
+        /**
+         * リノートする
+         */
+        "confirm": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/ja-JP.yml

@@ -10,6 +10,7 @@ welcome: "ようこそ！"
 cherrypickMigrated: "CherryPickへの移行が完了しました！"
 cherrypickMigratedCacheClearTitle: "キャッシュクリアのご案内"
 cherrypickMigratedCacheClear: "このサーバーは<b>Misskey</b>または<b>CherryPick v4.3.0以前</b>のバージョンから移行されました。\nバージョン管理方式が異なり、残っているキャッシュが問題を引き起こす可能性があるため、移行後、最初の接続時にキャッシュを削除する作業を行う必要があります。\n\nこの作業は最初一度だけ行われます。"
+showMultipleRenoteWarning: "同じノートを連続してリノートしようとしたときに警告する"
 showRenoteVisibilitySelector: "リノートの公開範囲オプションを表示"
 cannotBeUsedFunc: "この機能は現在使用できません。"
 scale: "大きさ"
@@ -3188,3 +3189,8 @@ _dice:
 _deleteConfirm:
   delete: "削除する"
   notificationDeleteTitle: "通知を削除しますか？"
+
+_renoteConfirm:
+  title: "このノートはリノートしたばかりです"
+  caption: "リノートしますか？"
+  confirm: 'リノートする'

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

@@ -85,6 +85,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="infoButtonForNoteActionsEnabled">{{ i18n.ts.infoButtonForNoteActions }}<template #caption>{{ i18n.ts.infoButtonForNoteActionsDescription }}</template> <span class="_beta">CherryPick</span></MkSwitch>
 				<MkSwitch v-model="showReplyInNotification">{{ i18n.ts.showReplyInNotification }} <span class="_beta">CherryPick</span></MkSwitch>
 				<MkSwitch v-model="renoteQuoteButtonSeparation">{{ i18n.ts.renoteQuoteButtonSeparation }} <span class="_beta">CherryPick</span></MkSwitch>
+				<MkSwitch v-model="checkMultipleRenote">{{ i18n.ts.showMultipleRenoteWarning }} <span class="_beta">yojo-art</span></MkSwitch>
 				<MkSwitch v-model="renoteVisibilitySelection">{{ i18n.ts.showRenoteVisibilitySelector }} <span class="_beta">CherryPick</span></MkSwitch>
 				<MkSelect v-if="!renoteVisibilitySelection" v-model="forceRenoteVisibilitySelection">
 					<template #label>{{ i18n.ts.forceRenoteVisibilitySelector }}</template>
@@ -468,6 +469,7 @@ const showFixedPostFormInReplies = computed(defaultStore.makeGetterSetter('showF
 const showingAnimatedImages = computed(defaultStore.makeGetterSetter('showingAnimatedImages'));
 const allMediaNoteCollapse = computed(defaultStore.makeGetterSetter('allMediaNoteCollapse'));
 const nsfwOpenBehavior = computed(defaultStore.makeGetterSetter('nsfwOpenBehavior'));
+const checkMultipleRenote = computed(defaultStore.makeGetterSetter('checkMultipleRenote'));
 const renoteVisibilitySelection = computed(defaultStore.makeGetterSetter('renoteVisibilitySelection'));
 const forceRenoteVisibilitySelection = computed(defaultStore.makeGetterSetter('forceRenoteVisibilitySelection'));
 

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

@@ -131,6 +131,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'useEnterToSend',
 	'postFormVisibilityHotkey',
 	'showRenoteConfirmPopup',
+	'checkMultipleRenote',
 	'displayHeaderNavBarWhenScroll',
 	'infoButtonForNoteActionsEnabled',
 	'reactableRemoteReactionEnabled',

packages/frontend/src/scripts/check-last-renote.ts

@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project, yojo-art team
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+import { i18n } from '@/i18n.js';
+import * as os from '@/os.js';
+import { defaultStore } from '@/store.js';
+
+export async function confirmRenote(renoteId:string) : Promise<boolean> {
+	if (defaultStore.state.checkMultipleRenote === false ) return false;
+	const lastRenoteId = localStorage.getItem('lastRenoteId');
+	if (lastRenoteId) {
+		if (lastRenoteId === renoteId) {
+			const { canceled } = await os.confirm({
+				type: 'warning',
+				title: i18n.ts._renoteConfirm.title,
+				caption: i18n.ts._renoteConfirm.caption,
+				okText: i18n.ts._renoteConfirm.confirm,
+				cancelText: i18n.ts.thisPostMayBeAnnoyingCancel,
+			});
+			return canceled;
+		}
+	}
+	localStorage.setItem('lastRenoteId', renoteId);
+	return false;
+}

packages/frontend/src/scripts/get-note-menu.ts

@@ -6,6 +6,7 @@
 import { defineAsyncComponent, Ref, ShallowRef } from 'vue';
 import * as Misskey from 'cherrypick-js';
 import { claimAchievement } from './achievements.js';
+import { confirmRenote } from './check-last-renote.js';
 import { $i } from '@/account.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
@@ -669,7 +670,7 @@ export function getRenoteMenu(props: {
 		normalRenoteItems.push({
 			text: i18n.ts.renote,
 			icon: 'ti ti-repeat',
-			action: () => {
+			action: async () => {
 				const el = props.renoteButton.value;
 				if (el) {
 					const rect = el.getBoundingClientRect();
@@ -689,6 +690,9 @@ export function getRenoteMenu(props: {
 					visibility = smallerVisibility(visibility, 'home');
 				}
 
+				const result = await confirmRenote(appearNote.id);
+				if (result) return;
+
 				if (!props.mock) {
 					misskeyApi('notes/create', {
 						localOnly,
@@ -726,7 +730,10 @@ export function getRenoteMenu(props: {
 				visibilityRenoteItems.push({
 					text: `${i18n.ts.renote} (${i18n.ts._visibility.public})`,
 					icon: 'ti ti-world',
-					action: () => {
+					action: async () => {
+						const result =	await confirmRenote(appearNote.id);
+						if (result) return;
+
 						misskeyApi('notes/create', {
 							localOnly,
 							visibility: 'public',
@@ -743,7 +750,9 @@ export function getRenoteMenu(props: {
 				visibilityRenoteItems.push({
 					text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`,
 					icon: 'ti ti-home',
-					action: () => {
+					action: async () => {
+						const result =	await confirmRenote(appearNote.id);
+						if (result) return;
 						misskeyApi('notes/create', {
 							localOnly,
 							visibility: 'home',
@@ -759,7 +768,9 @@ export function getRenoteMenu(props: {
 			visibilityRenoteItems.push({
 				text: `${i18n.ts.renote} (${i18n.ts._visibility.followers})`,
 				icon: 'ti ti-lock',
-				action: () => {
+				action: async () => {
+					const result =	await confirmRenote(appearNote.id);
+					if (result) return;
 					misskeyApi('notes/create', {
 						localOnly,
 						visibility: 'followers',
@@ -836,6 +847,9 @@ export async function getRenoteOnly(props: {
 		}
 
 		if (!props.mock && defaultStore.state.renoteVisibilitySelection) {
+			const result = await confirmRenote(appearNote.id);
+			if (result) return;
+
 			misskeyApi('notes/create', {
 				localOnly,
 				visibility,
@@ -850,6 +864,8 @@ export async function getRenoteOnly(props: {
 			!defaultStore.state.renoteVisibilitySelection &&
 			appearNote.visibility !== 'specified'
 		) {
+			const result = await confirmRenote(appearNote.id);
+			if (result) return;
 			if (defaultStore.state.forceRenoteVisibilitySelection !== 'none') {
 				if (appearNote.visibility === 'public' && defaultStore.state.forceRenoteVisibilitySelection === 'public') { // renote to public
 					misskeyApi('notes/create', {

packages/frontend/src/store.ts

@@ -590,6 +590,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: 'none' as 'none' | 'public' | 'home' | 'followers',
 	},
+	checkMultipleRenote: {
+		where: 'device',
+		default: false,
+	},
 	showFixedPostFormInReplies: {
 		where: 'device',
 		default: true,