Merge branch 'develop'

3 files changed, 82 insertions, 0 deletions

diff --git a/src/services/insert-moderation-log.ts b/src/services/insert-moderation-log.ts
new file mode 100644
index 0000000000..33dab97259
--- /dev/null
+++ b/src/services/insert-moderation-log.ts
@@ -0,0 +1,13 @@
+import { ILocalUser } from '../models/entities/user';
+import { ModerationLogs } from '../models';
+import { genId } from '../misc/gen-id';
+
+export async function insertModerationLog(moderator: ILocalUser, type: string, info?: Record<string, any>) {
+	await ModerationLogs.save({
+		id: genId(),
+		createdAt: new Date(),
+		userId: moderator.id,
+		type: type,
+		info: info || {}
+	});
+}
diff --git a/src/services/suspend-user.ts b/src/services/suspend-user.ts
new file mode 100644
index 0000000000..a85188acbe
--- /dev/null
+++ b/src/services/suspend-user.ts
@@ -0,0 +1,34 @@
+import renderDelete from '../remote/activitypub/renderer/delete';
+import { renderActivity } from '../remote/activitypub/renderer';
+import { deliver } from '../queue';
+import config from '../config';
+import { User } from '../models/entities/user';
+import { Users, Followings } from '../models';
+import { Not, IsNull } from 'typeorm';
+
+export async function doPostSuspend(user: User) {
+	if (Users.isLocalUser(user)) {
+		// 知り得る全SharedInboxにDelete配信
+		const content = renderActivity(renderDelete(`${config.url}/users/${user.id}`, user));
+
+		const queue: string[] = [];
+
+		const followings = await Followings.find({
+			where: [
+				{ followerSharedInbox: Not(IsNull()) },
+				{ followeeSharedInbox: Not(IsNull()) }
+			],
+			select: ['followerSharedInbox', 'followeeSharedInbox']
+		});
+
+		const inboxes = followings.map(x => x.followerSharedInbox || x.followeeSharedInbox);
+
+		for (const inbox of inboxes) {
+			if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+		}
+
+		for (const inbox of queue) {
+			deliver(user as any, content, inbox);
+		}
+	}
+}
diff --git a/src/services/unsuspend-user.ts b/src/services/unsuspend-user.ts
new file mode 100644
index 0000000000..6cab375821
--- /dev/null
+++ b/src/services/unsuspend-user.ts
@@ -0,0 +1,35 @@
+import renderDelete from '../remote/activitypub/renderer/delete';
+import renderUndo from '../remote/activitypub/renderer/undo';
+import { renderActivity } from '../remote/activitypub/renderer';
+import { deliver } from '../queue';
+import config from '../config';
+import { User } from '../models/entities/user';
+import { Users, Followings } from '../models';
+import { Not, IsNull } from 'typeorm';
+
+export async function doPostUnsuspend(user: User) {
+	if (Users.isLocalUser(user)) {
+		// 知り得る全SharedInboxにUndo Delete配信
+		const content = renderActivity(renderUndo(renderDelete(`${config.url}/users/${user.id}`, user), user));
+
+		const queue: string[] = [];
+
+		const followings = await Followings.find({
+			where: [
+				{ followerSharedInbox: Not(IsNull()) },
+				{ followeeSharedInbox: Not(IsNull()) }
+			],
+			select: ['followerSharedInbox', 'followeeSharedInbox']
+		});
+
+		const inboxes = followings.map(x => x.followerSharedInbox || x.followeeSharedInbox);
+
+		for (const inbox of inboxes) {
+			if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
+		}
+
+		for (const inbox of queue) {
+			deliver(user as any, content, inbox);
+		}
+	}
+}