#2020

1 files changed, 6 insertions, 10 deletions

diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts
index afa0de2ce1..c8b2d4e0b9 100644
--- a/src/server/api/streaming.ts
+++ b/src/server/api/streaming.ts
@@ -1,7 +1,6 @@
 import * as http from 'http';
 import * as websocket from 'websocket';
-import * as redis from 'redis';
-import config from '../../config';
+import Xev from 'xev';
 
 import homeStream from './stream/home';
 import localTimelineStream from './stream/local-timeline';
@@ -39,20 +38,17 @@ module.exports = (server: http.Server) => {
 			return;
 		}
 
-		// Connect to Redis
-		const subscriber = redis.createClient(
-			config.redis.port, config.redis.host);
+		const ev = new Xev();
 
-		connection.on('close', () => {
-			subscriber.unsubscribe();
-			subscriber.quit();
+		connection.once('close', () => {
+			ev.removeAllListeners();
 		});
 
 		const q = request.resourceURL.query as ParsedUrlQuery;
 		const [user, app] = await authenticate(q.i as string);
 
 		if (request.resourceURL.pathname === '/games/reversi-game') {
-			reversiGameStream(request, connection, subscriber, user);
+			reversiGameStream(request, connection, ev, user);
 			return;
 		}
 
@@ -75,7 +71,7 @@ module.exports = (server: http.Server) => {
 			null;
 
 		if (channel !== null) {
-			channel(request, connection, subscriber, user, app);
+			channel(request, connection, ev, user, app);
 		} else {
 			connection.close();
 		}