Merge branch 'main' of https://github.com/lopatoj/hackrice14

Allen-Mikhailov · Sep 22, 2024 · 9d52bc1 · 9d52bc1
2 parents 2c5f0c0 + 12be154
commit 9d52bc1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/client/src/main.tsx b/client/src/main.tsx
@@ -27,7 +27,6 @@ function App()
           <Route path="/" element={<Home/>} />
           <Route path="/userinfo" element={<Userinfo/>} />
           <Route path="/catalog" element={<Catalog/>} />
-          <Route path="/chat" element={<Chat/>} />
           <Route path="/chat/:id" element={<Chat/>} />
           <Route path="/chatSelect" element={<ChatSelect/>} />
         </Routes>

diff --git a/server/src/routers/chats.ts b/server/src/routers/chats.ts
@@ -34,6 +34,8 @@ chats.get("/", async (_req, res: Response<Chat[], { user: UserData }>) => {
 chats.get("/:id", async (req, res: Response<Chat | string, { user: UserData }>) => {
   let chat;
 
+  console.log(req.params.id);
+
   if (!res.locals.user.matches.map(m => m.chat_id).includes(req.params.id) || (chat = await collection.findOne<Chat>({ "id": req.params.id })) === null) {
     res.status(404).send("Chat not found");
     return;

diff --git a/server/src/routers/profile.ts b/server/src/routers/profile.ts
@@ -14,7 +14,7 @@ profile.get("/me", (_req, res: Response<{}, { user: UserData }>) => {
 profile.post("/me", async (req: Request<{}, {}, Partial<{ bio: string, open_to_wave: boolean }>>, res: Response<{}, { user: UserData }>) => {
   let { bio, open_to_wave } = req.body;
   const user = res.locals.user;
-  await users.updateOne({ firebase_id: user.firebase_id }, { "$set": { bio: (bio || user.bio), open_to_wave: (open_to_wave || user.open_to_wave) } });
+  await users.updateOne({ firebase_id: user.firebase_id }, { "$set": { bio: (bio || user.bio), open_to_wave: (open_to_wave !== null ? open_to_wave : user.open_to_wave) } });
   res.json({ ...user, bio, open_to_wave });
 });