Merge branch 'pending' into master

CyaOnDaNet · Nov 7, 2020 · 34b0200 · 34b0200
2 parents bef47f6 + f9ac9c8
commit 34b0200
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -365,7 +365,7 @@ var tautulliCheck = schedule.scheduleJob('0 */2 * * * *', async function() {
             let userToModify = client.guilds.cache.get(userList.guild).members.resolve(userList.discordUserID);
             var bypass = false;
 
-            if (userToModify === undefined) {
+            if (userToModify === undefined || userToModify === null) {
         			// User no longer exists in the Discord Server, we can't modify it at all so skip over them
         			continue;
         		}

diff --git a/src/functions/processHook.js b/src/functions/processHook.js
@@ -416,7 +416,7 @@ module.exports = async(data) => {
         let guildSettings = client.getGuildSettings.get(userList.guild);
         var bypass = true;
 
-        if (userToModify === undefined) {
+        if (userToModify === undefined || userToModify === null) {
     			// User no longer exists in the Discord Server, we can't modify it at all so skip over them
     			continue;
     		}
@@ -475,7 +475,7 @@ module.exports = async(data) => {
         let guildSettings = client.getGuildSettings.get(userList.guild);
         var bypass = true;
 
-        if (userToModify === undefined) {
+        if (userToModify === undefined || userToModify === null) {
     			// User no longer exists in the Discord Server, we can't modify it at all so skip over them
     			continue;
     		}
@@ -543,7 +543,7 @@ module.exports = async(data) => {
         let userToModify = client.guilds.cache.get(userList.guild).members.resolve(userList.discordUserID);
         var bypass = false;
 
-        if (userToModify === undefined) {
+        if (userToModify === undefined || userToModify === null) {
     			// User no longer exists in the Discord Server, we can't modify it at all so skip over them
     			continue;
     		}
@@ -617,7 +617,7 @@ module.exports = async(data) => {
         let userToModify = client.guilds.cache.get(userList.guild).members.resolve(userList.discordUserID);
         var bypass = false;
 
-        if (userToModify === undefined) {
+        if (userToModify === undefined || userToModify === null) {
     			// User no longer exists in the Discord Server, we can't modify it at all so skip over them
     			continue;
     		}