Merge branch 'develop'

2 files changed, 4 insertions, 7 deletions

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;
 	}
 
diff --git a/src/server/api/stream/channels/games/reversi-game.ts b/src/server/api/stream/channels/games/reversi-game.ts
index 7c13666c51..e600179480 100644
--- a/src/server/api/stream/channels/games/reversi-game.ts
+++ b/src/server/api/stream/channels/games/reversi-game.ts
@@ -302,16 +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 (game.crc32 == null) return;
-
-		if (crc32 !== game.crc32) {
+		if (crc32.toString() !== game.crc32) {
 			this.send('rescue', await ReversiGames.pack(game, this.user));
 		}
 	}