From 56f6fda144654743356dbb7d4e701d0388fe5e2f Mon Sep 17 00:00:00 2001
From: Pinapelz <yukais@pinapelz.com>
Date: Sat, 27 Jan 2024 13:06:50 -0800
Subject: fix: change purge channel to occur before updating schedule - allows
 for multiple entires to be used on the same row

---
 src/main/java/Main.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main/java/Main.java')

diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 2913ff8..2342c75 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -29,8 +29,8 @@ public class Main extends ListenerAdapter{
     public void initializeBot(){
         fileDataProcessor = new FileDataProcessor();
         adminRoleId = Long.parseLong(fileDataProcessor.getField("adminRole"));
-        commandManager = new CommandManager(fileDataProcessor.getField("holodexAPIKey"), adminRoleId);
-        jdaBuilder = JDABuilder.createDefault(fileDataProcessor.getField("discordToken"));
+        commandManager = new CommandManager(fileDataProcessor.getField("HOLODEXAPIKEY"), adminRoleId);
+        jdaBuilder = JDABuilder.createDefault(fileDataProcessor.getField("DISCORDTOKEN"));
         jdaBuilder.addEventListeners(commandManager);
         jdaBuilder.addEventListeners(this);
         try {
@@ -49,14 +49,18 @@ public class Main extends ListenerAdapter{
             try {
                 System.out.println("Refreshing upcoming channels");
                 List<OrgChannelTuple> refreshChannels = fileDataProcessor.getRefreshChannels();
+                List<Long> usedChannels = fileDataProcessor.getUsedChannels();
+                for (Long channelId : usedChannels) {
+                    System.out.println("Purging channel " + channelId);
+                    jda.getTextChannelById(channelId).purgeMessages(
+                            jda.getTextChannelById(channelId).getIterableHistory().complete());
+                }
                 if (refreshChannels.size() == 0) {
                     System.out.println("No channels to refresh");
                     return;
                 }
                 for (OrgChannelTuple orgChannelTuple : refreshChannels) {
                     System.out.println("Refreshing " + orgChannelTuple.getType() + " " + orgChannelTuple.getName());
-                    jda.getTextChannelById(orgChannelTuple.getDiscordChannelId()).purgeMessages(
-                            jda.getTextChannelById(orgChannelTuple.getDiscordChannelId()).getIterableHistory().complete());
                     List<MessageEmbed> messageEmbeds = commandManager.updateUpcomingChannel(orgChannelTuple.getName(), orgChannelTuple.getType());
                     if (messageEmbeds.size() == 0) {
                         continue;
-- 
cgit v1.2.3