Merge branch 'develop' into refactor-mkselect

packages/frontend/.storybook/fakes.ts

@@ -207,6 +207,7 @@ export function federationInstance(): entities.FederationInstance {
 		isSuspended: false,
 		suspensionState: 'none',
 		isBlocked: false,
+		isMediaSilenced: false,
 		softwareName: 'misskey',
 		softwareVersion: '2024.5.0',
 		openRegistrations: false,
@@ -311,6 +312,8 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host: enti
 		alsoKnownAs: null,
 		notify: 'none',
 		memo: null,
+		canChat: true,
+		chatScope: 'everyone',
 	};
 }
 
@@ -378,6 +381,7 @@ export function role(params: {
 		asBadge: params.asBadge ?? true,
 		canEditMembersByModerator: params.canEditMembersByModerator ?? false,
 		usersCount: params.usersCount ?? 10,
+		preserveAssignmentOnMoveAccount: false,
 		condFormula: {
 			id: '',
 			type: 'or',

packages/frontend/src/components/MkImageEffectorFxForm.vue

@@ -8,7 +8,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div v-for="v, k in paramDefs" :key="k">
 		<MkSwitch
 			v-if="v.type === 'boolean'"
-			v-model="params[k]">
+			v-model="params[k]"
+		>
 			<template #label>{{ v.label ?? k }}</template>
 			<template v-if="v.caption != null" #caption>{{ v.caption }}</template>
 		</MkSwitch>
@@ -53,12 +54,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script setup lang="ts">
+import type { ImageEffectorRGB, ImageEffectorFxParamDefs } from '@/utility/image-effector/ImageEffector.js';
 import MkInput from '@/components/MkInput.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
 import MkRange from '@/components/MkRange.vue';
 import { i18n } from '@/i18n.js';
-import type { ImageEffectorRGB, ImageEffectorFxParamDefs } from '@/utility/image-effector/ImageEffector.js';
 
 defineProps<{
 	paramDefs: ImageEffectorFxParamDefs;

packages/frontend/src/components/MkInput.vue

@@ -44,10 +44,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts">
-type SupportedTypes = 'text' | 'password' | 'email' | 'url' | 'tel' | 'number' | 'search';
+type SupportedTypes = 'text' | 'password' | 'email' | 'url' | 'tel' | 'number' | 'search' | 'color';
 type ModelValueType<T extends SupportedTypes> =
 	T extends 'number' ? number :
-	T extends 'text' | 'password' | 'email' | 'url' | 'tel' | 'search' ? string :
+	T extends 'text' | 'password' | 'email' | 'url' | 'tel' | 'search' | 'color' ? string :
 	never;
 </script>
 

packages/frontend/src/components/grid/MkDataCell.vue

@@ -48,6 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 				<div v-else-if="cellType === 'image'">
 					<img
+						v-if="cell.value && typeof cell.value === 'string'"
 						:src="cell.value"
 						:alt="cell.value"
 						:class="$style.viewImage"

packages/frontend/src/pages/admin/security.vue

@@ -194,7 +194,7 @@ const sensitiveMediaDetectionForm = useForm({
 			state.sensitiveMediaDetectionSensitivity === 2 ? 'medium' :
 			state.sensitiveMediaDetectionSensitivity === 3 ? 'high' :
 			state.sensitiveMediaDetectionSensitivity === 4 ? 'veryHigh' :
-			0,
+			null as never,
 		setSensitiveFlagAutomatically: state.setSensitiveFlagAutomatically,
 		enableSensitiveMediaDetectionForVideos: state.enableSensitiveMediaDetectionForVideos,
 	});

packages/frontend/src/pages/channel-editor.vue

@@ -138,9 +138,10 @@ async function addPinnedNote() {
 	const { canceled, result: value } = await os.inputText({
 		title: i18n.ts.noteIdOrUrl,
 	});
-	if (canceled) return;
+	if (canceled || value == null) return;
+	const fromUrl = value.includes('/') ? value.split('/').pop() : null;
 	const note = await os.apiWithDialog('notes/show', {
-		noteId: value.includes('/') ? value.split('/').pop() : value,
+		noteId: fromUrl ?? value,
 	});
 	pinnedNotes.value = [{
 		id: note.id,

packages/frontend/src/pages/drop-and-fusion.vue

@@ -43,8 +43,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<div><b>{{ i18n.tsx.lastNDays({ n: 7 }) }} {{ i18n.ts.ranking }}</b> ({{ gameMode.toUpperCase() }})</div>
 							<div v-if="ranking" class="_gaps_s">
 								<div v-for="r in ranking" :key="r.id" :class="$style.rankingRecord">
-									<MkAvatar :link="true" style="width: 24px; height: 24px; margin-right: 4px;" :user="r.user"/>
+									<MkAvatar v-if="r.user" :link="true" style="width: 24px; height: 24px; margin-right: 4px;" :user="r.user"/>
-									<MkUserName :user="r.user" :nowrap="true"/>
+									<MkUserName v-if="r.user" :user="r.user" :nowrap="true"/>
 									<b style="margin-left: auto;">{{ r.score.toLocaleString() }} {{ getScoreUnit(gameMode) }}</b>
 								</div>
 							</div>
@@ -82,6 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
+import * as Misskey from 'misskey-js';
 import XGame from './drop-and-fusion.game.vue';
 import { definePage } from '@/page.js';
 import MkButton from '@/components/MkButton.vue';
@@ -106,7 +107,7 @@ const {
 });
 const gameStarted = ref(false);
 const mute = ref(false);
-const ranking = ref(null);
+const ranking = ref<Misskey.entities.BubbleGameRankingResponse | null>(null);
 
 watch(gameMode, async () => {
 	ranking.value = await misskeyApiGet('bubble-game/ranking', { gameMode: gameMode.value });

packages/frontend/src/pages/user/activity.following.vue

@@ -117,7 +117,6 @@ async function renderChart() {
 					offset: true,
 					stacked: true,
 					time: {
-						stepSize: 1,
 						unit: 'day',
 						displayFormats: {
 							day: 'M/d',

packages/frontend/src/pages/user/activity.notes.vue

@@ -116,7 +116,6 @@ async function renderChart() {
 					offset: true,
 					stacked: true,
 					time: {
-						stepSize: 1,
 						unit: 'day',
 						displayFormats: {
 							day: 'M/d',

packages/frontend/src/pages/user/activity.pv.vue

@@ -117,7 +117,6 @@ async function renderChart() {
 					offset: true,
 					stacked: true,
 					time: {
-						stepSize: 1,
 						unit: 'day',
 						displayFormats: {
 							day: 'M/d',

packages/frontend/src/pages/user/home.vue

@@ -209,7 +209,7 @@ const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue'));
 const props = withDefaults(defineProps<{
 	user: Misskey.entities.UserDetailed;
 	/** Test only; MkNotesTimeline currently causes problems in vitest */
-	disableNotes: boolean;
+	disableNotes?: boolean;
 }>(), {
 	disableNotes: false,
 });

packages/frontend/src/plugin.ts

@@ -205,13 +205,13 @@ type HandlerDef = {
 		handler: (note: Misskey.entities.Note) => void;
 	};
 	note_view_interruptor: {
-		handler: (note: Misskey.entities.Note) => unknown;
+		handler: (note: Misskey.entities.Note) => Misskey.entities.Note;
 	};
 	note_post_interruptor: {
 		handler: (note: FIXME) => unknown;
 	};
 	page_view_interruptor: {
-		handler: (page: Misskey.entities.Page) => unknown;
+		handler: (page: Misskey.entities.Page) => Misskey.entities.Page;
 	};
 };