Merge branch 'develop' into math-block

1 files changed, 21 insertions, 1 deletions

diff --git a/src/server/api/endpoints/users/report-abuse.ts b/src/server/api/endpoints/users/report-abuse.ts
index b520b29e23..19beee4330 100644
--- a/src/server/api/endpoints/users/report-abuse.ts
+++ b/src/server/api/endpoints/users/report-abuse.ts
@@ -2,6 +2,7 @@ import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 import define from '../../define';
 import User from '../../../../models/user';
 import AbuseUserReport from '../../../../models/abuse-user-report';
+import { publishAdminStream } from '../../../../stream';
 
 export const meta = {
 	desc: {
@@ -47,12 +48,31 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		return rej('cannot report admin');
 	}
 
-	await AbuseUserReport.insert({
+	const report = await AbuseUserReport.insert({
 		createdAt: new Date(),
 		userId: user._id,
 		reporterId: me._id,
 		comment: ps.comment
 	});
 
+	// Publish event to moderators
+	setTimeout(async () => {
+		const moderators = await User.find({
+			$or: [{
+				isAdmin: true
+			}, {
+				isModerator: true
+			}]
+		});
+		for (const moderator of moderators) {
+			publishAdminStream(moderator._id, 'newAbuseUserReport', {
+				id: report._id,
+				userId: report.userId,
+				reporterId: report.reporterId,
+				comment: report.comment
+			});
+		}
+	}, 1);
+
 	res();
 }));