Merge branch 'alexemanuelol:master' into vendor

alexemanuelol · Sep 23, 2024 · 778b1d3 · 778b1d3
2 parents 56f253d + ed50284
commit 778b1d3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/src/util/FcmListener.js b/src/util/FcmListener.js
@@ -68,10 +68,33 @@ module.exports = async (client, guild) => {
     client.fcmListeners[guild.id].on('ON_DATA_RECEIVED', (data) => {
         const appData = data.appData;
 
+        if (!appData) {
+            client.log('FCM Host', `GuildID: ${guild.id}, SteamID: ${hoster}, appData could not be found.`)
+            return;
+        }
+
         const title = appData.find(item => item.key === 'title')?.value;
         const message = appData.find(item => item.key === 'message')?.value;
         const channelId = appData.find(item => item.key === 'channelId')?.value;
-        const body = JSON.parse(appData.find(item => item.key === 'body')?.value);
+
+        if (!channelId) {
+            client.log('FCM Host', `GuildID: ${guild.id}, SteamID: ${hoster}, channelId could not be found.`)
+            return;
+        }
+
+        const bodyCheck = appData.find(item => item.key === 'body');
+
+        if (!bodyCheck) {
+            client.log('FCM Host', `GuildID: ${guild.id}, SteamID: ${hoster}, body could not be found.`)
+            return;
+        }
+
+        const body = JSON.parse(bodyCheck.value);
+
+        if (!body.type) {
+            client.log('FCM Host', `GuildID: ${guild.id}, SteamID: ${hoster}, body type could not be found.`)
+            return;
+        }
 
         switch (channelId) {
             case 'pairing': {

diff --git a/src/util/FcmListenerLite.js b/src/util/FcmListenerLite.js
@@ -65,10 +65,33 @@ module.exports = async (client, guild, steamId) => {
     client.fcmListenersLite[guild.id][steamId].on('ON_DATA_RECEIVED', (data) => {
         const appData = data.appData;
 
+        if (!appData) {
+            client.log('FCM LITE', `GuildID: ${guild.id}, SteamID: ${hoster}, appData could not be found.`)
+            return;
+        }
+
         const title = appData.find(item => item.key === 'title')?.value;
         const message = appData.find(item => item.key === 'message')?.value;
         const channelId = appData.find(item => item.key === 'channelId')?.value;
-        const body = JSON.parse(appData.find(item => item.key === 'body')?.value);
+
+        if (!channelId) {
+            client.log('FCM LITE', `GuildID: ${guild.id}, SteamID: ${hoster}, channelId could not be found.`)
+            return;
+        }
+
+        const bodyCheck = appData.find(item => item.key === 'body');
+
+        if (!bodyCheck) {
+            client.log('FCM LITE', `GuildID: ${guild.id}, SteamID: ${hoster}, body could not be found.`)
+            return;
+        }
+
+        const body = JSON.parse(bodyCheck.value);
+
+        if (!body.type) {
+            client.log('FCM LITE', `GuildID: ${guild.id}, SteamID: ${hoster}, body type could not be found.`)
+            return;
+        }
 
         switch (channelId) {
             case 'pairing': {