summaryrefslogtreecommitdiff
path: root/packages/backend/src/models
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-06-21 17:55:38 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-06-21 17:55:38 +0900
commitf880d0631c7daf9cffbc388dcb81fd1f7f4259fb (patch)
tree3e3ec034957bd9f7188d1d50e6c3d04daf6d1f70 /packages/backend/src/models
parentrefactor(client): use composition api (diff)
downloadsharkey-f880d0631c7daf9cffbc388dcb81fd1f7f4259fb.tar.gz
sharkey-f880d0631c7daf9cffbc388dcb81fd1f7f4259fb.tar.bz2
sharkey-f880d0631c7daf9cffbc388dcb81fd1f7f4259fb.zip
tweak client
Diffstat (limited to 'packages/backend/src/models')
-rw-r--r--packages/backend/src/models/repositories/instance.ts3
-rw-r--r--packages/backend/src/models/schema/federation-instance.ts4
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,