refactor utility/storage.ts

Co-Authored-By: anatawa12 <anatawa12@icloud.com>

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## 2026.2.0
 
 ### Note
-- `users/following` の `birthday` プロパティは非推奨になりました。代わりに `users/get-following-birthday-users` をご利用ください。
+- `users/following` の `birthday` プロパティは非推奨になりました。代わりに `users/get-following-users-by-birthday` をご利用ください。
 
 ### General
 - Enhance: 「もうすぐ誕生日のユーザー」ウィジェットで、誕生日が至近のユーザーも表示できるように  

packages/backend/src/server/api/endpoint-list.ts

@@ -391,7 +391,7 @@ export * as 'users/featured-notes' from './endpoints/users/featured-notes.js';
 export * as 'users/flashs' from './endpoints/users/flashs.js';
 export * as 'users/followers' from './endpoints/users/followers.js';
 export * as 'users/following' from './endpoints/users/following.js';
-export * as 'users/get-following-birthday-users' from './endpoints/users/get-following-birthday-users.js';
+export * as 'users/get-following-users-by-birthday' from './endpoints/users/get-following-users-by-birthday.js';
 export * as 'users/gallery/posts' from './endpoints/users/gallery/posts.js';
 export * as 'users/get-frequently-replied-users' from './endpoints/users/get-frequently-replied-users.js';
 export * as 'users/lists/create' from './endpoints/users/lists/create.js';

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -341,7 +341,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			if (ps.clientOptions !== undefined) {
 				set.clientOptions = {
-					...serverSettings.clientOptions,
+					...this.serverSettings.clientOptions,
 					...ps.clientOptions,
 				};
 			}

packages/backend/src/server/api/endpoints/users/following.ts

@@ -86,7 +86,7 @@ export const paramDef = {
 				sinceDate: { type: 'integer' },
 				untilDate: { type: 'integer' },
 				limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
-				birthday: { ...birthdaySchema, nullable: true, description: '@deprecated use get-following-birthday-users instead.' },
+				birthday: { ...birthdaySchema, nullable: true, description: '@deprecated use get-following-users-by-birthday instead.' },
 			},
 		},
 	],
@@ -146,7 +146,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.andWhere('following.followerId = :userId', { userId: user.id })
 				.innerJoinAndSelect('following.followee', 'followee');
 
