v1.6.0/added support, cleanup webhook

functions/app.js

@@ -7,7 +7,8 @@ const cors = require('cors');
 // WEBHOOKS
 const webhooks = express();
 webhooks.use(cors({ origin: true }));
-webhooks.all('/conferenceEnded',Webhooks.conferenceEnd);
+webhooks.all('/conferenceEnded', Webhooks.conferenceEnd);
+webhooks.all('/scheduledCleanup', Webhooks.scheduledCleanUp);
 
 // VERSION 1
 const app = express();

functions/index.js

@@ -1,4 +1,3 @@
-const FunctionModules = require('./modules/index');
 const functions = require('firebase-functions');
 const secret = require('./FirebaseSecret.json');
 const admin = require('firebase-admin');
@@ -15,9 +14,5 @@ admin.initializeApp(FIREBASE_OPTIONS);
 exports.widgets = functions.https.onRequest(REST.v1);
 // VERSION 2
 exports.widgets2 = functions.https.onRequest(REST.v2);
-
-exports.scheduledCleanUp = functions.pubsub
-  .schedule('every 60 minutes')
-  .onRun(FunctionModules.scheduledCleanUp);
-
+// WEBHOOKS
 exports.webhooks = functions.https.onRequest(REST.webhooks);

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/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' });

functions/modules2/updatePlayer.js

@@ -32,7 +32,8 @@ module.exports = async (req, res) => {
     .then((userSnap) => userSnap.exists);
   if (userExists) {
     if (showChanged === true && player.showName) {
-      await admin
+      if (player.showChanged !== roomData.player.showName) {
+        await admin
         .firestore()
         .collection('rooms')
         .doc(roomId)
@@ -43,6 +44,7 @@ module.exports = async (req, res) => {
           text: `${userName} changed \n${player.showName ? 'to ' + player.showName : ''}`,
           time: new Date(),
         });
+      }
     }
     if (roomData.status !== player.status) {
       await admin

functions/webhooks/index.js

@@ -1,5 +1,7 @@
 const conferenceEnd = require('./conferenceEnd');
+const scheduledCleanUp = require('./scheduledCleanUp');
 
 module.exports = {
     conferenceEnd,
+    scheduledCleanUp
 };

functions/webhooks/scheduledCleanUp.js

@@ -9,8 +9,9 @@ const timeDiff = (ds1, ds2) => {
   return Math.abs(Math.round(diff));
 };
 
-module.exports = async () => {
+module.exports = async (req, res) => {
   const startedTime = new Date();
+  res.status(200).send({message:'Started processing'});
   const roomList = await admin
     .firestore()
     .collection('rooms')
@@ -29,7 +30,7 @@ module.exports = async () => {
         if (
           // MORE THAN 24 HOURS AND NOT IN USE
           (timeDiff(roomSnap.createTime.toDate(), startedTime) >= 24 &&
-            timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12) ||
+            timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 4) ||
           // LESS THAN 24 HOURS BUT NOT IN USE
           timeDiff(roomSnap.updateTime.toDate(), startedTime) >= 12
         ) {
@@ -45,4 +46,5 @@ module.exports = async () => {
         );
       });
   });
+  return;
 };