diff options
| author | Marie <github@yuugi.dev> | 2024-10-13 00:13:26 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2024-10-13 00:13:26 +0000 |
| commit | fdfb0faab0620ca6a39af0bb364068ffbcbe0a76 (patch) | |
| tree | 654081743a8640d8e0cf78bf6f8648ce39335368 | |
| parent | merge: Prevent usernames from overflowing the reactions hover-list (resolves ... (diff) | |
| parent | add missing `rejectReports` field to `show-instance` response (diff) | |
| download | sharkey-fdfb0faab0620ca6a39af0bb364068ffbcbe0a76.tar.gz sharkey-fdfb0faab0620ca6a39af0bb364068ffbcbe0a76.tar.bz2 sharkey-fdfb0faab0620ca6a39af0bb364068ffbcbe0a76.zip | |
merge: Add missing `rejectReports` field to show-instance API response (!679)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/679
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
| -rw-r--r-- | packages/backend/src/core/entities/InstanceEntityService.ts | 1 | ||||
| -rw-r--r-- | packages/backend/src/models/json-schema/federation-instance.ts | 5 | ||||
| -rw-r--r-- | packages/misskey-js/src/autogen/types.ts | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts index 7695e6dfa7..3863cf5666 100644 --- a/packages/backend/src/core/entities/InstanceEntityService.ts +++ b/packages/backend/src/core/entities/InstanceEntityService.ts @@ -57,6 +57,7 @@ export class InstanceEntityService { infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null, latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null, isNSFW: instance.isNSFW, + rejectReports: instance.rejectReports, moderationNote: iAmModerator ? instance.moderationNote : null, }; } diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts index 062dba9bad..7960e748e9 100644 --- a/packages/backend/src/models/json-schema/federation-instance.ts +++ b/packages/backend/src/models/json-schema/federation-instance.ts @@ -121,6 +121,11 @@ export const packedFederationInstanceSchema = { optional: false, nullable: false, }, + rejectReports: { + type: 'boolean', + optional: false, + nullable: false, + }, moderationNote: { type: 'string', optional: true, nullable: true, diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index 94b77efb66..0453fd0a36 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -4772,6 +4772,7 @@ export type components = { /** Format: date-time */ latestRequestReceivedAt: string | null; isNSFW: boolean; + rejectReports: boolean; moderationNote?: string | null; }; GalleryPost: { @@ -15366,6 +15367,10 @@ export type operations = { untilId?: string; /** @default 10 */ limit?: number; + /** @default false */ + includeFollower?: boolean; + /** @default true */ + includeFollowee?: boolean; }; }; }; @@ -15425,6 +15430,10 @@ export type operations = { untilId?: string; /** @default 10 */ limit?: number; + /** @default false */ + includeFollower?: boolean; + /** @default true */ + includeFollowee?: boolean; }; }; }; |