diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-06-21 22:36:37 +0900 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-06-21 22:36:37 +0900 |
| commit | ac93a1808b7b512ee05339dfbbf8fa491628acb3 (patch) | |
| tree | 1d41bcf6a9f8c989f99ce86ad662716cb9d229dd /packages/backend/src/models | |
| parent | Merge branch 'develop' into pizzax-indexeddb (diff) | |
| parent | enhance(client): show warning in control panel when there is an unresolved ab... (diff) | |
| download | misskey-ac93a1808b7b512ee05339dfbbf8fa491628acb3.tar.gz misskey-ac93a1808b7b512ee05339dfbbf8fa491628acb3.tar.bz2 misskey-ac93a1808b7b512ee05339dfbbf8fa491628acb3.zip | |
Merge branch 'develop' into pizzax-indexeddb
Diffstat (limited to 'packages/backend/src/models')
| -rw-r--r-- | packages/backend/src/models/repositories/instance.ts | 3 | ||||
| -rw-r--r-- | packages/backend/src/models/schema/federation-instance.ts | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/packages/backend/src/models/repositories/instance.ts b/packages/backend/src/models/repositories/instance.ts index 4594d86346..e9ee18ea35 100644 --- a/packages/backend/src/models/repositories/instance.ts +++ b/packages/backend/src/models/repositories/instance.ts @@ -1,11 +1,13 @@ import { db } from '@/db/postgre.js'; import { Instance } from '@/models/entities/instance.js'; import { Packed } from '@/misc/schema.js'; +import { fetchMeta } from '@/misc/fetch-meta.js'; export const InstanceRepository = db.getRepository(Instance).extend({ async pack( instance: Instance, ): Promise<Packed<'FederationInstance'>> { + const meta = await fetchMeta(); return { id: instance.id, caughtAt: instance.caughtAt.toISOString(), @@ -18,6 +20,7 @@ export const InstanceRepository = db.getRepository(Instance).extend({ lastCommunicatedAt: instance.lastCommunicatedAt.toISOString(), isNotResponding: instance.isNotResponding, isSuspended: instance.isSuspended, + isBlocked: meta.blockedHosts.includes(instance.host), softwareName: instance.softwareName, softwareVersion: instance.softwareVersion, openRegistrations: instance.openRegistrations, diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts index 9f27aab985..3efff6ca9c 100644 --- a/packages/backend/src/models/schema/federation-instance.ts +++ b/packages/backend/src/models/schema/federation-instance.ts @@ -52,6 +52,10 @@ export const packedFederationInstanceSchema = { type: 'boolean', optional: false, nullable: false, }, + isBlocked: { + type: 'boolean', + optional: false, nullable: false, + }, softwareName: { type: 'string', optional: false, nullable: true, |