From 3dde561fe548a71f531de7096c2948426982603c Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Mon, 6 May 2019 17:28:55 +0900 Subject: Resolve #4864 (#4865) --- src/server/api/endpoints/users.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index c710706f0c..be317223b6 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -85,8 +85,8 @@ export default define(meta, async (ps, me) => { case '-follower': query.orderBy('user.followersCount', 'ASC'); break; case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break; case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break; - case '+updatedAt': query.orderBy('user.updatedAt', 'DESC'); break; - case '-updatedAt': query.orderBy('user.updatedAt', 'ASC'); break; + case '+updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'DESC'); break; + case '-updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'ASC'); break; default: query.orderBy('user.id', 'ASC'); break; } -- cgit v1.2.3-freya From 1448b11d0035ce6c02fd2b316dc666d23284ac72 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 7 May 2019 18:20:18 +0900 Subject: Clean up --- src/server/api/stream/channels/games/reversi-game.ts | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/server') diff --git a/src/server/api/stream/channels/games/reversi-game.ts b/src/server/api/stream/channels/games/reversi-game.ts index 7c13666c51..13e3f25e5b 100644 --- a/src/server/api/stream/channels/games/reversi-game.ts +++ b/src/server/api/stream/channels/games/reversi-game.ts @@ -308,9 +308,6 @@ export default class extends Channel { if (!game.isStarted) return; - // 互換性のため - if (game.crc32 == null) return; - if (crc32 !== game.crc32) { this.send('rescue', await ReversiGames.pack(game, this.user)); } -- cgit v1.2.3-freya From 70123805e10a2350883e7f96cccea6e9ab9a1dbc Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 7 May 2019 18:23:12 +0900 Subject: Fix #4866 --- src/client/app/common/views/components/games/reversi/reversi.game.vue | 1 + src/server/api/stream/channels/games/reversi-game.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue index bd0401f785..315fb464b2 100644 --- a/src/client/app/common/views/components/games/reversi/reversi.game.vue +++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue @@ -200,6 +200,7 @@ export default Vue.extend({ // 通信を取りこぼしてもいいように定期的にポーリングさせる if (this.game.isStarted && !this.game.isEnded) { this.pollingClock = setInterval(() => { + if (this.game.isEnded) return; const crc32 = CRC32.str(this.logs.map(x => x.pos.toString()).join('')); this.connection.send('check', { crc32: crc32 diff --git a/src/server/api/stream/channels/games/reversi-game.ts b/src/server/api/stream/channels/games/reversi-game.ts index 13e3f25e5b..e600179480 100644 --- a/src/server/api/stream/channels/games/reversi-game.ts +++ b/src/server/api/stream/channels/games/reversi-game.ts @@ -302,13 +302,13 @@ export default class extends Channel { } @autobind - private async check(crc32: string) { + private async check(crc32: string | number) { const game = await ReversiGames.findOne(this.gameId!); if (game == null) throw new Error('game not found'); if (!game.isStarted) return; - if (crc32 !== game.crc32) { + if (crc32.toString() !== game.crc32) { this.send('rescue', await ReversiGames.pack(game, this.user)); } } -- cgit v1.2.3-freya