summaryrefslogtreecommitdiff
path: root/src/server/api/stream/messaging.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-07-30 07:20:27 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-07-30 07:20:27 +0900
commit83d9730d93b976c2477808e1a6275937defff300 (patch)
tree782e1d5a8d875f469223cc34e55d619347a5afe3 /src/server/api/stream/messaging.ts
parentFix bug (diff)
downloadsharkey-83d9730d93b976c2477808e1a6275937defff300.tar.gz
sharkey-83d9730d93b976c2477808e1a6275937defff300.tar.bz2
sharkey-83d9730d93b976c2477808e1a6275937defff300.zip
#2020
Diffstat (limited to 'src/server/api/stream/messaging.ts')
-rw-r--r--src/server/api/stream/messaging.ts9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/api/stream/messaging.ts b/src/server/api/stream/messaging.ts
index 3e6c2cd509..8b352cea3c 100644
--- a/src/server/api/stream/messaging.ts
+++ b/src/server/api/stream/messaging.ts
@@ -1,16 +1,15 @@
import * as websocket from 'websocket';
-import * as redis from 'redis';
+import Xev from 'xev';
import read from '../common/read-messaging-message';
import { ParsedUrlQuery } from 'querystring';
-export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
+export default function(request: websocket.request, connection: websocket.connection, subscriber: Xev, user: any): void {
const q = request.resourceURL.query as ParsedUrlQuery;
const otherparty = q.otherparty as string;
// Subscribe messaging stream
- subscriber.subscribe(`misskey:messaging-stream:${user._id}-${otherparty}`);
- subscriber.on('message', (_, data) => {
- connection.send(data);
+ subscriber.on(`messaging-stream:${user._id}-${otherparty}`, data => {
+ connection.send(JSON.stringify(data));
});
connection.on('message', async (data) => {