Fix

megoRU · Nov 7, 2024 · c24d250 · c24d250
1 parent 42a2d54
commit c24d250
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 10 deletions.
diff --git a/src/main/java/main/config/BotStart.java b/src/main/java/main/config/BotStart.java
@@ -108,14 +108,14 @@ public synchronized void startBot() {
             //Устанавливаем языки
             setLanguages();
             getLocalizationFromDB();
+            getSchedulingFromDB();
 
             List<GatewayIntent> intents = Arrays.asList(
-                            GatewayIntent.GUILD_MEMBERS,
-                            GatewayIntent.GUILD_MESSAGES,
-                            GatewayIntent.GUILD_EMOJIS_AND_STICKERS,
-                            GatewayIntent.GUILD_MESSAGE_REACTIONS,
-                            GatewayIntent.DIRECT_MESSAGES,
-                            GatewayIntent.DIRECT_MESSAGE_TYPING);
+                    GatewayIntent.GUILD_MEMBERS,
+                    GatewayIntent.GUILD_MESSAGES,
+                    GatewayIntent.GUILD_MESSAGE_REACTIONS,
+                    GatewayIntent.DIRECT_MESSAGES,
+                    GatewayIntent.DIRECT_MESSAGE_TYPING);
 
             jdaBuilder.disableCache(
                     CacheFlag.ACTIVITY,
@@ -156,6 +156,20 @@ public synchronized void startBot() {
         }
     }
 
+    private void getSchedulingFromDB() {
+        try {
+            List<Scheduling> schedulingList = schedulingRepository.findAll();
+            GiveawayRegistry instance = GiveawayRegistry.getInstance();
+
+            for (Scheduling scheduling : schedulingList) {
+                Long guildId = scheduling.getGuildId();
+                instance.putScheduling(guildId, scheduling);
+            }
+        } catch (Exception e) {
+            LOGGER.log(Level.SEVERE, e.getMessage(), e);
+        }
+    }
+
     private void updateSlashCommands() {
         try {
             CommandListUpdateAction commands = jda.updateCommands();
@@ -402,8 +416,10 @@ private void topGGAndStatcord() {
 
     @Scheduled(fixedDelay = 5, initialDelay = 5, timeUnit = TimeUnit.SECONDS)
     private void scheduleStartGiveaway() {
-        List<Scheduling> allScheduling = schedulingRepository.findAll();
-        for (Scheduling scheduling : allScheduling) {
+        GiveawayRegistry instance = GiveawayRegistry.getInstance();
+        Collection<Scheduling> scheduledGiveaways = instance.getScheduledGiveaways();
+
+        for (Scheduling scheduling : scheduledGiveaways) {
             Timestamp localTime = new Timestamp(System.currentTimeMillis());
 
             if (localTime.after(scheduling.getDateCreateGiveaway())) {
@@ -426,7 +442,6 @@ private void scheduleStartGiveaway() {
                                     giveawayRepositoryService,
                                     updateController);
 
-                            GiveawayRegistry instance = GiveawayRegistry.getInstance();
                             instance.putGift(scheduling.getGuildId(), giveaway);
 
                             String formattedDate = null;

diff --git a/src/main/java/main/core/events/CancelCommand.java b/src/main/java/main/core/events/CancelCommand.java
@@ -41,6 +41,7 @@ public void cancel(@NotNull SlashCommandInteractionEvent event) {
             schedulingRepository.deleteById(guildId);
             instance.removeGuildFromGiveaway(guildId);
             cancel.setDescription(cancelSchedulingGiveaway);
+            instance.removeScheduling(guildId);
         } else if (activeGiveaways != null) {
             String cancelGiveaway = jsonParsers.getLocale("cancel_giveaway", guildId);
 
@@ -49,7 +50,6 @@ public void cancel(@NotNull SlashCommandInteractionEvent event) {
             cancel.setDescription(cancelGiveaway);
         } else {
             String cancelSchedulingGiveaway = jsonParsers.getLocale("no_active_giveaway", guildId);
-
             cancel.setDescription(cancelSchedulingGiveaway);
         }
 

diff --git a/src/main/java/main/core/events/SchedulingCommand.java b/src/main/java/main/core/events/SchedulingCommand.java
@@ -1,5 +1,6 @@
 package main.core.events;
 
+import main.giveaway.GiveawayRegistry;
 import main.giveaway.GiveawayUtils;
 import main.jsonparser.JSONParsers;
 import main.model.entity.ActiveGiveaways;
@@ -127,6 +128,9 @@ public void scheduling(@NotNull SlashCommandInteractionEvent event) {
 
             schedulingRepository.save(scheduling);
 
+            GiveawayRegistry instance = GiveawayRegistry.getInstance();
+            instance.putScheduling(guildId, scheduling);
+
             String scheduleEnd = jsonParsers.getLocale("schedule_end", guildId);
             long timeStart = Objects.requireNonNull(timeProcessor(startTime)).getTime() / 1000;
             if (endTime != null) {

diff --git a/src/main/java/main/giveaway/GiveawayRegistry.java b/src/main/java/main/giveaway/GiveawayRegistry.java
@@ -1,15 +1,18 @@
 package main.giveaway;
 
+import main.model.entity.Scheduling;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GiveawayRegistry {
 
     //Возвращает GiveawayData по long id
     private static final Map<Long, Giveaway> giveawayMap = new ConcurrentHashMap<>();
+    private static final Map<Long, Scheduling> schedulingMap = new ConcurrentHashMap<>();
     private static volatile GiveawayRegistry giveawayRegistry;
 
     private GiveawayRegistry() {
@@ -30,6 +33,18 @@ public Collection<Giveaway> getAllGiveaway() {
         return giveawayMap.values();
     }
 
+    public Collection<Scheduling> getScheduledGiveaways() {
+        return schedulingMap.values();
+    }
+
+    public void removeScheduling(long guildId) {
+        schedulingMap.remove(guildId);
+    }
+
+    public void putScheduling(long guildId, Scheduling scheduling) {
+        schedulingMap.put(guildId, scheduling);
+    }
+
     @Nullable
     public Giveaway getGiveaway(long guildId) {
         return giveawayMap.get(guildId);