Merge branch 'main' into unread-badge

Author: aster-void

Makefile

@@ -16,7 +16,7 @@ setup-ci:
 	make generate-sql
 
 sync: sync-server sync-web sync-root sync-common
-	lefthook install || true
+	bunx lefthook install || true
 	@echo '----------------------------------------------------------------------------------------------------------'
 	@echo '| Most work is done. now running prisma-generate-sql (which might fail if .env.dev is not set configured)|'
 	@echo '----------------------------------------------------------------------------------------------------------'

flake.nix

@@ -28,13 +28,12 @@
             pkg-config
             openssl
             lefthook
-            pkgs.prisma
+            pkgs.
           ] ++ [
             rust-pkgs
           ];
           shellHook = ''
             export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.stdenv.cc.cc.lib}/lib
-            lefthook install
           '' + prisma.shellHook;
         };
       });

server/src/database/chat.ts

@@ -71,12 +71,20 @@ export async function getOverview(
       return overview;
     });
 
-    return Ok([
+    const overview = [
       ...matchingOverview,
       ...senderOverview,
       ...receiverOverview,
       ...shared,
-    ]);
+    ];
+
+    const sortedOverviewByTime = overview.sort((a, b) => {
+      const dateA = a.lastMsg?.createdAt ? a.lastMsg.createdAt.getTime() : 0;
+      const dateB = b.lastMsg?.createdAt ? b.lastMsg.createdAt.getTime() : 0;
+      return dateB - dateA;
+    });
+
+    return Ok([...sortedOverviewByTime]);
   } catch (e) {
     return Err(e);
   }