Exempt FBH mods from FBH command restriction

freyacodes · Feb 22, 2019 · 76c91d0 · 76c91d0
1 parent a13aba9
commit 76c91d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/FredBoat/src/main/java/fredboat/commandmeta/CommandManager.kt b/FredBoat/src/main/java/fredboat/commandmeta/CommandManager.kt
@@ -40,8 +40,8 @@ import fredboat.sentinel.RawUser
 import fredboat.shared.constant.BotConstants
 import fredboat.util.DiscordUtil
 import fredboat.util.TextUtils
-import kotlinx.coroutines.reactive.awaitSingle
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.reactive.awaitSingle
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Component
 import java.util.*
@@ -83,6 +83,7 @@ class CommandManager(private val patronageChecker: PatronageChecker, private val
         if (guild.id == BotConstants.FREDBOAT_HANGOUT_ID && DiscordUtil.isOfficialBot(selfUser.id)) {
             if (channel.id != 174821093633294338L // #spam_and_music
                     && channel.id != 217526705298866177L // #staff
+                    && invoker.roles.any { it.id == BotConstants.FBH_MODERATOR_ROLE_ID }
                     && !PermsUtil.checkPerms(PermissionLevel.ADMIN, invoker)) {
                 context.deleteMessage()
                 val response = context.replyWithNameMono(

diff --git a/Shared/src/main/java/fredboat/shared/constant/BotConstants.java b/Shared/src/main/java/fredboat/shared/constant/BotConstants.java
@@ -36,6 +36,7 @@ public class BotConstants {
     public static final long CUTTING_EDGE_BOT_ID = 341924447139135488L;
 
     public static final long FREDBOAT_HANGOUT_ID = 174820236481134592L;
+    public static final long FBH_MODERATOR_ROLE_ID = 242377373947920384L;
     public static final Color FREDBOAT_COLOR = new Color(28, 191, 226); //#1CBFE2
 
     public static final String FREDBOAT_URL = "https://fredboat.com";