From d0cf1cc15f998603c95ffca21c0d3feadc240a9d Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 6 Jun 2025 23:35:25 -0400 Subject: [PATCH 01/12] remove IDX_instance_host_filters as it slowed down queries more than it helped --- ...67016885-remove-IDX_instance_host_filters.js | 17 +++++++++++++++++ packages/backend/src/models/Instance.ts | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js diff --git a/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js b/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js new file mode 100644 index 0000000000..d0a4e4f91e --- /dev/null +++ b/packages/backend/migration/1749267016885-remove-IDX_instance_host_filters.js @@ -0,0 +1,17 @@ +/* + * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +export class RemoveIDXInstanceHostFilters1749267016885 { + async up(queryRunner) { + await queryRunner.query(`DROP INDEX IF EXISTS "IDX_instance_host_filters"`); + } + + async down(queryRunner) { + await queryRunner.query(` + create index "IDX_instance_host_filters" + on "instance" ("host", "isBlocked", "isSilenced", "isMediaSilenced", "isAllowListed", "isBubbled", "suspensionState")`); + await queryRunner.query(`comment on index "IDX_instance_host_filters" is 'Covering index for host filter queries'`); + } +} diff --git a/packages/backend/src/models/Instance.ts b/packages/backend/src/models/Instance.ts index c9200e1e35..0cde4b75fc 100644 --- a/packages/backend/src/models/Instance.ts +++ b/packages/backend/src/models/Instance.ts @@ -7,7 +7,6 @@ import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; import { id } from './util/id.js'; @Index('IDX_instance_host_key', { synchronize: false }) // ((lower(reverse("host"::text)) || '.'::text) -@Index('IDX_instance_host_filters', { synchronize: false }) // ("host", "isBlocked", "isSilenced", "isMediaSilenced", "isAllowListed", "isBubbled", "suspensionState") @Entity('instance') export class MiInstance { @PrimaryColumn(id()) From 4b751bf28a9db721d75227a420580ab95e85dcbb Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 6 Jun 2025 23:35:48 -0400 Subject: [PATCH 02/12] fix admin-user AP fetch --- packages/frontend/src/pages/admin-user.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index 3d17aca7d9..e2a486806a 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -423,15 +423,11 @@ function createFetcher(withHint = true) { ? (withHint && props.ipsHint) ? props.ipsHint : misskeyApi('admin/get-user-ips', { userId: props.userId, }) - : null, - iAmAdmin ? misskeyApi('ap/get', { - uri: `${url}/users/${props.userId}`, - }).catch(() => null) : null], - ).then(([_user, _info, _ips, _ap]) => { + : null], + ).then(async ([_user, _info, _ips]) => { user.value = _user; info.value = _info; ips.value = _ips; - ap.value = _ap; moderator.value = info.value.isModerator; silenced.value = info.value.isSilenced; approved.value = info.value.approved; @@ -440,6 +436,12 @@ function createFetcher(withHint = true) { rejectQuotes.value = user.value.rejectQuotes ?? false; moderationNote.value = info.value.moderationNote; mandatoryCW.value = user.value.mandatoryCW; + + if (iAmAdmin) { + ap.value = await misskeyApi('ap/get', { + uri: _user.uri ?? `${url}/users/${props.userId}`, + }).catch(() => null); + } }); } From f3b36099508b0a53792a53a101cb07661d28832f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 6 Jun 2025 23:36:16 -0400 Subject: [PATCH 03/12] harden Resolver.parseLocal against local URls to remote content --- .../src/core/activitypub/ApResolverService.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts index 7997eccced..b4e7d6a7d7 100644 --- a/packages/backend/src/core/activitypub/ApResolverService.ts +++ b/packages/backend/src/core/activitypub/ApResolverService.ts @@ -354,7 +354,7 @@ export class Resolver { switch (parsed.type) { case 'notes': - return this.notesRepository.findOneByOrFail({ id: parsed.id }) + return this.notesRepository.findOneByOrFail({ id: parsed.id, userHost: IsNull() }) .then(async note => { const author = await this.usersRepository.findOneByOrFail({ id: note.userId }); if (parsed.rest === 'activity') { @@ -365,18 +365,22 @@ export class Resolver { } }) as Promise; case 'users': - return this.usersRepository.findOneByOrFail({ id: parsed.id }) + return this.usersRepository.findOneByOrFail({ id: parsed.id, host: IsNull() }) .then(user => this.apRendererService.renderPerson(user as MiLocalUser)); case 'questions': // Polls are indexed by the note they are attached to. return Promise.all([ - this.notesRepository.findOneByOrFail({ id: parsed.id }), - this.pollsRepository.findOneByOrFail({ noteId: parsed.id }), + this.notesRepository.findOneByOrFail({ id: parsed.id, userHost: IsNull() }), + this.pollsRepository.findOneByOrFail({ noteId: parsed.id, userHost: IsNull() }), ]) .then(([note, poll]) => this.apRendererService.renderQuestion({ id: note.userId }, note, poll)) as Promise; case 'likes': - return this.noteReactionsRepository.findOneByOrFail({ id: parsed.id }).then(async reaction => - this.apRendererService.addContext(await this.apRendererService.renderLike(reaction, { uri: null }))); + return this.noteReactionsRepository.findOneOrFail({ where: { id: parsed.id }, relations: { user: true } }).then(async reaction => { + if (reaction.user?.host == null) { + throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', `failed to resolve local ${url}: not a local reaction`); + } + return this.apRendererService.addContext(await this.apRendererService.renderLike(reaction, { uri: null })); + }); case 'follows': return this.followRequestsRepository.findOneBy({ id: parsed.id }) .then(async followRequest => { From c21209152c27f69dfad19b6d03fb9cba1139ab63 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 00:31:13 -0400 Subject: [PATCH 04/12] add missing awaits in admin-user.vue --- packages/frontend/src/pages/admin-user.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index e2a486806a..9c52f653bd 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -460,14 +460,14 @@ async function onMandatoryCWChanged(value: string) { async function onModerationNoteChanged(value: string) { await os.promiseDialog(async () => { await misskeyApi('admin/update-user-note', { userId: props.userId, text: value }); - refreshUser(); + await refreshUser(); }); } async function updateRemoteUser() { await os.promiseDialog(async () => { await misskeyApi('federation/update-remote-user', { userId: props.userId }); - refreshUser(); + await refreshUser(); }); } From c71f816be2daf5e3a444d7b8a02592ec47833f78 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 00:31:57 -0400 Subject: [PATCH 05/12] fix TS errors about user, info, and init --- packages/frontend/src/pages/admin-user.vue | 93 +++++++++++++--------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index 9c52f653bd..eaf3620f6f 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -5,10 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -244,6 +259,7 @@ import { computed, defineAsyncComponent, watch, ref } from 'vue'; import * as Misskey from 'misskey-js'; import { url } from '@@/js/config.js'; import type { Badge } from '@/components/SkBadgeStrip.vue'; +import type { ChartSrc } from '@/components/MkChart.vue'; import MkChart from '@/components/MkChart.vue'; import MkObjectView from '@/components/MkObjectView.vue'; import MkTextarea from '@/components/MkTextarea.vue'; @@ -276,15 +292,17 @@ const props = withDefaults(defineProps<{ userHint?: Misskey.entities.UserDetailed; infoHint?: Misskey.entities.AdminShowUserResponse; ipsHint?: Misskey.entities.AdminGetUserIpsResponse; + apHint?: Misskey.entities.ApGetResponse; }>(), { initialTab: 'overview', userHint: undefined, infoHint: undefined, ipsHint: undefined, + apHint: undefined, }); const tab = ref(props.initialTab); -const chartSrc = ref('per-user-notes'); +const chartSrc = ref('per-user-notes'); const user = ref(); const init = ref>(); const info = ref(null); @@ -409,7 +427,7 @@ const announcementsPagination = { status: announcementsStatus.value, })), }; -const expandedRoles = ref([]); +const expandedRoles = ref([]); function createFetcher(withHint = true) { return () => Promise.all([ @@ -419,29 +437,25 @@ function createFetcher(withHint = true) { (withHint && props.infoHint) ? props.infoHint : misskeyApi('admin/show-user', { userId: props.userId, }), - iAmAdmin - ? (withHint && props.ipsHint) ? props.ipsHint : misskeyApi('admin/get-user-ips', { - userId: props.userId, - }) - : null], - ).then(async ([_user, _info, _ips]) => { + (withHint && props.ipsHint) ? props.ipsHint : misskeyApi('admin/get-user-ips', { + userId: props.userId, + }), + (withHint && props.apHint) ? props.apHint : misskeyApi('ap/get', { + userId: props.userId, + }).catch(() => null)], + ).then(async ([_user, _info, _ips, _ap]) => { user.value = _user; info.value = _info; ips.value = _ips; - moderator.value = info.value.isModerator; - silenced.value = info.value.isSilenced; - approved.value = info.value.approved; - markedAsNSFW.value = info.value.alwaysMarkNsfw; - suspended.value = info.value.isSuspended; - rejectQuotes.value = user.value.rejectQuotes ?? false; - moderationNote.value = info.value.moderationNote; - mandatoryCW.value = user.value.mandatoryCW; - - if (iAmAdmin) { - ap.value = await misskeyApi('ap/get', { - uri: _user.uri ?? `${url}/users/${props.userId}`, - }).catch(() => null); - } + ap.value = _ap; + moderator.value = _info.isModerator; + silenced.value = _info.isSilenced; + approved.value = _info.approved; + markedAsNSFW.value = _info.alwaysMarkNsfw; + suspended.value = _info.isSuspended; + rejectQuotes.value = _user.rejectQuotes ?? false; + moderationNote.value = _info.moderationNote; + mandatoryCW.value = _user.mandatoryCW; }); } @@ -450,9 +464,9 @@ async function refreshUser() { await createFetcher(false)(); } -async function onMandatoryCWChanged(value: string) { +async function onMandatoryCWChanged(value: string | number) { await os.promiseDialog(async () => { - await misskeyApi('admin/cw-user', { userId: props.userId, cw: value }); + await misskeyApi('admin/cw-user', { userId: props.userId, cw: String(value) }); await refreshUser(); }); } @@ -480,7 +494,7 @@ async function resetPassword() { return; } else { const { password } = await misskeyApi('admin/reset-password', { - userId: user.value.id, + userId: props.userId, }); await os.alert({ type: 'success', @@ -592,15 +606,16 @@ async function deleteAccount() { text: i18n.ts.deleteThisAccountConfirm, }); if (confirm.canceled) return; + if (!user.value) return; const typed = await os.inputText({ - text: i18n.tsx.typeToConfirm({ x: user.value?.username }), + text: i18n.tsx.typeToConfirm({ x: user.value.username }), }); if (typed.canceled) return; - if (typed.result === user.value?.username) { + if (typed.result === user.value.username) { await os.apiWithDialog('admin/delete-account', { - userId: user.value.id, + userId: props.userId, }); } else { await os.alert({ @@ -663,7 +678,7 @@ async function unassignRole(role, ev) { }], ev.currentTarget ?? ev.target); } -function toggleRoleItem(role) { +function toggleRoleItem(role: Misskey.entities.Role) { if (expandedRoles.value.includes(role.id)) { expandedRoles.value = expandedRoles.value.filter(x => x !== role.id); } else { @@ -672,6 +687,7 @@ function toggleRoleItem(role) { } function createAnnouncement() { + if (!user.value) return; const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), { user: user.value, }, { @@ -680,6 +696,7 @@ function createAnnouncement() { } function editAnnouncement(announcement) { + if (!user.value) return; const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), { user: user.value, announcement, From 73eeabc118d455a385ecc53e2801fe6df294e18a Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 18:49:37 -0400 Subject: [PATCH 06/12] add ActivityPub representation to admin-user.vue --- locales/index.d.ts | 12 +++++ .../src/core/entities/NoteEntityService.ts | 9 ++++ .../src/server/api/endpoints/ap/get.ts | 50 +++++++++++++++++-- packages/frontend/src/pages/admin-user.vue | 43 +++++++++++++--- packages/misskey-js/src/autogen/types.ts | 6 ++- sharkey-locales/en-US.yml | 4 ++ 6 files changed, 111 insertions(+), 13 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 33b63e44c5..f9fcbdb238 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -13245,6 +13245,18 @@ export interface Locale extends ILocale { * Note controls */ "noteFooterLabel": string; + /** + * Packed user data in its raw form. Most of these fields are public and visible to all users. + */ + "rawUserDescription": string; + /** + * Extended user data in its raw form. These fields are private and can only be accessed by moderators. + */ + "rawInfoDescription": string; + /** + * ActivityPub user data in its raw form. These fields are public and accessible to other instances. + */ + "rawApDescription": string; } declare const locales: { [lang: string]: Locale; diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts index 6ada5463a3..2a93b678dc 100644 --- a/packages/backend/src/core/entities/NoteEntityService.ts +++ b/packages/backend/src/core/entities/NoteEntityService.ts @@ -17,6 +17,7 @@ import { DebounceLoader } from '@/misc/loader.js'; import { IdService } from '@/core/IdService.js'; import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js'; import { isPackedPureRenote } from '@/misc/is-renote.js'; +import type { Config } from '@/config.js'; import type { OnModuleInit } from '@nestjs/common'; import type { CacheService } from '../CacheService.js'; import type { CustomEmojiService } from '../CustomEmojiService.js'; @@ -92,6 +93,9 @@ export class NoteEntityService implements OnModuleInit { @Inject(DI.channelsRepository) private channelsRepository: ChannelsRepository, + @Inject(DI.config) + private readonly config: Config + //private userEntityService: UserEntityService, //private driveFileEntityService: DriveFileEntityService, //private customEmojiService: CustomEmojiService, @@ -680,4 +684,9 @@ export class NoteEntityService implements OnModuleInit { return map; }, {} as Record); } + + @bindThis + public genLocalNoteUri(noteId: string): string { + return `${this.config.url}/notes/${noteId}`; + } } diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts index 06dd37a140..e3e68b50af 100644 --- a/packages/backend/src/server/api/endpoints/ap/get.ts +++ b/packages/backend/src/server/api/endpoints/ap/get.ts @@ -3,11 +3,17 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { Injectable } from '@nestjs/common'; +import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { Endpoint } from '@/server/api/endpoint-base.js'; import { ApResolverService } from '@/core/activitypub/ApResolverService.js'; import { isCollectionOrOrderedCollection, isOrderedCollection, isOrderedCollectionPage } from '@/core/activitypub/type.js'; +import { ApiError } from '@/server/api/error.js'; +import { CacheService } from '@/core/CacheService.js'; +import { UserEntityService } from '@/core/entities/UserEntityService.js'; +import { DI } from '@/di-symbols.js'; +import type { NotesRepository } from '@/models/_.js'; +import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; export const meta = { tags: ['federation'], @@ -22,6 +28,16 @@ export const meta = { }, errors: { + noInputSpecified: { + message: 'uri, userId, or noteId must be specified.', + code: 'NO_INPUT_SPECIFIED', + id: 'b43ff2a7-e7a2-4237-ad7f-7b079563c09e', + }, + multipleInputsSpecified: { + message: 'Only one of uri, userId, or noteId can be specified', + code: 'MULTIPLE_INPUTS_SPECIFIED', + id: 'f1aa27ed-8f20-44f3-a92a-fe073c8ca52b', + }, }, res: { @@ -33,22 +49,46 @@ export const meta = { export const paramDef = { type: 'object', properties: { - uri: { type: 'string' }, + uri: { type: 'string', nullable: true }, + userId: { type: 'string', format: 'misskey:id', nullable: true }, + noteId: { type: 'string', format: 'misskey:id', nullable: true }, expandCollectionItems: { type: 'boolean' }, expandCollectionLimit: { type: 'integer', nullable: true }, allowAnonymous: { type: 'boolean' }, }, - required: ['uri'], } as const; @Injectable() export default class extends Endpoint { // eslint-disable-line import/no-default-export constructor( + @Inject(DI.notesRepository) + private readonly notesRepository: NotesRepository, + + private readonly cacheService: CacheService, + private readonly userEntityService: UserEntityService, + private readonly noteEntityService: NoteEntityService, private apResolverService: ApResolverService, ) { - super(meta, paramDef, async (ps, me) => { + super(meta, paramDef, async (ps) => { + if (ps.uri && ps.userId && ps.noteId) { + throw new ApiError(meta.errors.multipleInputsSpecified); + } + + let uri: string; + if (ps.uri) { + uri = ps.uri; + } else if (ps.userId) { + const user = await this.cacheService.findUserById(ps.userId); + uri = user.uri ?? this.userEntityService.genLocalUserUri(ps.userId); + } else if (ps.noteId) { + const note = await this.notesRepository.findOneByOrFail({ id: ps.noteId }); + uri = note.uri ?? this.noteEntityService.genLocalNoteUri(ps.noteId); + } else { + throw new ApiError(meta.errors.noInputSpecified); + } + const resolver = this.apResolverService.createResolver(); - const object = await resolver.resolve(ps.uri, ps.allowAnonymous ?? false); + const object = await resolver.resolve(uri, ps.allowAnonymous ?? false); if (ps.expandCollectionItems && isCollectionOrOrderedCollection(object)) { const items = await resolver.resolveCollectionItems(object, ps.expandCollectionLimit, ps.allowAnonymous ?? false); diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index eaf3620f6f..5196cd4ebe 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -231,6 +231,12 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -238,6 +244,12 @@ SPDX-License-Identifier: AGPL-3.0-only + @@ -245,7 +257,12 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -437,12 +454,15 @@ function createFetcher(withHint = true) { (withHint && props.infoHint) ? props.infoHint : misskeyApi('admin/show-user', { userId: props.userId, }), - (withHint && props.ipsHint) ? props.ipsHint : misskeyApi('admin/get-user-ips', { - userId: props.userId, - }), - (withHint && props.apHint) ? props.apHint : misskeyApi('ap/get', { - userId: props.userId, - }).catch(() => null)], + iAmAdmin + ? (withHint && props.ipsHint) ? props.ipsHint : misskeyApi('admin/get-user-ips', { + userId: props.userId, + }) + : null, + iAmAdmin + ? (withHint && props.apHint) ? props.apHint : misskeyApi('ap/get', { + userId: props.userId, + }).catch(() => null) : null], ).then(async ([_user, _info, _ips, _ap]) => { user.value = _user; info.value = _info; @@ -902,4 +922,13 @@ definePage(() => ({ margin: calc(var(--MI-margin) / 2); } } + +.rawFolderHeader { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; + padding: var(--MI-marginHalf); + gap: var(--MI-marginHalf); +} diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index b1d5f63a8b..82d18e2404 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -12922,7 +12922,11 @@ export type operations = { requestBody: { content: { 'application/json': { - uri: string; + uri?: string | null; + /** Format: misskey:id */ + userId?: string | null; + /** Format: misskey:id */ + noteId?: string | null; expandCollectionItems?: boolean; expandCollectionLimit?: number | null; allowAnonymous?: boolean; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 8ce2b8f01c..5ea562d262 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -624,3 +624,7 @@ keepCwEnabled: "Enabled (copy CWs verbatim)" keepCwPrependRe: "Enabled (copy CW and prepend \"RE:\")" noteFooterLabel: "Note controls" + +rawUserDescription: "Packed user data in its raw form. Most of these fields are public and visible to all users." +rawInfoDescription: "Extended user data in its raw form. These fields are private and can only be accessed by moderators." +rawApDescription: "ActivityPub user data in its raw form. These fields are public and accessible to other instances." From 36b85d62c2086ce0a64874fc7e4af06a423305b5 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 18:50:28 -0400 Subject: [PATCH 07/12] check that detected AP object is actually a note before recording it in UrlPreviewService --- packages/backend/src/server/web/UrlPreviewService.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts index 78b2204fbb..ed5d87d15d 100644 --- a/packages/backend/src/server/web/UrlPreviewService.ts +++ b/packages/backend/src/server/web/UrlPreviewService.ts @@ -32,6 +32,7 @@ import type { MiLocalUser } from '@/models/User.js'; import { getIpHash } from '@/misc/get-ip-hash.js'; import { isRetryableError } from '@/misc/is-retryable-error.js'; import * as Acct from '@/misc/acct.js'; +import { isNote } from '@/core/activitypub/type.js'; import type { FastifyRequest, FastifyReply } from 'fastify'; export type LocalSummalyResult = SummalyResult & { @@ -42,7 +43,7 @@ export type LocalSummalyResult = SummalyResult & { }; // Increment this to invalidate cached previews after a major change. -const cacheFormatVersion = 3; +const cacheFormatVersion = 4; type PreviewRoute = { Querystring: { @@ -409,7 +410,7 @@ export class UrlPreviewService { // Finally, attempt a signed GET in case it's a direct link to an instance with authorized fetch. const instanceActor = await this.systemAccountService.getInstanceActor(); const remoteObject = await this.apRequestService.signedGet(summary.url, instanceActor).catch(() => null); - if (remoteObject && this.apUtilityService.haveSameAuthority(remoteObject.id, summary.url)) { + if (remoteObject && isNote(remoteObject) && this.apUtilityService.haveSameAuthority(remoteObject.id, summary.url)) { summary.activityPub = remoteObject.id; return; } From 735cd12654e6f9600a06432a8ef6f743a6536b42 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 18:59:02 -0400 Subject: [PATCH 08/12] fix array length check in i/update attributionDomains parameter --- packages/backend/src/server/api/endpoints/i/update.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index 5a160d632c..7c13503f9b 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -270,7 +270,7 @@ export const paramDef = { minLength: 1, maxLength: 128, }, - maxLength: 32, + maxItems: 32, }, }, } as const; From 16858cf2f78ab781f1f08ca3d7bbffec27ece35c Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 20:22:40 -0400 Subject: [PATCH 09/12] fix response type of i/registry/get endpoint --- packages/backend/src/server/api/endpoints/i/registry/get.ts | 4 +--- packages/misskey-js/src/autogen/types.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts index dff33016e0..d284334834 100644 --- a/packages/backend/src/server/api/endpoints/i/registry/get.ts +++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts @@ -20,9 +20,7 @@ export const meta = { }, }, - res: { - type: 'object', - }, + res: {}, // 10 calls per 5 seconds limit: { diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index 82d18e2404..c09901c214 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -24267,7 +24267,7 @@ export type operations = { /** @description OK (with results) */ 200: { content: { - 'application/json': Record; + 'application/json': unknown; }; }; /** @description Client error */ From 4085c8a4f14d94c6a2136575d4b9041921f7875d Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 20:24:44 -0400 Subject: [PATCH 10/12] integrate localStorage options into preference system --- .../src/pages/settings/custom-css.vue | 18 +--- .../src/pages/settings/preferences.vue | 66 +-------------- packages/frontend/src/pref-migrate.ts | 11 +++ packages/frontend/src/preferences/def.ts | 83 +++++++++++++++---- packages/frontend/src/preferences/manager.ts | 40 +++++++-- 5 files changed, 118 insertions(+), 100 deletions(-) diff --git a/packages/frontend/src/pages/settings/custom-css.vue b/packages/frontend/src/pages/settings/custom-css.vue index 07b16d5c45..5b9b0d897a 100644 --- a/packages/frontend/src/pages/settings/custom-css.vue +++ b/packages/frontend/src/pages/settings/custom-css.vue @@ -23,24 +23,8 @@ import { i18n } from '@/i18n.js'; import { definePage } from '@/page.js'; import { miLocalStorage } from '@/local-storage.js'; import { prefer } from '@/preferences.js'; -import { reloadAsk } from '@/utility/reload-ask'; -const customCssModel = prefer.model('customCss'); -const localCustomCss = computed({ - get() { - return customCssModel.value ?? miLocalStorage.getItem('customCss') ?? ''; - }, - set(newCustomCss) { - customCssModel.value = newCustomCss; - if (newCustomCss) { - miLocalStorage.setItem('customCss', newCustomCss); - } else { - miLocalStorage.removeItem('customCss'); - } - - reloadAsk(true); - }, -}); +const localCustomCss = prefer.model('customCss'); const headerActions = computed(() => []); diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index ed0e3689a5..84c625b502 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -1059,68 +1059,13 @@ const clickToOpen = prefer.model('clickToOpen'); const useCustomSearchEngine = computed(() => !Object.keys(searchEngineMap).includes(searchEngine.value)); const defaultCW = ref($i.defaultCW); const defaultCWPriority = ref($i.defaultCWPriority); - -const langModel = prefer.model('lang'); -const lang = computed({ - get() { - return langModel.value ?? miLocalStorage.getItem('lang') ?? 'en-US'; - }, - set(newLang) { - langModel.value = newLang; - miLocalStorage.setItem('lang', newLang); - miLocalStorage.removeItem('locale'); - miLocalStorage.removeItem('localeVersion'); - }, -}); - -const fontSizeModel = prefer.model('fontSize'); -const fontSize = computed<'0' | '1' | '2' | '3'>({ - get() { - return fontSizeModel.value ?? miLocalStorage.getItem('fontSize') ?? '0'; - }, - set(newFontSize) { - fontSizeModel.value = newFontSize; - if (newFontSize !== '0') { - miLocalStorage.setItem('fontSize', newFontSize); - } else { - miLocalStorage.removeItem('fontSize'); - } - }, -}); - -const useSystemFontModel = prefer.model('useSystemFont'); -const useSystemFont = computed({ - get() { - return useSystemFontModel.value ?? (miLocalStorage.getItem('useSystemFont') != null); - }, - set(newUseSystemFont) { - useSystemFontModel.value = newUseSystemFont; - if (newUseSystemFont) { - miLocalStorage.setItem('useSystemFont', 't'); - } else { - miLocalStorage.removeItem('useSystemFont'); - } - }, -}); - -const cornerRadiusModel = prefer.model('cornerRadius'); -const cornerRadius = computed<'misskey' | 'sharkey'>({ - get() { - return cornerRadiusModel.value ?? miLocalStorage.getItem('cornerRadius') ?? 'sharkey'; - }, - set(newCornerRadius) { - cornerRadiusModel.value = newCornerRadius; - if (newCornerRadius === 'sharkey') { - miLocalStorage.removeItem('cornerRadius'); - } else { - miLocalStorage.setItem('cornerRadius', newCornerRadius); - } - }, -}); +const lang = prefer.model('lang'); +const fontSize = prefer.model('fontSize'); +const useSystemFont = prefer.model('useSystemFont'); +const cornerRadius = prefer.model('cornerRadius'); watch([ hemisphere, - lang, enableInfiniteScroll, showNoteActionsOnlyHover, overridedDeviceKind, @@ -1142,9 +1087,6 @@ watch([ useStickyIcons, keepScreenOn, contextMenu, - fontSize, - useSystemFont, - cornerRadius, makeEveryTextElementsSelectable, noteDesign, ], async () => { diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts index a7bb82a5f0..3250e7f1bd 100644 --- a/packages/frontend/src/pref-migrate.ts +++ b/packages/frontend/src/pref-migrate.ts @@ -13,6 +13,7 @@ import { deckStore } from '@/ui/deck/deck-store.js'; import { unisonReload } from '@/utility/unison-reload.js'; import * as os from '@/os.js'; import { i18n } from '@/i18n.js'; +import { miLocalStorage } from '@/local-storage'; // TODO: そのうち消す export function migrateOldSettings() { @@ -167,5 +168,15 @@ export function migrateOldSettings() { window.setTimeout(() => { unisonReload(); }, 10000); + //#region Hybrid migrations + prefer.commit('fontSize', miLocalStorage.getItem('fontSize') ?? '0'); + prefer.commit('useSystemFont', miLocalStorage.getItem('useSystemFont') != null); + prefer.commit('cornerRadius', miLocalStorage.getItem('cornerRadius') ?? 'sharkey'); + prefer.commit('lang', miLocalStorage.getItem('lang') ?? 'en-US'); + prefer.commit('customCss', miLocalStorage.getItem('customCss') ?? ''); + prefer.commit('neverShowDonationInfo', miLocalStorage.getItem('neverShowDonationInfo') != null); + prefer.commit('neverShowLocalOnlyInfo', miLocalStorage.getItem('neverShowLocalOnlyInfo') != null); + //#endregion + }); } diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index fb795b1b7a..f430c4573c 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -10,11 +10,12 @@ import type { SoundType } from '@/utility/sound.js'; import type { Plugin } from '@/plugin.js'; import type { DeviceKind } from '@/utility/device-kind.js'; import type { DeckProfile } from '@/deck.js'; -import type { PreferencesDefinition } from './manager.js'; +import type { Pref, PreferencesDefinition } from './manager.js'; import type { FollowingFeedState } from '@/types/following-feed.js'; import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js'; import { searchEngineMap } from '@/utility/search-engine-map.js'; import { defaultFollowingFeedState } from '@/types/following-feed.js'; +import { miLocalStorage } from '@/local-storage'; /** サウンド設定 */ export type SoundStore = { @@ -484,25 +485,77 @@ export const PREF_DEF = { // Null means "fall back to existing value from localStorage" // For all of these preferences, "null" means fall back to existing value in localStorage. fontSize: { - default: null as null | '0' | '1' | '2' | '3', - }, + default: '0', + needsReload: true, + onSet: fontSize => { + if (fontSize !== '0') { + miLocalStorage.setItem('fontSize', fontSize); + } else { + miLocalStorage.removeItem('fontSize'); + } + }, + } as Pref<'0' | '1' | '2' | '3'>, useSystemFont: { - default: null as null | boolean, - }, + default: false, + needsReload: true, + onSet: useSystemFont => { + if (useSystemFont) { + miLocalStorage.setItem('useSystemFont', 't'); + } else { + miLocalStorage.removeItem('useSystemFont'); + } + }, + } as Pref, cornerRadius: { - default: null as null | 'misskey' | 'sharkey', - }, + default: 'sharkey', + needsReload: true, + onSet: cornerRadius => { + if (cornerRadius === 'sharkey') { + miLocalStorage.removeItem('cornerRadius'); + } else { + miLocalStorage.setItem('cornerRadius', cornerRadius); + } + }, + } as Pref<'misskey' | 'sharkey'>, lang: { - default: null as null | string, - }, + default: 'en-US', + needsReload: true, + onSet: lang => { + miLocalStorage.setItem('lang', lang); + miLocalStorage.removeItem('locale'); + miLocalStorage.removeItem('localeVersion'); + }, + } as Pref, customCss: { - default: null as null | string, - }, + default: '', + needsReload: true, + onSet: customCss => { + if (customCss) { + miLocalStorage.setItem('customCss', customCss); + } else { + miLocalStorage.removeItem('customCss'); + } + }, + } as Pref, neverShowDonationInfo: { - default: null as null | 'true', - }, + default: false, + onSet: neverShowDonationInfo => { + if (neverShowDonationInfo) { + miLocalStorage.setItem('neverShowDonationInfo', 'true'); + } else { + miLocalStorage.removeItem('neverShowDonationInfo'); + } + }, + } as Pref, neverShowLocalOnlyInfo: { - default: null as null | 'true', - }, + default: false, + onSet: neverShowLocalOnlyInfo => { + if (neverShowLocalOnlyInfo) { + miLocalStorage.setItem('neverShowLocalOnlyInfo', 'true'); + } else { + miLocalStorage.removeItem('neverShowLocalOnlyInfo'); + } + }, + } as Pref, //#endregion } satisfies PreferencesDefinition; diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index f96aa2f368..b57a8d2b2a 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { computed, onUnmounted, ref, watch } from 'vue'; +import { computed, nextTick, onUnmounted, ref, watch } from 'vue'; import { v4 as uuid } from 'uuid'; import { host, version } from '@@/js/config.js'; import { PREF_DEF } from './def.js'; @@ -14,6 +14,7 @@ import { copyToClipboard } from '@/utility/copy-to-clipboard.js'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; import { deepEqual } from '@/utility/deep-equal.js'; +import { reloadAsk } from '@/utility/reload-ask'; // NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない @@ -84,16 +85,29 @@ export type StorageProvider = { cloudSet: (ctx: { key: K; scope: Scope; value: ValueOf; }) => Promise; }; -export type PreferencesDefinition = Record = { + default: T; accountDependent?: boolean; serverDependent?: boolean; -}>; + needsReload?: boolean; + onSet?: (value: T) => void; +}; + +export type PreferencesDefinition = Record | undefined>; export class PreferencesManager { private storageProvider: StorageProvider; public profile: PreferencesProfile; public cloudReady: Promise; + private enableReload = true; + + public suppressReload() { + this.enableReload = false; + } + + public allowReload() { + this.enableReload = true; + } /** * static / state の略 (static が予約語のため) @@ -126,11 +140,11 @@ export class PreferencesManager { } private isAccountDependentKey(key: K): boolean { - return (PREF_DEF as PreferencesDefinition)[key].accountDependent === true; + return (PREF_DEF as PreferencesDefinition)[key]?.accountDependent === true; } private isServerDependentKey(key: K): boolean { - return (PREF_DEF as PreferencesDefinition)[key].serverDependent === true; + return (PREF_DEF as PreferencesDefinition)[key]?.serverDependent === true; } private rewriteRawState(key: K, value: ValueOf) { @@ -150,6 +164,20 @@ export class PreferencesManager { this.rewriteRawState(key, v); + const pref = (PREF_DEF as PreferencesDefinition)[key]; + if (pref) { + // Call custom setter + if (pref.onSet) { + pref.onSet(v); + } + + // Prompt to reload the frontend + if (pref.needsReload && this.enableReload) { + // noinspection JSIgnoredPromiseFromCall + nextTick(() => reloadAsk({ unison: true })); + } + } + const record = this.getMatchedRecordOf(key); if (parseScope(record[0]).account == null && this.isAccountDependentKey(key)) { From e3668be8f4bf70b78f005f119af70cd6349a2b93 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 20:25:18 -0400 Subject: [PATCH 11/12] fix race conditions and bugs in pref-migrate.ts --- packages/frontend/src/pref-migrate.ts | 33 +++++++++++++++------------ 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts index 3250e7f1bd..ccd4472ca2 100644 --- a/packages/frontend/src/pref-migrate.ts +++ b/packages/frontend/src/pref-migrate.ts @@ -20,9 +20,11 @@ export function migrateOldSettings() { os.waiting(i18n.ts.settingsMigrating); store.loaded.then(async () => { - misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []).then((themes: Theme[]) => { - if (themes.length > 0) { - prefer.commit('themes', themes); + prefer.suppressReload(); + + await misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []).then(themes => { + if (Array.isArray(themes) && themes.length > 0) { + prefer.commit('themes', themes as Theme[]); } }); @@ -34,7 +36,7 @@ export function migrateOldSettings() { }))); prefer.commit('deck.profile', deckStore.s.profile); - misskeyApi('i/registry/keys', { + await misskeyApi('i/registry/keys', { scope: ['client', 'deck', 'profiles'], }).then(async keys => { const profiles: DeckProfile[] = []; @@ -42,16 +44,18 @@ export function migrateOldSettings() { const deck = await misskeyApi('i/registry/get', { scope: ['client', 'deck', 'profiles'], key: key, - }); - profiles.push({ - id: uuid(), - name: key, - columns: deck.columns, - layout: deck.layout, - }); + }).catch(() => null); + if (deck) { + profiles.push({ + id: uuid(), + name: key, + columns: (deck as DeckProfile).columns, + layout: (deck as DeckProfile).layout, + }); + } } prefer.commit('deck.profiles', profiles); - }); + }).catch(() => null); prefer.commit('lightTheme', ColdDeviceStorage.get('lightTheme')); prefer.commit('darkTheme', ColdDeviceStorage.get('darkTheme')); @@ -165,9 +169,6 @@ export function migrateOldSettings() { prefer.commit('warnMissingAltText', store.s.warnMissingAltText); //#endregion - window.setTimeout(() => { - unisonReload(); - }, 10000); //#region Hybrid migrations prefer.commit('fontSize', miLocalStorage.getItem('fontSize') ?? '0'); prefer.commit('useSystemFont', miLocalStorage.getItem('useSystemFont') != null); @@ -178,5 +179,7 @@ export function migrateOldSettings() { prefer.commit('neverShowLocalOnlyInfo', miLocalStorage.getItem('neverShowLocalOnlyInfo') != null); //#endregion + prefer.allowReload(); + unisonReload(); }); } From 3d804c560d402842fc1c481f63bd525aa3b0625f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 7 Jun 2025 20:54:21 -0400 Subject: [PATCH 12/12] use SKUrlPreviewGroup in more places --- packages/frontend/src/components/MkNote.vue | 7 ++++--- .../frontend/src/components/MkNoteDetailed.vue | 7 +++---- packages/frontend/src/components/SkNote.vue | 7 ++++--- .../frontend/src/components/SkNoteDetailed.vue | 7 +++---- .../frontend/src/components/SkOldNoteWindow.vue | 10 ++++------ .../frontend/src/components/page/page.text.vue | 15 +++------------ packages/frontend/src/pages/chat/XMessage.vue | 8 ++++---- 7 files changed, 25 insertions(+), 36 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 16aed7898e..37882ef5b9 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -95,7 +95,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +