feat(badges): sort by time

2 files changed, 16 insertions, 1 deletions

diff --git a/src/lib/Database/badges.ts b/src/lib/Database/badges.ts
index 9f857469..d56fa27a 100644
--- a/src/lib/Database/badges.ts
+++ b/src/lib/Database/badges.ts
@@ -1,3 +1,4 @@
+import { databaseTimeToDate } from '$lib/Utility/time';
 import { Database } from 'bun:sqlite';
 
 export interface Badge {
@@ -28,7 +29,13 @@ database
 export const getUserBadges = (userId: number): Badge[] => {
 	return database
 		.query('SELECT * FROM user_badges WHERE user_id = $userId')
-		.all({ $userId: String(userId) }) as Badge[];
+		.all({ $userId: String(userId) })
+		.sort((a, b) =>
+			databaseTimeToDate((a as Badge).time ?? '').getTime() >
+			databaseTimeToDate((b as Badge).time ?? '').getTime()
+				? -1
+				: 1
+		) as Badge[];
 };
 
 export const addUserBadge = (userId: number, badge: Badge) => {
diff --git a/src/lib/Utility/time.ts b/src/lib/Utility/time.ts
new file mode 100644
index 00000000..e1f8d0c6
--- /dev/null
+++ b/src/lib/Utility/time.ts
@@ -0,0 +1,8 @@
+export const databaseTimeToDate = (time: string) =>
+	new Date(new Date(time + 'Z').getTime() + new Date(time + 'Z').getTimezoneOffset() * 60000);
+
+export const dateToDatabaseTime = (date: Date) =>
+	date
+		.toISOString()
+		.replace('T', ' ')
+		.replace(/\.\d+Z$/, '');