diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b6e2c59a615e0f7a774e4503faec378e9b9732c..b3266c52eb514344bc0e7ece631c53fbb48f6dc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ChangeLog ### Breaking Chnages * ãŠçŸ¥ã‚‰ã›ãŒãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ * 通知ãŒãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ +* インスタンスã®é–‰éŽ–æƒ…å ±ãŒãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚ * モデレーターãŒã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹è¨å®šã‚’閲覧ã—ãŸã‚Šå¤‰æ›´ã—ãŸã‚Šã§ããªããªã‚Šã¾ã™(ãれらãŒã§ãã‚‹ã®ã¯Adminã®ã¿ã«ãªã‚Šã¾ã™)。 * モデレーターãŒå‡ºæ¥ã‚‹ã®ã¯ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ã‚µã‚¤ãƒ¬ãƒ³ã‚¹/å‡çµãªã©ã«é™ã‚‰ã‚Œã¾ã™ã€‚ * 従æ¥ã¨åŒã˜æ¨©é™ã‚’与ãˆãŸã„å ´åˆã€ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ã‚’Adminã«è¨å®šã™ã‚‹ã“ã¨ã‚’検討ã—ã¦ãã ã•ã„(Adminã¯è¤‡æ•°äººè¨å®šå¯èƒ½ã§ã™)。 diff --git a/migration/1580331224276-v12-11.ts b/migration/1580331224276-v12-11.ts new file mode 100644 index 0000000000000000000000000000000000000000..30794b80e34a59745c220392129ed80992165f92 --- /dev/null +++ b/migration/1580331224276-v12-11.ts @@ -0,0 +1,18 @@ +import {MigrationInterface, QueryRunner} from "typeorm"; + +export class v12111580331224276 implements MigrationInterface { + name = 'v12111580331224276' + + public async up(queryRunner: QueryRunner): Promise<any> { + await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isMarkedAsClosed"`, undefined); + await queryRunner.query(`ALTER TABLE "instance" ADD "isSuspended" boolean NOT NULL DEFAULT false`, undefined); + await queryRunner.query(`CREATE INDEX "IDX_34500da2e38ac393f7bb6b299c" ON "instance" ("isSuspended") `, undefined); + } + + public async down(queryRunner: QueryRunner): Promise<any> { + await queryRunner.query(`DROP INDEX "IDX_34500da2e38ac393f7bb6b299c"`, undefined); + await queryRunner.query(`ALTER TABLE "instance" DROP COLUMN "isSuspended"`, undefined); + await queryRunner.query(`ALTER TABLE "instance" ADD "isMarkedAsClosed" boolean NOT NULL DEFAULT false`, undefined); + } + +} diff --git a/src/models/entities/instance.ts b/src/models/entities/instance.ts index dd0de100d61572d0fd92afc47b4a563eb3b42b96..fe620887d23f101622b48396ebf4b8b5deaec4b9 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 980ca3a437effa700331a98cf8b8d4284df5b524..16b2f6e29aaac0483b72e2ed45564f599890c72c 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 90ab7a3ec5dd2568381ba2f9229ee5bb213088a5..88bd2e3dffaa1497a972bd01183a7cde8b2b205c 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 }); });