feat: add artist, moment, accessibility badges (#575)

twitch4j · May 22, 2022 · f573191 · f573191
1 parent 41905a4
commit f573191
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/common/src/main/java/com/github/twitch4j/common/enums/CommandPermission.java b/common/src/main/java/com/github/twitch4j/common/enums/CommandPermission.java
@@ -58,6 +58,26 @@ public enum CommandPermission {
      */
     PREDICTIONS_PINK,
 
+    /**
+     * Watching without audio (user-selected)
+     */
+    NO_AUDIO,
+
+    /**
+     * Watching without video (user-selected)
+     */
+    NO_VIDEO,
+
+    /**
+     * Earned for being a part of at least 1 moment on a channel
+     */
+    MOMENTS,
+
+    /**
+     * Artist on this Channel
+     */
+    ARTIST,
+
     /**
      * VIP
      */

diff --git a/common/src/main/java/com/github/twitch4j/common/util/TwitchUtils.java b/common/src/main/java/com/github/twitch4j/common/util/TwitchUtils.java
@@ -70,19 +70,19 @@ public static Set<CommandPermission> getPermissionsFromTags(@NonNull Map<String,
                 permissionSet.add(CommandPermission.PRIME_TURBO);
             }
             // Twitch Staff
-            if (badges.containsKey("staff")) {
+            if (badges.containsKey("staff") || badges.containsKey("admin")) {
                 permissionSet.add(CommandPermission.TWITCHSTAFF);
             }
             // Subscriber
             if (badges.containsKey("subscriber")) {
                 permissionSet.add(CommandPermission.SUBSCRIBER);
             }
             // SubGifter
-            if (badges.containsKey("sub-gifter")) {
+            if (badges.containsKey("sub-gifter") || badges.containsKey("sub-gift-leader")) {
                 permissionSet.add(CommandPermission.SUBGIFTER);
             }
             // Cheerer
-            if (badges.containsKey("bits") || badges.containsKey("bits-leader")) {
+            if (badges.containsKey("bits") || badges.containsKey("bits-leader") || badges.containsKey("anonymous-cheerer")) {
                 permissionSet.add(CommandPermission.BITS_CHEERER);
             }
             // Founder
@@ -118,6 +118,21 @@ public static Set<CommandPermission> getPermissionsFromTags(@NonNull Map<String,
                     permissionSet.add(CommandPermission.PREDICTIONS_PINK);
                 }
             }
+            // Accessibility
+            if (badges.containsKey("no_audio")) {
+                permissionSet.add(CommandPermission.NO_AUDIO);
+            }
+            if (badges.containsKey("no_video")) {
+                permissionSet.add(CommandPermission.NO_VIDEO);
+            }
+            // Present for Channel Moment
+            if (badges.containsKey("moments")) {
+                permissionSet.add(CommandPermission.MOMENTS);
+            }
+            // Channel Emote Artist
+            if (badges.containsKey("artist-badge")) {
+                permissionSet.add(CommandPermission.ARTIST);
+            }
         }
 
         if (userId != null && botOwnerIds != null && botOwnerIds.contains(userId))