[Fix] await issue and generic error

ptkdev · Nov 6, 2021 · 94a741f · 94a741f
1 parent 8950306
commit 94a741f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/app/core/bot.ts b/app/core/bot.ts
@@ -18,12 +18,16 @@ import logger from "@app/functions/utils/logger";
 
 	await db.connection.connectDB();
 
-	await commands.quit();
-	await commands.start();
-	await commands.about();
-	await commands.settings();
-	await commands.privacy();
-	await commands.hears();
+	try {
+		await commands.quit();
+		await commands.start();
+		await commands.about();
+		await commands.settings();
+		await commands.privacy();
+		await commands.hears();
+	} catch (error) {
+		logger.error(JSON.stringify(error || ""), "generic error: ");
+	}
 
 	await commands.launch();
 })();

diff --git a/app/functions/api/database/about.ts b/app/functions/api/database/about.ts
@@ -100,7 +100,7 @@ const get = async (search: Record<string, number | string | boolean>): Promise<A
 			}
 		});
 
-		return about || new query().toJSON();
+		return (await about) || new query().toJSON();
 	} catch (error: any) {
 		logger.error(JSON.stringify(error || ""), "about.ts:get()");
 	}

diff --git a/app/functions/api/database/settings.ts b/app/functions/api/database/settings.ts
@@ -94,7 +94,7 @@ const get = async (search: Record<string, number | string | boolean>): Promise<S
 			}
 		});
 
-		return settings || new query().toJSON();
+		return (await settings) || new query().toJSON();
 	} catch (error: any) {
 		logger.error(JSON.stringify(error || ""), "settings.ts:get()");
 	}

diff --git a/app/functions/api/database/users.ts b/app/functions/api/database/users.ts
@@ -97,7 +97,7 @@ const get = async (search: Record<string, number | string | boolean>): Promise<T
 			}
 		});
 
-		return user || new query().toJSON();
+		return (await user) || new query().toJSON();
 	} catch (error: any) {
 		logger.error(JSON.stringify(error || ""), "users.ts:get()");
 	}