Merge branch 'develop' into math-block

2 files changed, 18 insertions, 0 deletions

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
 };