summaryrefslogtreecommitdiff
path: root/src/server/api/stream
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-04-02 13:00:42 +0900
committerGitHub <noreply@github.com>2018-04-02 13:00:42 +0900
commit0781c0886e85275c654f3d2d5a141118526d62ea (patch)
treed32620bf206288b204060672a0088b4b0c7fa5eb /src/server/api/stream
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
parentAbolish common and misc directories (diff)
downloadmisskey-0781c0886e85275c654f3d2d5a141118526d62ea.tar.gz
misskey-0781c0886e85275c654f3d2d5a141118526d62ea.tar.bz2
misskey-0781c0886e85275c654f3d2d5a141118526d62ea.zip
Merge pull request #1361 from akihikodaki/misc
Abolish common and misc directories
Diffstat (limited to 'src/server/api/stream')
-rw-r--r--src/server/api/stream/othello-game.ts6
-rw-r--r--src/server/api/stream/othello.ts2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/stream/othello-game.ts b/src/server/api/stream/othello-game.ts
index 00367a824e..6eb610331c 100644
--- a/src/server/api/stream/othello-game.ts
+++ b/src/server/api/stream/othello-game.ts
@@ -2,9 +2,9 @@ import * as websocket from 'websocket';
import * as redis from 'redis';
import * as CRC32 from 'crc-32';
import OthelloGame, { pack } from '../../../models/othello-game';
-import { publishOthelloGameStream } from '../../../common/event';
-import Othello from '../../../misc/othello/core';
-import * as maps from '../../../misc/othello/maps';
+import { publishOthelloGameStream } from '../../../event';
+import Othello from '../../../othello/core';
+import * as maps from '../../../othello/maps';
import { ParsedUrlQuery } from 'querystring';
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void {
diff --git a/src/server/api/stream/othello.ts b/src/server/api/stream/othello.ts
index 1cf9a1494f..4c292056da 100644
--- a/src/server/api/stream/othello.ts
+++ b/src/server/api/stream/othello.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
import * as websocket from 'websocket';
import * as redis from 'redis';
import Matching, { pack } from '../../../models/othello-matching';
-import publishUserStream from '../../../common/event';
+import publishUserStream from '../../../event';
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
// Subscribe othello stream