Merge branch 'develop' into bmjwt

packages/backend/src/core/WebhookTestService.ts

@@ -244,7 +244,6 @@ export class WebhookTestService {
 			case 'reaction':
 				return;
 			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const _exhaustiveAssertion: never = params.type;
 				return;
 			}
@@ -327,7 +326,6 @@ export class WebhookTestService {
 				break;
 			}
 			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const _exhaustiveAssertion: never = params.type;
 				return;
 			}
@@ -412,7 +410,7 @@ export class WebhookTestService {
 			name: user.name,
 			username: user.username,
 			host: user.host,
-			avatarUrl: user.avatarId == null ? null : user.avatarUrl,
+			avatarUrl: (user.avatarId == null ? null : user.avatarUrl) ?? '',
 			avatarBlurhash: user.avatarId == null ? null : user.avatarBlurhash,
 			avatarDecorations: user.avatarDecorations.map(it => ({
 				id: it.id,

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

@@ -471,8 +471,8 @@ export class UserEntityService implements OnModuleInit {
 			(profile.followersVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
 			null;
 
-		const isModerator = isMe && isDetailed ? this.roleService.isModerator(user) : null;
-		const isAdmin = isMe && isDetailed ? this.roleService.isAdministrator(user) : null;
+		const isModerator = isMe && isDetailed ? this.roleService.isModerator(user) : undefined;
+		const isAdmin = isMe && isDetailed ? this.roleService.isAdministrator(user) : undefined;
 		const unreadAnnouncements = isMe && isDetailed ?
 			(await this.announcementService.getUnreadAnnouncements(user)).map((announcement) => ({
 				createdAt: this.idService.parse(announcement.id).date.toISOString(),

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

@@ -465,11 +465,11 @@ export const packedMeDetailedOnlySchema = {
 		},
 		isModerator: {
 			type: 'boolean',
-			nullable: true, optional: false,
+			nullable: false, optional: false,
 		},
 		isAdmin: {
 			type: 'boolean',
-			nullable: true, optional: false,
+			nullable: false, optional: false,
 		},
 		injectFeaturedNote: {
 			type: 'boolean',

packages/frontend/src/components/MkDrive.vue

@@ -152,11 +152,12 @@ import { getDriveFileMenu } from '@/utility/get-drive-file-menu.js';
 import { Paginator } from '@/utility/paginator.js';
 
 const props = withDefaults(defineProps<{
-	initialFolder?: Misskey.entities.DriveFolder['id'] | null;
+	initialFolder?: Misskey.entities.DriveFolder | Misskey.entities.DriveFolder['id'] | null;
 	type?: string;
 	multiple?: boolean;
 	select?: 'file' | 'folder' | null;
 }>(), {
+	initialFolder: null,
 	multiple: false,
 	select: null,
 });

packages/frontend/src/components/MkLaunchPad.vue

@@ -34,9 +34,10 @@ import { deviceKind } from '@/utility/device-kind.js';
 import { prefer } from '@/preferences.js';
 
 const props = withDefaults(defineProps<{
-	anchorElement?: HTMLElement;
+	anchorElement?: HTMLElement | null;
 	anchor?: { x: string; y: string; };
 }>(), {
+	anchorElement: null,
 	anchor: () => ({ x: 'right', y: 'center' }),
 });
 

packages/frontend/src/components/form/suspense.vue

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkLoading/>
 </div>
 <div v-else-if="resolved">
-	<slot :result="result"></slot>
+	<slot :result="result as T"></slot>
 </div>
 <div v-else>
 	<div :class="$style.error">

packages/frontend/src/pages/about.emojis.vue

@@ -48,7 +48,7 @@ import { $i } from '@/i.js';
 
 const customEmojiTags = getCustomEmojiTags();
 const q = ref('');
-const searchEmojis = ref<Misskey.entities.EmojiSimple[]>(null);
+const searchEmojis = ref<Misskey.entities.EmojiSimple[] | null>(null);
 const selectedTags = ref(new Set());
 
 function search() {

packages/frontend/src/pages/channels.vue

@@ -110,6 +110,11 @@ async function search() {
 
 	const type = searchType.value.toString().trim();
 
+	if (type !== 'nameAndDescription' && type !== 'nameOnly') {
+		console.error(`Unrecognized search type: ${type}`);
+		return;
+	}
+
 	channelPaginator.value = markRaw(new Paginator('channels/search', {
 		limit: 10,
 		params: {

packages/frontend/src/pages/explore.users.vue

@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</template>
 	</div>
 	<div v-else>
-		<MkFoldableSection ref="tagsEl" :foldable="true" :expanded="false" class="_margin">
+		<MkFoldableSection :foldable="true" :expanded="false" class="_margin">
 			<template #header><i class="ti ti-hash ti-fw" style="margin-right: 0.5em;"></i>{{ i18n.ts.popularTags }}</template>
 
 			<div>
@@ -39,7 +39,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</MkFoldableSection>
 
-		<MkFoldableSection v-if="tag != null" :key="`${tag}`" class="_margin">
+		<MkFoldableSection v-if="tagUsersPaginator != null" :key="`${tag}`" class="_margin">
 			<template #header><i class="ti ti-hash ti-fw" style="margin-right: 0.5em;"></i>{{ tag }}</template>
 			<MkUserList :paginator="tagUsersPaginator"/>
 		</MkFoldableSection>
@@ -78,22 +78,17 @@ const props = defineProps<{
 }>();
 
 const origin = ref('local');
-const tagsEl = useTemplateRef('tagsEl');
 const tagsLocal = ref<Misskey.entities.Hashtag[]>([]);
 const tagsRemote = ref<Misskey.entities.Hashtag[]>([]);
 
-watch(() => props.tag, () => {
-	if (tagsEl.value) tagsEl.value.toggleContent(props.tag == null);
-});
-
-const tagUsersPaginator = markRaw(new Paginator('hashtags/users', {
+const tagUsersPaginator = props.tag != null ? markRaw(new Paginator('hashtags/users', {
 	limit: 30,
 	params: {
 		tag: props.tag,
 		origin: 'combined',
 		sort: '+follower',
 	},
-}));
+})) : null;
 
 const pinnedUsersPaginator = markRaw(new Paginator('pinned-users', {
 	noPaging: true,

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

@@ -55,11 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkPushNotificationAllowButton ref="allowButton"/>
 				<MkSwitch :disabled="!pushRegistrationInServer" :modelValue="sendReadMessage" @update:modelValue="onChangeSendReadMessage">
 					<template #label>{{ i18n.ts.sendPushNotificationReadMessage }}</template>
-					<template #caption>
-						<I18n :src="i18n.ts.sendPushNotificationReadMessageCaption">
-							<template #emptyPushNotificationMessage>{{ i18n.ts._notification.emptyPushNotificationMessage }}</template>
-						</I18n>
-					</template>
+					<template #caption>{{ i18n.ts.sendPushNotificationReadMessageCaption }}</template>
 				</MkSwitch>
 			</div>
 		</FormSection>

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

@@ -34,7 +34,7 @@ const props = withDefaults(defineProps<{
 	limit: 50,
 });
 
-const chartSrc = ref('per-user-notes');
+const chartSrc = ref<'per-user-notes' | 'per-user-pv'>('per-user-notes');
 
 function showMenu(ev: MouseEvent) {
 	os.popupMenu([{

packages/frontend/src/ui/_common_/navbar-h.vue

@@ -57,6 +57,7 @@ import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
 import { openAccountMenu as openAccountMenu_ } from '@/accounts.js';
 import { $i } from '@/i.js';
+import { getHTMLElementOrNull } from '@/utility/get-dom-node-or-null.js';
 
 const WINDOW_THRESHOLD = 1400;
 
@@ -72,8 +73,11 @@ const otherNavItemIndicated = computed<boolean>(() => {
 });
 
 async function more(ev: MouseEvent) {
+	const target = getHTMLElementOrNull(ev.currentTarget ?? ev.target);
+	if (!target) return;
+
 	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkLaunchPad.vue').then(x => x.default), {
-		anchorElement: ev.currentTarget ?? ev.target,
+		anchorElement: target,
 		anchor: { x: 'center', y: 'bottom' },
 	}, {
 		closed: () => dispose(),