インスタンスモデレーションのキャッシュが即時反映されるように

src/misc/instance-info.ts

@@ -1,5 +1,6 @@
 import Instance from '../models/instance';
 import { toApHost } from './convert-host';
+import { getServerSubscriber } from '../services/server-subscriber';
 
 let blockedHosts: Set<string>;
 let closedHosts: Set<string>;
@@ -28,8 +29,19 @@ async function Update() {
 	closedHosts = new Set(closed.map(x => toApHost(x.host)));
 }
 
+// 初回アップデート
 Update();
 
+// 一定時間ごとにアップデート
 setInterval(() => {
 	Update();
 }, 300 * 1000);
+
+// イベントでアップデート
+const ev = getServerSubscriber();
+
+ev.on('serverEvent', (data: any) => {
+	if (data.type === 'instanceModUpdated') {
+		Update();
+	}
+});

src/server/api/endpoints/admin/federation/update-instance.ts

@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
 import Instance from '../../../../../models/instance';
+import { publishInstanceModUpdated } from '../../../../../services/create-event';
 
 export const meta = {
 	tags: ['admin'],
@@ -30,12 +31,14 @@ export default define(meta, async (ps, me) => {
 		throw new Error('instance not found');
 	}
 
-	Instance.update({ host: ps.host }, {
+	await Instance.update({ host: ps.host }, {
 		$set: {
 			isBlocked: ps.isBlocked,
 			isMarkedAsClosed: ps.isClosed
 		}
 	});
 
+	publishInstanceModUpdated();
+
 	return;
 });

src/services/create-event.ts

@@ -16,3 +16,7 @@ export async function publishFilterChanged(userId: mongo.ObjectID) {
 export async function publishTerminate(userId: mongo.ObjectID) {
 	await publishServerEvent(userId, 'terminate');
 }
+
+export async function publishInstanceModUpdated() {
+	await publishServerEvent(null, 'instanceModUpdated');
+}

src/services/server-subscriber.ts

@@ -0,0 +1,29 @@
+import * as redis from 'redis';
+import config from '../config';
+import { EventEmitter } from 'events';
+
+let ev: EventEmitter;
+
+export function getServerSubscriber() {
+	if (!ev) setupServerEv();
+	return ev;
+}
+
+function setupServerEv() {
+	const subscriber = redis.createClient(
+		config.redis.port,
+		config.redis.host,
+		{
+			password: config.redis.pass
+		}
+	);
+
+	subscriber.subscribe(config.host);
+
+	ev = new EventEmitter();
+
+	subscriber.on('message', async (_, data) => {
+		const obj = JSON.parse(data);
+		ev.emit(obj.channel, obj.message);
+	});
+}