-			// @deprecated use get-following-birthday-users instead.
+			// @deprecated use get-following-users-by-birthday instead.
 			if (ps.birthday) {
 				query.innerJoin(this.userProfilesRepository.metadata.targetName, 'followeeProfile', 'followeeProfile.userId = following.followeeId');
 

packages/backend/src/server/api/endpoints/users/get-following-users-by-birthday.ts

@@ -20,7 +20,7 @@ export const meta = {
 	requireCredential: true,
 	kind: 'read:account',
 
-	description: 'Find users who have a birthday on the specified range.',
+	description: 'Retrieve users who have a birthday on the specified range.',
 
 	res: {
 		type: 'array',

packages/backend/src/server/oauth/OAuth2ProviderService.ts

@@ -142,7 +142,9 @@ async function discoverClientInformation(logger: Logger, httpRequestService: Htt
 			redirectUris.push(...httpLinkHeader.parse(linkHeader).get('rel', 'redirect_uri').map(r => r.uri));
 		}
 
-		if (res.headers.get('content-type')?.includes('application/json')) {
+		const contentType = res.headers.get('content-type');
+		const mediaType = contentType ? contentType.split(';')[0].trim() : null;
+		if (mediaType === 'application/json') {
 			// Client discovery via JSON document (11 July 2024 spec)
 			// https://indieauth.spec.indieweb.org/#client-metadata
 			// "Clients SHOULD have a JSON [RFC7159] document at their client_id URL containing

packages/frontend/src/components/MkDraggable.vue

@@ -109,6 +109,7 @@ function onDragstart(ev: DragEvent, item: T) {
 
 	// Chromeのバグで、Dragstartハンドラ内ですぐにDOMを変更する(=リアクティブなプロパティを変更する)とDragが終了してしまう
 	// SEE: https://stackoverflow.com/questions/19639969/html5-dragend-event-firing-immediately
+	// SEE: https://issues.chromium.org/issues/41150279
 	window.setTimeout(() => {
 		dragging.value = true;
 	}, 10);

packages/frontend/src/components/MkForm.vue

@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div v-if="Object.keys(form).filter(item => !form[item].hidden).length > 0" class="_gaps_m">
+<div v-if="Object.values(form).filter(item => typeof item.hidden !== 'boolean' || item.hidden === true).length > 0" class="_gaps_m">
 	<template v-for="v, k in form">
 		<template v-if="typeof v.hidden == 'function' ? v.hidden(values) : v.hidden"></template>
 		<MkInput v-else-if="v.type === 'number'" v-model="values[k]" type="number" :step="v.step || 1" :manualSave="v.manualSave" @savingStateChange="(changed, invalid) => onSavingStateChange(k, changed, invalid)">

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

@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		>
 			<template #default="{ item, dragStart }">
 				<div :class="$style.item">
-					<!-- divが無いとエラーになる https://github.com/SortableJS/vue.draggable.next/issues/189 -->
+					<!-- divが無いとエラーになる -->
 					<RolesEditorFormula
 						:modelValue="item"
 						:dragStartCallback="dragStart"

packages/frontend/src/pages/page-editor/page-editor.blocks.vue

@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 >
 	<template #default="{ item }">
 		<div>
-			<!-- divが無いとエラーになる https://github.com/SortableJS/vue.draggable.next/issues/189 -->
+			<!-- divが無いとエラーになる -->
 			<component :is="getComponent(item.type) as any" :modelValue="item" @update:modelValue="updateItem" @remove="() => removeItem(item)"/>
 		</div>
 	</template>

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

@@ -51,10 +51,12 @@ import { enableAutoBackup, getPreferencesProfileMenu } from '@/preferences/utili
 import { store } from '@/store.js';
 import { signout } from '@/signout.js';
 import { genSearchIndexes } from '@/utility/inapp-search.js';
-import { enableStoragePersistence, storagePersisted, storagePersistenceSupported, skipStoragePersistence } from '@/utility/storage.js';
+import { enableStoragePersistence, getStoragePersistenceStatusRef, storagePersistenceSupported, skipStoragePersistence } from '@/utility/storage.js';
 
 const searchIndex = await import('search-index:settings').then(({ searchIndexes }) => genSearchIndexes(searchIndexes));
 
+const storagePersisted = await getStoragePersistenceStatusRef();
+
 const indexInfo = {
 	title: i18n.ts.settings,
 	icon: 'ti ti-settings',

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

@@ -165,7 +165,7 @@ import MkKeyValue from '@/components/MkKeyValue.vue';
 import MkButton from '@/components/MkButton.vue';
 import FormSlot from '@/components/form/slot.vue';
 import * as os from '@/os.js';
-import { enableStoragePersistence, storagePersisted, storagePersistenceSupported } from '@/utility/storage.js';
+import { enableStoragePersistence, getStoragePersistenceStatusRef, storagePersistenceSupported } from '@/utility/storage.js';
 import { ensureSignin } from '@/i.js';
 import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
@@ -180,6 +180,8 @@ import { cloudBackup } from '@/preferences/utility.js';
 
 const $i = ensureSignin();
 
+const storagePersisted = await getStoragePersistenceStatusRef();
+
 const reportError = prefer.model('reportError');
 const enableCondensedLine = prefer.model('enableCondensedLine');
 const skipNoteRender = prefer.model('skipNoteRender');

packages/frontend/src/utility/storage.ts

@@ -3,13 +3,21 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { ref } from 'vue';
+import { readonly, ref } from 'vue';
 import * as os from '@/os.js';
 import { store } from '@/store.js';
 import { i18n } from '@/i18n.js';
 
 export const storagePersistenceSupported = window.isSecureContext && 'storage' in navigator;
-export const storagePersisted = ref(storagePersistenceSupported ? await navigator.storage.persisted() : false);
+const storagePersisted = ref(false);
+
+export async function getStoragePersistenceStatusRef() {
+	if (storagePersistenceSupported) {
+		storagePersisted.value = await navigator.storage.persisted().catch(() => false);
+	}
+
+	return readonly(storagePersisted);
+}
 
 export async function enableStoragePersistence() {
 	if (!storagePersistenceSupported) return;

packages/frontend/src/widgets/WidgetBirthdayFollowings.user.vue

@@ -30,7 +30,7 @@ import { useLowresTime } from '@/composables/use-lowres-time.js';
 import { userPage, acct } from '@/filters/user.js';
 
 const props = defineProps<{
-	item: Misskey.entities.UsersGetFollowingBirthdayUsersResponse[number];
+	item: Misskey.entities.UsersGetFollowingUsersByBirthdayResponse[number];
 }>();
 
 const now = useLowresTime();

packages/frontend/src/widgets/WidgetBirthdayFollowings.vue

@@ -106,7 +106,7 @@ const end = computed(() => {
 	}
 });
 
-const birthdayUsersPaginator = markRaw(new Paginator('users/get-following-birthday-users', {
+const birthdayUsersPaginator = markRaw(new Paginator('users/get-following-users-by-birthday', {
 	limit: 18,
 	offsetMode: true,
 	computedParams: computed(() => {

packages/misskey-js/etc/misskey-js.api.md

@@ -2128,8 +2128,8 @@ declare namespace entities {
         UsersFollowingResponse,
         UsersGalleryPostsRequest,
         UsersGalleryPostsResponse,
-        UsersGetFollowingBirthdayUsersRequest,
+        UsersGetFollowingUsersByBirthdayRequest,
-        UsersGetFollowingBirthdayUsersResponse,
+        UsersGetFollowingUsersByBirthdayResponse,
         UsersGetFrequentlyRepliedUsersRequest,
         UsersGetFrequentlyRepliedUsersResponse,
         UsersListsCreateRequest,
@@ -3741,10 +3741,10 @@ type UsersGalleryPostsRequest = operations['users___gallery___posts']['requestBo
 type UsersGalleryPostsResponse = operations['users___gallery___posts']['responses']['200']['content']['application/json'];
 
 // @public (undocumented)
-type UsersGetFollowingBirthdayUsersRequest = operations['users___get-following-birthday-users']['requestBody']['content']['application/json'];
+type UsersGetFollowingUsersByBirthdayRequest = operations['users___get-following-users-by-birthday']['requestBody']['content']['application/json'];
 
 // @public (undocumented)
-type UsersGetFollowingBirthdayUsersResponse = operations['users___get-following-birthday-users']['responses']['200']['content']['application/json'];
+type UsersGetFollowingUsersByBirthdayResponse = operations['users___get-following-users-by-birthday']['responses']['200']['content']['application/json'];
 
 // @public (undocumented)
 type UsersGetFrequentlyRepliedUsersRequest = operations['users___get-frequently-replied-users']['requestBody']['content']['application/json'];

packages/misskey-js/src/autogen/apiClientJSDoc.ts

@@ -4533,11 +4533,11 @@ declare module '../api.js' {
     ): Promise<SwitchCaseResponseType<E, P>>;
 
     /**
-     * Find users who have a birthday on the specified range.
+     * Retrieve users who have a birthday on the specified range.
      * 
      * **Credential required**: *Yes* / **Permission**: *read:account*
      */
-    request<E extends 'users/get-following-birthday-users', P extends Endpoints[E]['req']>(
+    request<E extends 'users/get-following-users-by-birthday', P extends Endpoints[E]['req']>(
       endpoint: E,
       params: P,
       credential?: string | null,

packages/misskey-js/src/autogen/endpoint.ts

@@ -616,8 +616,8 @@ import type {
 	UsersFollowingResponse,
 	UsersGalleryPostsRequest,
 	UsersGalleryPostsResponse,
-	UsersGetFollowingBirthdayUsersRequest,
+	UsersGetFollowingUsersByBirthdayRequest,
-	UsersGetFollowingBirthdayUsersResponse,
+	UsersGetFollowingUsersByBirthdayResponse,
 	UsersGetFrequentlyRepliedUsersRequest,
 	UsersGetFrequentlyRepliedUsersResponse,
 	UsersListsCreateRequest,
@@ -1069,7 +1069,7 @@ export type Endpoints = {
 	'users/followers': { req: UsersFollowersRequest; res: UsersFollowersResponse };
 	'users/following': { req: UsersFollowingRequest; res: UsersFollowingResponse };
 	'users/gallery/posts': { req: UsersGalleryPostsRequest; res: UsersGalleryPostsResponse };
-	'users/get-following-birthday-users': { req: UsersGetFollowingBirthdayUsersRequest; res: UsersGetFollowingBirthdayUsersResponse };
+	'users/get-following-users-by-birthday': { req: UsersGetFollowingUsersByBirthdayRequest; res: UsersGetFollowingUsersByBirthdayResponse };
 	'users/get-frequently-replied-users': { req: UsersGetFrequentlyRepliedUsersRequest; res: UsersGetFrequentlyRepliedUsersResponse };
 	'users/lists/create': { req: UsersListsCreateRequest; res: UsersListsCreateResponse };
 	'users/lists/create-from-public': { req: UsersListsCreateFromPublicRequest; res: UsersListsCreateFromPublicResponse };

packages/misskey-js/src/autogen/entities.ts

@@ -619,8 +619,8 @@ export type UsersFollowingRequest = operations['users___following']['requestBody
 export type UsersFollowingResponse = operations['users___following']['responses']['200']['content']['application/json'];
 export type UsersGalleryPostsRequest = operations['users___gallery___posts']['requestBody']['content']['application/json'];
 export type UsersGalleryPostsResponse = operations['users___gallery___posts']['responses']['200']['content']['application/json'];
-export type UsersGetFollowingBirthdayUsersRequest = operations['users___get-following-birthday-users']['requestBody']['content']['application/json'];
+export type UsersGetFollowingUsersByBirthdayRequest = operations['users___get-following-users-by-birthday']['requestBody']['content']['application/json'];
-export type UsersGetFollowingBirthdayUsersResponse = operations['users___get-following-birthday-users']['responses']['200']['content']['application/json'];
+export type UsersGetFollowingUsersByBirthdayResponse = operations['users___get-following-users-by-birthday']['responses']['200']['content']['application/json'];
 export type UsersGetFrequentlyRepliedUsersRequest = operations['users___get-frequently-replied-users']['requestBody']['content']['application/json'];
 export type UsersGetFrequentlyRepliedUsersResponse = operations['users___get-frequently-replied-users']['responses']['200']['content']['application/json'];
 export type UsersListsCreateRequest = operations['users___lists___create']['requestBody']['content']['application/json'];

packages/misskey-js/src/autogen/types.ts

@@ -3717,14 +3717,14 @@ export type paths = {
          */
         post: operations['users___gallery___posts'];
     };
-    '/users/get-following-birthday-users': {
+    '/users/get-following-users-by-birthday': {
         /**
-         * users/get-following-birthday-users
+         * users/get-following-users-by-birthday
-         * @description Find users who have a birthday on the specified range.
+         * @description Retrieve users who have a birthday on the specified range.
          *
          *     **Credential required**: *Yes* / **Permission**: *read:account*
          */
-        post: operations['users___get-following-birthday-users'];
+        post: operations['users___get-following-users-by-birthday'];
     };
     '/users/get-frequently-replied-users': {
         /**
@@ -34882,7 +34882,7 @@ export interface operations {
                     untilDate?: number;
                     /** @default 10 */
                     limit?: number;
-                    /** @description @deprecated use get-following-birthday-users instead. */
+                    /** @description @deprecated use get-following-users-by-birthday instead. */
                     birthday?: string | null;
                 };
             };
@@ -35018,7 +35018,7 @@ export interface operations {
             };
         };
     };
-    'users___get-following-birthday-users': {
+    'users___get-following-users-by-birthday': {
         requestBody: {
             content: {
                 'application/json': {