From c7fb9849615afd79d5fe53a28d3a4bc33f2119bd Mon Sep 17 00:00:00 2001
From: Pinapelz <donaldshan1@outlook.com>
Date: Fri, 14 Apr 2023 12:05:50 -0700
Subject: Added support for a global adminRole

---
 src/main/java/Main.java                    |  4 +++-
 src/main/java/commands/CommandManager.java | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 9838c1b..c7adb6b 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -24,10 +24,12 @@ public class Main extends ListenerAdapter{
     private JDABuilder jdaBuilder;
     private FileDataProcessor fileDataProcessor;
     private CommandManager commandManager;
+    private long adminRoleId;
 
     public void initializeBot(){
         fileDataProcessor = new FileDataProcessor();
-        commandManager = new CommandManager(fileDataProcessor.getField("holodexAPIKey"));
+        adminRoleId = Long.parseLong(fileDataProcessor.getField("adminRole"));
+        commandManager = new CommandManager(fileDataProcessor.getField("holodexAPIKey"), adminRoleId);
         jdaBuilder = JDABuilder.createDefault(fileDataProcessor.getField("discordToken"));
         jdaBuilder.addEventListeners(commandManager);
         jdaBuilder.addEventListeners(this);
diff --git a/src/main/java/commands/CommandManager.java b/src/main/java/commands/CommandManager.java
index 6b15c81..ac54131 100644
--- a/src/main/java/commands/CommandManager.java
+++ b/src/main/java/commands/CommandManager.java
@@ -10,13 +10,15 @@ import vtuber.ScheduleHandler;
 import java.util.ArrayList;
 
 public class CommandManager extends ListenerAdapter {
-    ScheduleHandler scheduleHandler;
-    ScheduleMessageBuilder scb;
-    UpcomingChannelsManager ucm;
-    public CommandManager(String holodexAPIKey) {
+    private ScheduleHandler scheduleHandler;
+    private ScheduleMessageBuilder scb;
+    private UpcomingChannelsManager ucm;
+    private long adminRole;
+    public CommandManager(String holodexAPIKey, long adminRole) {
         scheduleHandler = new ScheduleHandler(holodexAPIKey);
         scb = new ScheduleMessageBuilder();
         ucm = new UpcomingChannelsManager();
+        this.adminRole = adminRole;
         System.out.println("CommandManager initialized");
     }
     @Override
@@ -113,7 +115,7 @@ public class CommandManager extends ListenerAdapter {
     }
 
     public boolean hasPermission(SlashCommandEvent e){
-        if (e.getMember().isOwner()) {
+        if (e.getMember().isOwner() || e.getMember().getRoles().contains(e.getGuild().getRoleById(adminRole))){
             return true;
         }
         return false;
-- 
cgit v1.2.3