summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-27 14:55:02 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-27 14:55:02 +0900
commitd906d9001052d2cde05b1bd9c2fbfb23a5a66cd2 (patch)
tree6d1417a097942180407fc844cb5b60d886dd0893
parentCelan up (diff)
downloadsharkey-d906d9001052d2cde05b1bd9c2fbfb23a5a66cd2.tar.gz
sharkey-d906d9001052d2cde05b1bd9c2fbfb23a5a66cd2.tar.bz2
sharkey-d906d9001052d2cde05b1bd9c2fbfb23a5a66cd2.zip
[Server] Introduce admin stream channel
-rw-r--r--src/server/api/endpoints/users/report-abuse.ts22
-rw-r--r--src/server/api/stream/channels/admin.ts16
-rw-r--r--src/server/api/stream/channels/index.ts2
-rw-r--r--src/stream.ts5
4 files changed, 44 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();
}));
diff --git a/src/server/api/stream/channels/admin.ts b/src/server/api/stream/channels/admin.ts
new file mode 100644
index 0000000000..6bcd1a7e0b
--- /dev/null
+++ b/src/server/api/stream/channels/admin.ts
@@ -0,0 +1,16 @@
+import autobind from 'autobind-decorator';
+import Channel from '../channel';
+
+export default class extends Channel {
+ public readonly chName = 'admin';
+ public static shouldShare = true;
+ public static requireCredential = true;
+
+ @autobind
+ public async init(params: any) {
+ // Subscribe admin stream
+ this.subscriber.on(`adminStream:${this.user._id}`, data => {
+ this.send(data);
+ });
+ }
+}
diff --git a/src/server/api/stream/channels/index.ts b/src/server/api/stream/channels/index.ts
index 7248579abd..02f71b5851 100644
--- a/src/server/api/stream/channels/index.ts
+++ b/src/server/api/stream/channels/index.ts
@@ -11,6 +11,7 @@ import messagingIndex from './messaging-index';
import drive from './drive';
import hashtag from './hashtag';
import apLog from './ap-log';
+import admin from './admin';
import gamesReversi from './games/reversi';
import gamesReversiGame from './games/reversi-game';
@@ -28,6 +29,7 @@ export default {
drive,
hashtag,
apLog,
+ admin,
gamesReversi,
gamesReversiGame
};
diff --git a/src/stream.ts b/src/stream.ts
index 596cb98e72..098d49ecd1 100644
--- a/src/stream.ts
+++ b/src/stream.ts
@@ -87,6 +87,10 @@ class Publisher {
public publishApLogStream = (log: any): void => {
this.publish('apLog', null, log);
}
+
+ public publishAdminStream = (userId: ID, type: string, value?: any): void => {
+ this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
+ }
}
const publisher = new Publisher();
@@ -107,3 +111,4 @@ export const publishHybridTimelineStream = publisher.publishHybridTimelineStream
export const publishGlobalTimelineStream = publisher.publishGlobalTimelineStream;
export const publishHashtagStream = publisher.publishHashtagStream;
export const publishApLogStream = publisher.publishApLogStream;
+export const publishAdminStream = publisher.publishAdminStream;