Merge branch 'database' into databasen

data-manager/DataManager.js

@@ -76,8 +76,17 @@ class DataManager {
     }
     async getRandomCloudReplay() {
         try {
+            const [minQuery, maxQuery] = await Promise.all(["min", "max"].map(minOrMax => this.db.createQueryBuilder()
+                .select(`${minOrMax}(id)`, "value")
+                .from(CloudReplay_1.CloudReplay, "replay")
+                .getRawOne()));
+            if (!minQuery || maxQuery) {
+                return null;
+            }
+            const targetId = Math.floor((maxQuery.value - minQuery.value) * Math.random()) + minQuery.value;
             return await this.db.createQueryBuilder(CloudReplay_1.CloudReplay, "replay")
-                .orderBy("rand()")
+                .where("replay.id >= :targetId", { targetId })
+                .orderBy("replay.id", "ASC")
                 .limit(4) //there may be 4 players
                 .leftJoinAndSelect("replay.players", "player")
                 .getOne();
@@ -331,7 +340,7 @@ class DataManager {
         return user ? user.chatColor : null;
     }
     async setUserChatColor(key, color) {
-        const user = await this.getOrCreateUser(key);
+        let user = await this.getOrCreateUser(key);
         user.chatColor = color;
         return await this.saveUser(user);
     }

data-manager/DataManager.ts

@@ -98,8 +98,18 @@ export class DataManager {
 
 	async getRandomCloudReplay() {
 		try {
+			const [minQuery, maxQuery] = await Promise.all(["min", "max"].map(minOrMax => this.db.createQueryBuilder()
+				.select(`${minOrMax}(id)`, "value")
+				.from(CloudReplay, "replay")
+				.getRawOne()
+			));
+			if(!minQuery || maxQuery) {
+				return null;
+			}
+			const targetId = Math.floor((maxQuery.value - minQuery.value) * Math.random()) + minQuery.value;
 			return await this.db.createQueryBuilder(CloudReplay, "replay")
-				.orderBy("rand()")
+				.where("replay.id >= :targetId", {targetId})
+				.orderBy("replay.id", "ASC")
 				.limit(4) //there may be 4 players
 				.leftJoinAndSelect("replay.players", "player")
 				.getOne();
@@ -355,7 +365,7 @@ export class DataManager {
 		return user ? user.chatColor : null;
 	}
 	async setUserChatColor(key: string, color: string) {
-		const user = await this.getOrCreateUser(key);
+		let user = await this.getOrCreateUser(key);
 		user.chatColor = color;
 		return await this.saveUser(user);
 	}