Change klippy window behavour, Fix user management behavour, clean up search server page

server/src/routes/servers.ts

@@ -4,6 +4,7 @@ import { ServerPayload, JoinRequestPayload } from '../cqrs/types';
 import {
   getAllPublicServers,
   getServerById,
+  getUserById,
   upsertServer,
   deleteServer,
   createJoinRequest,
@@ -13,6 +14,16 @@ import { notifyServerOwner } from '../websocket/broadcast';
 
 const router = Router();
 
+async function enrichServer(server: ServerPayload) {
+  const owner = await getUserById(server.ownerId);
+
+  return {
+    ...server,
+    ownerName: owner?.displayName,
+    userCount: server.currentUsers
+  };
+}
+
 router.get('/', async (req, res) => {
   const { q, tags, limit = 20, offset = 0 } = req.query;
 
@@ -37,7 +48,9 @@ router.get('/', async (req, res) => {
 
   results = results.slice(Number(offset), Number(offset) + Number(limit));
 
-  res.json({ servers: results, total, limit: Number(limit), offset: Number(offset) });
+  const enrichedResults = await Promise.all(results.map((server) => enrichServer(server)));
+
+  res.json({ servers: enrichedResults, total, limit: Number(limit), offset: Number(offset) });
 });
 
 router.post('/', async (req, res) => {