- Update isSubv3 to only use isSub when tags aren't available.

PhantomBot · Dec 24, 2020 · 1078029 · 1078029
1 parent 0dff948
commit 1078029
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/javascript-source/core/permissions.js b/javascript-source/core/permissions.js
@@ -238,7 +238,7 @@
      * @returns {boolean}
      */
     function isSub(username) {
-        return subUsers.contains(username.toLowerCase());
+        return subUsers.contains(java.util.Objects.toString(username.toLowerCase()));
     }
 
     /**
@@ -249,7 +249,20 @@
      * @returns {boolean}
      */
     function isSubv3(username, tags) {
-        return (tags != null && tags != '{}' && tags.get('subscriber').equals('1')) || isSub(username);
+        if (tags != null && tags != '{}') {
+            if (tags.containsKey('subscriber')) {
+                return tags.get('subscriber').equals('1');
+            } else {
+                $.consoleDebug('Used isSub without tags::' + tags);
+                return isSub(username);
+            }
+        } else {
+            $.consoleDebug('Used isSub without tags::' + tags);
+            return isSub(username);
+        }
+
+        // Only use isSub is we don't have tags, using that method is our last resource.
+        // return (tags != null && tags != '{}' && tags.get('subscriber').equals('1')) || isSub(username);
     }
 
     /**