v1.6.0/added support, cleanup webhook

functions/modules/cleanUpRoom.js

@@ -1,32 +0,0 @@
-const admin = require('firebase-admin');
-
-module.exports = async (roomId) => {
-  admin
-    .firestore()
-    .collection('rooms')
-    .doc(roomId)
-    .collection('messages')
-    .listDocuments()
-    .then((messages) => messages.forEach((message) => message.delete()))
-    .catch((err) => {
-      console.error(`Failed to run auto clean up (delete room messages) @ ${roomId}`, err);
-    });
-  admin
-    .firestore()
-    .collection('rooms')
-    .doc(roomId)
-    .collection('users')
-    .listDocuments()
-    .then((users) => users.forEach((user) => user.delete()))
-    .catch((err) => {
-      console.error(`Failed to run auto clean up (delete room users) @ ${roomId}`, err);
-    });
-  admin
-    .firestore()
-    .collection('rooms')
-    .doc(roomId)
-    .delete()
-    .catch((err) => {
-      console.error(`Failed to run auto clean up (delete room) @ ${roomId}`, err);
-    });
-};

functions/modules/index.js

@@ -1,6 +1,4 @@
 const authenticator = require('./authenticator');
-const cleanUpRoom = require('./cleanUpRoom');
-const scheduledCleanUp = require('./scheduledCleanUp');
 const createRoom = require('./createRoom');
 const joinRoom = require('./joinRoom');
 const sendMessage = require('./sendMessage');
@@ -21,8 +19,6 @@ module.exports = {
   updatePlayer,
   leaveRoom,
   deleteRoom,
-  scheduledCleanUp,
-  cleanUpRoom,
   timeDiff,
   tokenValidator,
   tokenRefresher,

functions/modules/scheduledCleanUp.js

@@ -1,48 +0,0 @@
-const admin = require('firebase-admin');
-const cleanUpRoom = require('./cleanUpRoom');
-
-const timeDiff = (ds1, ds2) => {
-  const d1 = new Date(ds1);
-  const d2 = new Date(ds2);
-  var diff = (d2.getTime() - d1.getTime()) / 1000;
-  diff /= 60 * 60;
-  return Math.abs(Math.round(diff));
-};
-
-module.exports = async () => {
-  const startedTime = new Date();
-  const roomList = await admin
-    .firestore()
-    .collection('rooms')
-    .listDocuments()
-    .then((rL) => rL)
-    .catch((err) => {
-      console.error(
-        `Failed to run auto clean up (get room list) @ ${new Date().toLocaleTimeString()}`,
-        err
-      );
-    });
-  roomList.forEach((roomRef) => {
-    roomRef
-      .get()
-      .then(async (roomSnap) => {
-        if (
-          // MORE THAN 24 HOURS AND NOT IN USE
-          (timeDiff(roomSnap.createTime.toDate(), startedTime) >= 24 &&
-            timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12) ||
-          // LESS THAN 24 HOURS BUT NOT IN USE
-          timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12
-        ) {
-          await cleanUpRoom(roomSnap.id);
-          console.info(`Deleted room ${roomSnap.id} from auto cleanup`);
-        }
-        return;
-      })
-      .catch((err) => {
-        console.error(
-          `Failed to run auto clean up (get room snap) @ ${new Date().toLocaleTimeString()}`,
-          err
-        );
-      });
-  });
-};

functions/modules/updatePlayer.js

@@ -2,18 +2,6 @@ const admin = require('firebase-admin');
 
 module.exports = async (req, res) => {
   const { player, roomId, uid, showChanged, userName } = JSON.parse(req.body);
-  // const statusString =
-  //   player.status === 'PLAYING'
-  //     ? 'started playing from'
-  //     : player.status === 'PAUSED'
-  //     ? 'paused at'
-  //     : player.status === 'NOT_PLAYING'
-  //     ? 'stopped at'
-  //     : 'is at';
-  // const timeString =
-  //   player.time > 3600
-  //     ? new Date(player.time * 1000).toISOString().substr(11, 8)
-  //     : new Date(player.time * 1000).toISOString().substr(14, 5);
   if (!roomId) return res.status(204).send({ message: 'Party name not sent.' });
   const [roomExists, roomData] = await admin
     .firestore()
@@ -32,17 +20,19 @@ module.exports = async (req, res) => {
     .then((userSnap) => userSnap.exists);
   if (userExists) {
     if (showChanged === true && player.showName) {
-      await admin
-        .firestore()
-        .collection('rooms')
-        .doc(roomId)
-        .collection('messages')
-        .add({
-          uid: '<system>',
-          name: '',
-          text: `${userName} changed \n${player.showName ? 'to ' + player.showName : ''}`,
-          time: new Date(),
-        });
+      if (roomData.player.showName !== player.showName) {
+        await admin
+          .firestore()
+          .collection('rooms')
+          .doc(roomId)
+          .collection('messages')
+          .add({
+            uid: '<system>',
+            name: '',
+            text: `${userName} changed \n${player.showName ? 'to ' + player.showName : ''}`,
+            time: new Date(),
+          });
+      }
     }
     if (roomData.status !== player.status) {
       await admin
@@ -56,23 +46,6 @@ module.exports = async (req, res) => {
           console.error(`Failed to update player : \n\t Room: ${roomId} \n\t ${uid}`, err);
           res.status(500).send({ message: "Uh oh party could't be synced", err });
         });
-      // await admin
-      //   .firestore()
-      //   .collection('rooms')
-      //   .doc(roomId)
-      //   .collection('messages')
-      //   .add({
-      //     uid: '<system>',
-      //     name: '',
-      //     text: `${userName} ${statusString} ${timeString}`,
-      //     time: new Date(),
-      //   })
-      //   .catch((err) => {
-      //     console.error(
-      //       `Failed to add system update player message : \n\t Room: ${roomId} \n\t ${uid}`,
-      //       err
-      //     );
-      //   });
       return res.status(200).send({ message: 'Synced party player' });
     } else {
       return res.status(208).send({ message: 'Player already up to date' });