v1.7.6/release

- website optimization - new assets - server catches
2020-09-17 20:48:21 -04:00
parent 3d88da3c2b
commit 2288ca699c
33 changed files with 309 additions and 115 deletions
@@ -2,39 +2,43 @@ const admin = require('firebase-admin');

 module.exports = async (req, res) => {
  console.log('Requested Leave - UID - ', req.params.uid, '\n\tRoom - ', req.params.rid);
-  if (req.params.uid === 'undefined') return res.status(400).send({ message: 'No UID' });
-  if (req.params.rid === 'undefined') return res.status(400).send({ message: 'No Party Name' });
-  const userName = await admin
-    .firestore()
-    .collection('rooms')
-    .doc(req.params.rid)
-    .collection('users')
-    .doc(req.params.uid)
-    .get()
-    .then((userSnap) => userSnap.data().name);
-  await admin
-    .firestore()
-    .collection('rooms')
-    .doc(req.params.rid)
-    .collection('users')
-    .doc(req.params.uid)
-    .delete()
-    .catch((err) =>
-      console.error(
-        `Failed to remove user from party : \n\t Room: ${req.params.rid} \n\t User: ${req.params.uid}`,
-        err
-      )
-    );
-  admin
-    .firestore()
-    .collection('rooms')
-    .doc(req.params.rid)
-    .collection('messages')
-    .add({
-      uid: '<system>',
-      time: new Date(),
-      name: '',
-      text: `${userName} left the party.`,
-    });
-  res.status(200).send({ message: 'Left the party' });
+  if (req.params.uid === 'undefined') {
+    return res.status(400).send({ message: 'No UID' });
+  } else if (req.params.rid === 'undefined') {
+    return res.status(400).send({ message: 'No Party Name' });
+  } else {
+    const userName = await admin
+      .firestore()
+      .collection('rooms')
+      .doc(req.params.rid)
+      .collection('users')
+      .doc(req.params.uid)
+      .get()
+      .then((userSnap) => userSnap.data().name);
+    await admin
+      .firestore()
+      .collection('rooms')
+      .doc(req.params.rid)
+      .collection('users')
+      .doc(req.params.uid)
+      .delete()
+      .catch((err) =>
+        console.error(
+          `Failed to remove user from party : \n\t Room: ${req.params.rid} \n\t User: ${req.params.uid}`,
+          err
+        )
+      );
+    admin
+      .firestore()
+      .collection('rooms')
+      .doc(req.params.rid)
+      .collection('messages')
+      .add({
+        uid: '<system>',
+        time: new Date(),
+        name: '',
+        text: `${userName} left the party.`,
+      });
+    return res.status(200).send({ message: 'Left the party' });
+  }
 };