diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/models/entities/instance.ts | 5 | ||||
| -rw-r--r-- | src/queue/processors/deliver.ts | 10 | ||||
| -rw-r--r-- | src/server/api/endpoints/admin/federation/update-instance.ts | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/models/entities/instance.ts b/src/models/entities/instance.ts index dd0de100d6..fe620887d2 100644 --- a/src/models/entities/instance.ts +++ b/src/models/entities/instance.ts @@ -114,12 +114,13 @@ export class Instance { public isNotResponding: boolean; /** - * このインスタンスが閉鎖済みとしてマークされているか + * このインスタンスへの配信を停止するか */ + @Index() @Column('boolean', { default: false }) - public isMarkedAsClosed: boolean; + public isSuspended: boolean; @Column('varchar', { length: 64, nullable: true, default: null, diff --git a/src/queue/processors/deliver.ts b/src/queue/processors/deliver.ts index 980ca3a437..16b2f6e29a 100644 --- a/src/queue/processors/deliver.ts +++ b/src/queue/processors/deliver.ts @@ -21,15 +21,15 @@ export default async (job: Bull.Job) => { return 'skip (blocked)'; } - // closedなら中断 - const closedHosts = await Instances.find({ + // isSuspendedなら中断 + const suspendedHosts = await Instances.find({ where: { - isMarkedAsClosed: true + isSuspended: true }, cache: 60 * 1000 }); - if (closedHosts.map(x => x.host).includes(toPuny(host))) { - return 'skip (closed)'; + if (suspendedHosts.map(x => x.host).includes(toPuny(host))) { + return 'skip (suspended)'; } try { diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts index 90ab7a3ec5..88bd2e3dff 100644 --- a/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/src/server/api/endpoints/admin/federation/update-instance.ts @@ -14,7 +14,7 @@ export const meta = { validator: $.str }, - isClosed: { + isSuspended: { validator: $.bool }, } @@ -28,6 +28,6 @@ export default define(meta, async (ps, me) => { } Instances.update({ host: toPuny(ps.host) }, { - isMarkedAsClosed: ps.isClosed + isSuspended: ps.isSuspended }); }); |