Merge branch 'develop' into fix-freebsd

CHANGELOG.md

@@ -10,9 +10,11 @@
 - Enhance: クライアントエラー画面の多言語対応
 - Enhance: 開発者モードでメニューからファイルIDをコピー出来るように `#15441'
 - Enhance: ノートに埋め込まれたメディアのコンテキストメニューから管理者用のファイル管理画面を開けるように ( #15440 )
+- Enhance: リアクションする際に確認ダイアログを表示できるように
 - Fix: コンディショナルロールを手動で割り当てできる導線を削除 `#13529`
 - Fix: 埋め込みプレイヤーから外部ページに移動できない問題を修正
 - Fix: Play の再読込時に UI が以前の状態を引き継いでしまう問題を修正 `#14378`
+- Fix: カスタム絵文字管理画面(beta)にてisSensitive/localOnlyの絞り込みが上手くいかない問題の修正 ( #15445 )
 
 ### Server
 - Fix: `following/invalidate`でフォロワーを解除しようとしているユーザーの情報を返すように

locales/index.d.ts

@@ -5254,6 +5254,14 @@ export interface Locale extends ILocale {
      * このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。
      */
     "federationDisabled": string;
+    /**
+     * リアクションする際に確認する
+     */
+    "confirmOnReact": string;
+    /**
+     * " {emoji} " をリアクションしますか？
+     */
+    "reactAreYouSure": ParameterizedString<"emoji">;
     "_accountSettings": {
         /**
          * コンテンツの表示にログインを必須にする

locales/ja-JP.yml

@@ -1309,6 +1309,8 @@ availableRoles: "利用可能なロール"
 acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
 federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
 federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
+confirmOnReact: "リアクションする際に確認する"
+reactAreYouSure: "\" {emoji} \" をリアクションしますか？"
 
 _accountSettings:
   requireSigninToViewContents: "コンテンツの表示にログインを必須にする"

packages/frontend-embed/package.json

@@ -25,16 +25,16 @@
 		"misskey-js": "workspace:*",
 		"frontend-shared": "workspace:*",
 		"punycode.js": "2.3.1",
-		"rollup": "4.31.0",
+		"rollup": "4.34.7",
-		"sass": "1.83.4",
+		"sass": "1.85.0",
-		"shiki": "1.27.2",
+		"shiki": "1.29.2",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.7.3",
 		"uuid": "10.0.0",
 		"json5": "2.2.3",
-		"vite": "6.0.9",
+		"vite": "6.1.0",
 		"vue": "3.5.13"
 	},
 	"devDependencies": {
@@ -42,26 +42,26 @@
 		"@testing-library/vue": "8.1.0",
 		"@types/estree": "1.0.6",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.10.7",
+		"@types/node": "22.13.4",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "10.0.0",
-		"@types/ws": "8.5.13",
+		"@types/ws": "8.5.14",
-		"@typescript-eslint/eslint-plugin": "8.20.0",
+		"@typescript-eslint/eslint-plugin": "8.24.0",
-		"@typescript-eslint/parser": "8.20.0",
+		"@typescript-eslint/parser": "8.24.0",
-		"@vitest/coverage-v8": "1.6.0",
+		"@vitest/coverage-v8": "1.6.1",
 		"@vue/runtime-core": "3.5.13",
 		"acorn": "8.14.0",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.31.0",
 		"eslint-plugin-vue": "9.32.0",
 		"fast-glob": "3.3.3",
-		"happy-dom": "16.6.0",
+		"happy-dom": "16.8.1",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
 		"msw": "2.7.0",
 		"nodemon": "3.1.9",
-		"prettier": "3.4.2",
+		"prettier": "3.5.1",
 		"start-server-and-test": "2.0.10",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vue-component-type-helpers": "2.2.0",

packages/frontend-shared/js/emojilist.ts

@@ -12,7 +12,7 @@ export type UnicodeEmojiDef = {
 };
 
 // initial converted from https://github.com/muan/emojilib/commit/242fe68be86ed6536843b83f7e32f376468b38fb
-import _emojilist from './emojilist.json';
+import _emojilist from './emojilist.json' with { type: 'json' };
 
 export const emojilist: UnicodeEmojiDef[] = _emojilist.map(x => ({
 	name: x[1] as string,

packages/frontend-shared/package.json

@@ -21,13 +21,13 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"devDependencies": {
-		"@types/node": "22.9.0",
+		"@types/node": "22.13.4",
-		"@typescript-eslint/eslint-plugin": "7.17.0",
+		"@typescript-eslint/eslint-plugin": "7.18.0",
-		"@typescript-eslint/parser": "7.17.0",
+		"@typescript-eslint/parser": "7.18.0",
 		"esbuild": "0.25.0",
-		"eslint-plugin-vue": "9.31.0",
+		"eslint-plugin-vue": "9.32.0",
-		"nodemon": "3.1.7",
+		"nodemon": "3.1.9",
-		"typescript": "5.6.3",
+		"typescript": "5.7.3",
 		"vue-eslint-parser": "9.4.3"
 	},
 	"files": [
@@ -35,6 +35,6 @@
 	],
 	"dependencies": {
 		"misskey-js": "workspace:*",
-		"vue": "3.5.12"
+		"vue": "3.5.13"
 	}
 }

packages/frontend/package.json

@@ -38,7 +38,7 @@
 		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.2.0",
-		"chromatic": "11.25.0",
+		"chromatic": "11.25.2",
 		"compare-versions": "6.1.1",
 		"cropperjs": "2.0.0-rc.2",
 		"date-fns": "2.30.0",
@@ -49,20 +49,20 @@
 		"insert-text-at-cursor": "0.3.0",
 		"is-file-animated": "1.0.2",
 		"json5": "2.2.3",
-		"matter-js": "0.19.0",
+		"matter-js": "0.20.0",
 		"mfm-js": "0.24.0",
 		"misskey-bubble-game": "workspace:*",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"photoswipe": "5.4.4",
 		"punycode.js": "2.3.1",
-		"rollup": "4.31.0",
+		"rollup": "4.34.7",
 		"sanitize-html": "2.14.0",
-		"sass": "1.83.4",
+		"sass": "1.85.0",
-		"shiki": "1.27.2",
+		"shiki": "1.29.2",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
-		"three": "0.172.0",
+		"three": "0.173.0",
 		"throttle-debounce": "5.0.2",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.10",
@@ -70,69 +70,69 @@
 		"typescript": "5.7.3",
 		"uuid": "11.0.5",
 		"v-code-diff": "1.13.1",
-		"vite": "6.0.9",
+		"vite": "6.1.0",
 		"vue": "3.5.13",
 		"vuedraggable": "next"
 	},
 	"devDependencies": {
 		"@misskey-dev/summaly": "5.2.0",
-		"@storybook/addon-actions": "8.5.0",
+		"@storybook/addon-actions": "8.5.6",
-		"@storybook/addon-essentials": "8.5.0",
+		"@storybook/addon-essentials": "8.5.6",
-		"@storybook/addon-interactions": "8.5.0",
+		"@storybook/addon-interactions": "8.5.6",
-		"@storybook/addon-links": "8.5.0",
+		"@storybook/addon-links": "8.5.6",
-		"@storybook/addon-mdx-gfm": "8.5.0",
+		"@storybook/addon-mdx-gfm": "8.5.6",
-		"@storybook/addon-storysource": "8.5.0",
+		"@storybook/addon-storysource": "8.5.6",
-		"@storybook/blocks": "8.5.0",
+		"@storybook/blocks": "8.5.6",
-		"@storybook/components": "8.5.0",
+		"@storybook/components": "8.5.6",
-		"@storybook/core-events": "8.5.0",
+		"@storybook/core-events": "8.5.6",
-		"@storybook/manager-api": "8.5.0",
+		"@storybook/manager-api": "8.5.6",
-		"@storybook/preview-api": "8.5.0",
+		"@storybook/preview-api": "8.5.6",
-		"@storybook/react": "8.5.0",
+		"@storybook/react": "8.5.6",
-		"@storybook/react-vite": "8.5.0",
+		"@storybook/react-vite": "8.5.6",
-		"@storybook/test": "8.5.0",
+		"@storybook/test": "8.5.6",
-		"@storybook/theming": "8.5.0",
+		"@storybook/theming": "8.5.6",
-		"@storybook/types": "8.5.0",
+		"@storybook/types": "8.5.6",
-		"@storybook/vue3": "8.5.0",
+		"@storybook/vue3": "8.5.6",
-		"@storybook/vue3-vite": "8.5.0",
+		"@storybook/vue3-vite": "8.5.6",
 		"@testing-library/vue": "8.1.0",
-		"@types/canvas-confetti": "1.6.4",
+		"@types/canvas-confetti": "1.9.0",
 		"@types/estree": "1.0.6",
-		"@types/matter-js": "0.19.7",
+		"@types/matter-js": "0.19.8",
 		"@types/micromatch": "4.0.9",
-		"@types/node": "22.10.7",
+		"@types/node": "22.13.4",
 		"@types/punycode.js": "npm:@types/punycode@2.1.4",
 		"@types/sanitize-html": "2.13.0",
 		"@types/seedrandom": "3.0.8",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "10.0.0",
-		"@types/ws": "8.5.13",
+		"@types/ws": "8.5.14",
-		"@typescript-eslint/eslint-plugin": "8.20.0",
+		"@typescript-eslint/eslint-plugin": "8.24.0",
-		"@typescript-eslint/parser": "8.20.0",
+		"@typescript-eslint/parser": "8.24.0",
-		"@vitest/coverage-v8": "1.6.0",
+		"@vitest/coverage-v8": "1.6.1",
 		"@vue/runtime-core": "3.5.13",
 		"acorn": "8.14.0",
 		"cross-env": "7.0.3",
-		"cypress": "14.0.0",
+		"cypress": "14.0.3",
 		"eslint-plugin-import": "2.31.0",
 		"eslint-plugin-vue": "9.32.0",
 		"fast-glob": "3.3.3",
-		"happy-dom": "16.6.0",
+		"happy-dom": "16.8.1",
 		"intersection-observer": "0.12.2",
 		"micromatch": "4.0.8",
 		"msw": "2.7.0",
 		"msw-storybook-addon": "2.0.4",
 		"nodemon": "3.1.9",
-		"prettier": "3.4.2",
+		"prettier": "3.5.1",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
 		"seedrandom": "3.0.5",
 		"start-server-and-test": "2.0.10",
-		"storybook": "8.5.0",
+		"storybook": "8.5.6",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "1.6.1",
-		"vitest-fetch-mock": "0.2.2",
+		"vitest-fetch-mock": "0.4.3",
 		"vue-component-type-helpers": "2.2.0",
 		"vue-eslint-parser": "9.4.3",
 		"vue-tsc": "2.2.0"

packages/frontend/src/components/MkNote.vue

@@ -489,7 +489,16 @@ function react(): void {
 		}
 	} else {
 		blur();
-		reactionPicker.show(reactButton.value ?? null, note.value, reaction => {
+		reactionPicker.show(reactButton.value ?? null, note.value, async (reaction) => {
+			if (defaultStore.state.confirmOnReact) {
+				const confirm = await os.confirm({
+					type: 'question',
+					text: i18n.tsx.reactAreYouSure({ emoji: reaction.replace('@.', '') }),
+				});
+
+				if (confirm.canceled) return;
+			}
+
 			sound.playMisskeySfx('reaction');
 
 			if (props.mock) {

packages/frontend/src/components/MkNoteDetailed.vue

@@ -452,7 +452,16 @@ function react(): void {
 		}
 	} else {
 		blur();
-		reactionPicker.show(reactButton.value ?? null, note.value, reaction => {
+		reactionPicker.show(reactButton.value ?? null, note.value, async (reaction) => {
+			if (defaultStore.state.confirmOnReact) {
+				const confirm = await os.confirm({
+					type: 'question',
+					text: i18n.tsx.reactAreYouSure({ emoji: reaction.replace('@.', '') }),
+				});
+
+				if (confirm.canceled) return;
+			}
+
 			sound.playMisskeySfx('reaction');
 
 			misskeyApi('notes/reactions/create', {

packages/frontend/src/components/MkReactionsViewer.reaction.vue

@@ -90,6 +90,15 @@ async function toggleReaction() {
 			}
 		});
 	} else {
+		if (defaultStore.state.confirmOnReact) {
+			const confirm = await os.confirm({
+				type: 'question',
+				text: i18n.tsx.reactAreYouSure({ emoji: props.reaction.replace('@.', '') }),
+			});
+
+			if (confirm.canceled) return;
+		}
+
 		sound.playMisskeySfx('reaction');
 
 		if (mock) {

packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue

@@ -71,6 +71,9 @@ export type EmojiSearchQuery = {
 <script setup lang="ts">
 import { computed, defineAsyncComponent, onMounted, ref, nextTick, useCssModule } from 'vue';
 import * as Misskey from 'misskey-js';
+import type { RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
+import type { GridCellValidationEvent, GridCellValueChangeEvent, GridEvent } from '@/components/grid/grid-event.js';
+import type { GridSetting } from '@/components/grid/grid.js';
 import * as os from '@/os.js';
 import {
 	emptyStrToEmptyArray,
@@ -86,11 +89,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import MkPagingButtons from '@/components/MkPagingButtons.vue';
 import { selectFile } from '@/scripts/select-file.js';
 import { copyGridDataToClipboard, removeDataFromGrid } from '@/components/grid/grid-utils.js';
-import { useLoading } from "@/components/hook/useLoading.js";
+import { useLoading } from '@/components/hook/useLoading.js';
-
-import type { RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
-import type { GridCellValidationEvent, GridCellValueChangeEvent, GridEvent } from '@/components/grid/grid-event.js';
-import type { GridSetting } from '@/components/grid/grid.js';
 
 type GridItem = {
 	checked: boolean;
@@ -465,8 +464,8 @@ async function refreshCustomEmojis() {
 		aliases: emptyStrToUndefined(searchQuery.value.aliases),
 		category: emptyStrToUndefined(searchQuery.value.category),
 		license: emptyStrToUndefined(searchQuery.value.license),
-		isSensitive: searchQuery.value.sensitive ? Boolean(searchQuery.value.sensitive).valueOf() : undefined,
+		isSensitive: searchQuery.value.sensitive != null ? Boolean(searchQuery.value.sensitive).valueOf() : undefined,
-		localOnly: searchQuery.value.localOnly ? Boolean(searchQuery.value.localOnly).valueOf() : undefined,
+		localOnly: searchQuery.value.localOnly != null ? Boolean(searchQuery.value.localOnly).valueOf() : undefined,
 		updatedAtFrom: emptyStrToUndefined(searchQuery.value.updatedAtFrom),
 		updatedAtTo: emptyStrToUndefined(searchQuery.value.updatedAtTo),
 		roleIds: searchQuery.value.roles.map(it => it.id),
@@ -593,7 +592,7 @@ const headerActions = computed(() => [{
 				dispose();
 			},
 		});
-	}
+	},
 }]);
 </script>
 

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

@@ -170,6 +170,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
 				<MkSwitch v-model="alwaysConfirmFollow">{{ i18n.ts.alwaysConfirmFollow }}</MkSwitch>
 				<MkSwitch v-model="confirmWhenRevealingSensitiveMedia">{{ i18n.ts.confirmWhenRevealingSensitiveMedia }}</MkSwitch>
+				<MkSwitch v-model="confirmOnReact">{{ i18n.ts.confirmOnReact }}</MkSwitch>
 			</div>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
@@ -320,6 +321,7 @@ const enableHorizontalSwipe = computed(defaultStore.makeGetterSetter('enableHori
 const useNativeUIForVideoAudioPlayer = computed(defaultStore.makeGetterSetter('useNativeUIForVideoAudioPlayer'));
 const alwaysConfirmFollow = computed(defaultStore.makeGetterSetter('alwaysConfirmFollow'));
 const confirmWhenRevealingSensitiveMedia = computed(defaultStore.makeGetterSetter('confirmWhenRevealingSensitiveMedia'));
+const confirmOnReact = computed(defaultStore.makeGetterSetter('confirmOnReact'));
 const contextMenu = computed(defaultStore.makeGetterSetter('contextMenu'));
 
 watch(lang, () => {

packages/frontend/src/store.ts

@@ -479,6 +479,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	confirmOnReact: {
+		where: 'device',
+		default: false,
+	},
 
 	sound_masterVolume: {
 		where: 'device',

packages/frontend/test/url-preview.test.ts

@@ -24,7 +24,10 @@ describe('MkUrlPreview', () => {
 			};
 		}
 
-		fetchMock.mockOnceIf(/^\/url?/, () => {
+		fetchMock.mockOnceIf((req) => {
+			const url = new URL(req.url);
+			return url.pathname === '/url';
+		}, () => {
 			return {
 				status: 200,
 				body: JSON.stringify(summary),

packages/misskey-bubble-game/package.json

@@ -22,11 +22,11 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"devDependencies": {
-		"@types/matter-js": "0.19.7",
+		"@types/matter-js": "0.19.8",
 		"@types/seedrandom": "3.0.8",
-		"@types/node": "22.10.7",
+		"@types/node": "22.13.4",
-		"@typescript-eslint/eslint-plugin": "8.20.0",
+		"@typescript-eslint/eslint-plugin": "8.24.0",
-		"@typescript-eslint/parser": "8.20.0",
+		"@typescript-eslint/parser": "8.24.0",
 		"nodemon": "3.1.9",
 		"execa": "8.0.1",
 		"typescript": "5.7.3",
@@ -38,7 +38,7 @@
 	],
 	"dependencies": {
 		"eventemitter3": "5.0.1",
-		"matter-js": "0.19.0",
+		"matter-js": "0.20.0",
 		"seedrandom": "3.0.5"
 	}
 }

packages/misskey-reversi/package.json

@@ -22,9 +22,9 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"devDependencies": {
-		"@types/node": "22.10.7",
+		"@types/node": "22.13.4",
-		"@typescript-eslint/eslint-plugin": "8.20.0",
+		"@typescript-eslint/eslint-plugin": "8.24.0",
-		"@typescript-eslint/parser": "8.20.0",
+		"@typescript-eslint/parser": "8.24.0",
 		"execa": "8.0.1",
 		"nodemon": "3.1.9",
 		"typescript": "5.7.3",

packages/sw/package.json

@@ -14,8 +14,8 @@
 		"misskey-js": "workspace:*"
 	},
 	"devDependencies": {
-		"@typescript-eslint/parser": "8.20.0",
+		"@typescript-eslint/parser": "8.24.0",
-		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.67",
+		"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.74",
 		"eslint-plugin-import": "2.31.0",
 		"nodemon": "3.1.9",
 		"typescript": "5.7.3"

renovate.json5

@@ -12,6 +12,10 @@
 	"dependencyDashboardAutoclose": true,
 	"osvVulnerabilityAlerts": true,
 	"dependencyDashboardOSVVulnerabilitySummary": "unresolved",
+	"ignoreDeps": [
+		// https://github.com/misskey-dev/misskey/pull/15489#issuecomment-2660717458
+		"@typescript/lib-webworker"
+	],
 	"packageRules": [
 		{
 			"groupName": "[Backend] Update dependencies",