From f39f47aadee7d566342aa62abfc31515006df034 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 20 Feb 2025 21:12:12 -0500 Subject: [PATCH] include rejectQuotes on all packed User entities --- .../src/core/entities/UserEntityService.ts | 2 +- .../backend/src/models/json-schema/user.ts | 8 ++++---- packages/misskey-js/etc/misskey-js.api.md | 18 +++++++++++++++++- packages/misskey-js/src/autogen/types.ts | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 5d539ea264..96fef863a0 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -593,6 +593,7 @@ export class UserEntityService implements OnModuleInit { noindex: user.noindex, enableRss: user.enableRss, mandatoryCW: user.mandatoryCW, + rejectQuotes: user.rejectQuotes, isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote), speakAsCat: user.speakAsCat ?? false, approved: user.approved, @@ -674,7 +675,6 @@ export class UserEntityService implements OnModuleInit { securityKeys: profile!.twoFactorEnabled ? this.userSecurityKeysRepository.countBy({ userId: user.id }).then(result => result >= 1) : false, - rejectQuotes: user.rejectQuotes, } : {}), ...(isDetailed && isMe ? { diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts index 3d0bf44c2e..0f1601f138 100644 --- a/packages/backend/src/models/json-schema/user.ts +++ b/packages/backend/src/models/json-schema/user.ts @@ -138,6 +138,10 @@ export const packedUserLiteSchema = { type: 'string', nullable: true, optional: false, }, + rejectQuotes: { + type: 'boolean', + nullable: false, optional: true, + }, isBot: { type: 'boolean', nullable: false, optional: true, @@ -445,10 +449,6 @@ export const packedUserDetailedNotMeOnlySchema = { type: 'boolean', nullable: false, optional: true, }, - rejectQuotes: { - type: 'boolean', - nullable: false, optional: true, - }, //#region relations isFollowing: { type: 'boolean', diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md index cc3dcaa765..24a5294c91 100644 --- a/packages/misskey-js/etc/misskey-js.api.md +++ b/packages/misskey-js/etc/misskey-js.api.md @@ -281,6 +281,9 @@ type AdminQueuePromoteRequest = operations['admin___queue___promote']['requestBo // @public (undocumented) type AdminQueueStatsResponse = operations['admin___queue___stats']['responses']['200']['content']['application/json']; +// @public (undocumented) +type AdminRejectQuotesRequest = operations['admin___reject-quotes']['requestBody']['content']['application/json']; + // @public (undocumented) type AdminRelaysAddRequest = operations['admin___relays___add']['requestBody']['content']['application/json']; @@ -1355,6 +1358,7 @@ declare namespace entities { AdminQueueInboxDelayedResponse, AdminQueuePromoteRequest, AdminQueueStatsResponse, + AdminRejectQuotesRequest, AdminRelaysAddRequest, AdminRelaysAddResponse, AdminRelaysListResponse, @@ -2556,6 +2560,18 @@ type ModerationLog = { } | { type: 'unsuspend'; info: ModerationLogPayloads['unsuspend']; +} | { + type: 'acceptQuotesUser'; + info: ModerationLogPayloads['acceptQuotesUser']; +} | { + type: 'rejectQuotesUser'; + info: ModerationLogPayloads['rejectQuotesUser']; +} | { + type: 'acceptQuotesInstance'; + info: ModerationLogPayloads['acceptQuotesInstance']; +} | { + type: 'rejectQuotesInstance'; + info: ModerationLogPayloads['rejectQuotesInstance']; } | { type: 'updateUserNote'; info: ModerationLogPayloads['updateUserNote']; @@ -3025,7 +3041,7 @@ type PartialRolePolicyOverride = Partial<{ }>; // @public (undocumented) -export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse"]; +export const permissions: readonly ["read:account", "write:account", "read:blocks", "write:blocks", "read:drive", "write:drive", "read:favorites", "write:favorites", "read:following", "write:following", "read:messaging", "write:messaging", "read:mutes", "write:mutes", "write:notes", "read:notes-schedule", "write:notes-schedule", "read:notifications", "write:notifications", "read:reactions", "write:reactions", "write:votes", "read:pages", "write:pages", "write:page-likes", "read:page-likes", "read:user-groups", "write:user-groups", "read:channels", "write:channels", "read:gallery", "write:gallery", "read:gallery-likes", "write:gallery-likes", "read:flash", "write:flash", "read:flash-likes", "write:flash-likes", "read:admin:abuse-user-reports", "write:admin:delete-account", "write:admin:delete-all-files-of-a-user", "read:admin:index-stats", "read:admin:table-stats", "read:admin:user-ips", "read:admin:meta", "write:admin:reset-password", "write:admin:resolve-abuse-user-report", "write:admin:send-email", "read:admin:server-info", "read:admin:show-moderation-log", "read:admin:show-user", "write:admin:suspend-user", "write:admin:approve-user", "write:admin:decline-user", "write:admin:nsfw-user", "write:admin:unnsfw-user", "write:admin:cw-user", "write:admin:silence-user", "write:admin:unsilence-user", "write:admin:unset-user-avatar", "write:admin:unset-user-banner", "write:admin:unsuspend-user", "write:admin:reject-quotes", "write:admin:meta", "write:admin:user-note", "write:admin:roles", "read:admin:roles", "write:admin:relays", "read:admin:relays", "write:admin:invite-codes", "read:admin:invite-codes", "write:admin:announcements", "read:admin:announcements", "write:admin:avatar-decorations", "read:admin:avatar-decorations", "write:admin:federation", "write:admin:account", "read:admin:account", "write:admin:emoji", "read:admin:emoji", "write:admin:queue", "read:admin:queue", "write:admin:promo", "write:admin:drive", "read:admin:drive", "write:admin:ad", "read:admin:ad", "write:invite-codes", "read:invite-codes", "write:clip-favorite", "read:clip-favorite", "read:federation", "write:report-abuse"]; // @public (undocumented) type PingResponse = operations['ping']['responses']['200']['content']['application/json']; diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index f1b0856c2e..f9dc6525d0 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -3987,6 +3987,7 @@ export type components = { noindex: boolean; enableRss: boolean; mandatoryCW: string | null; + rejectQuotes?: boolean; isBot?: boolean; isCat?: boolean; speakAsCat?: boolean; @@ -4070,7 +4071,6 @@ export type components = { twoFactorEnabled?: boolean; usePasswordLessLogin?: boolean; securityKeys?: boolean; - rejectQuotes?: boolean; isFollowing?: boolean; isFollowed?: boolean; hasPendingFollowRequestFromYou?: boolean;