From 040f05d3f3894a5b4dd8509be3500d4777a0eb73 Mon Sep 17 00:00:00 2001
From: Philipp Heuer <git@philippheuer.me>
Date: Fri, 11 Oct 2019 19:24:54 +0200
Subject: [PATCH] chore: detect permissions solely on badges

Thats the official way to detect permissions right now.
---
 .../twitch4j/common/util/TwitchUtils.java     | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

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
index cce8c3689..b3e2f8e52 100644
--- a/common/src/main/java/com/github/twitch4j/common/util/TwitchUtils.java
+++ b/common/src/main/java/com/github/twitch4j/common/util/TwitchUtils.java
@@ -24,7 +24,7 @@ public static Set<CommandPermission> getPermissionsFromTags(Map<String, Object>
                 }
             }
 
-            // - Broadcaster
+            // Broadcaster
             if (badges.containsKey("broadcaster")) {
                 permissionSet.add(CommandPermission.BROADCASTER);
                 permissionSet.add(CommandPermission.MODERATOR);
@@ -33,6 +33,10 @@ public static Set<CommandPermission> getPermissionsFromTags(Map<String, Object>
             if (badges.containsKey("premium")) {
                 permissionSet.add(CommandPermission.PRIME_TURBO);
             }
+            // Moderator
+            if (badges.containsKey("moderator")) {
+                permissionSet.add(CommandPermission.MODERATOR);
+            }
             // Partner
             if (badges.containsKey("partner")) {
                 permissionSet.add(CommandPermission.PARTNER);
@@ -41,32 +45,40 @@ public static Set<CommandPermission> getPermissionsFromTags(Map<String, Object>
             if (badges.containsKey("vip")) {
                 permissionSet.add(CommandPermission.VIP);
             }
+            // Turbo
+            if (badges.containsKey("turbo")) {
+                permissionSet.add(CommandPermission.PRIME_TURBO);
+            }
             // Twitch Staff
             if (badges.containsKey("staff")) {
                 permissionSet.add(CommandPermission.TWITCHSTAFF);
             }
+            // Subscriber
+            if(badges.containsKey("subscriber")) {
+                permissionSet.add(CommandPermission.SUBSCRIBER);
+            }
+            // SubGifter
+            if(badges.containsKey("sub-gifter")) {
+                permissionSet.add(CommandPermission.SUBGIFTER);
+            }
             // Founder
             if(badges.containsKey("founder")) {
                 permissionSet.add(CommandPermission.FOUNDER);
                 permissionSet.add(CommandPermission.SUBSCRIBER);
+
+                // also contains info about the tier if needed
+                /*
+                if (badges.get("founder").equals("0")) {
+                    // Tier 1 Founder
+                } else if (badges.get("founder").equals("1")) {
+                    // Tier 2 Founder
+                } else if (badges.get("founder").equals("2")) {
+                    // Tier 3 Founder
+                }
+                */
             }
         }
-        // Moderator
-        if (tags.containsKey("mod") && tags.get("mod").equals("1")) {
-            permissionSet.add(CommandPermission.MODERATOR);
-        }
-        // Twitch Turbo
-        if (tags.containsKey("turbo") && tags.get("turbo").equals("1")) {
-            permissionSet.add(CommandPermission.PRIME_TURBO);
-        }
-        // Subscriber
-        if (tags.containsKey("subscriber") && tags.get("subscriber").equals("1")) {
-            permissionSet.add(CommandPermission.SUBSCRIBER);
-        }
-        // Sub Gifter
-        if (tags.containsKey("sub-gifter") && tags.get("sub-gifter").equals("1")) {
-            permissionSet.add(CommandPermission.SUBGIFTER);
-        }
+
         // Everyone
         permissionSet.add(CommandPermission.EVERYONE);