GH-910 Fix delay, improve messages in alert (queue) (#910)

vLuckyyy · web-flow · commit 870ba427ecc3 · 2025-02-15T00:39:43.000+01:00
* Update ChatSection interface and translations for alert queue removal messages

- Split `alertQueueRemoved` into `alertQueueRemovedSingle` and `alertQueueRemovedAll` to differentiate between removing a single message and removing all messages.
- Updated translations (EN and PL) to include new fields and ensure consistency.
- Adjusted command logic to use the new fields for better clarity and user feedback.

* Check for AlertService#hasBroadcast in send command.

* Fix checking AlertService#hasBroadcast.

* Follow dmk feedback.

* Follow Dr. hab Rolczi's Feedback.

* Fix.
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/alert/AlertManager.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/alert/AlertManager.java
@@ -3,12 +3,11 @@
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Service;
-import com.eternalcode.core.notice.EternalCoreBroadcast;
 import com.eternalcode.core.notice.NoticeTextType;
 import com.eternalcode.core.translation.Translation;
 import com.eternalcode.core.viewer.Viewer;
-
 import com.eternalcode.multification.notice.NoticeBroadcast;
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -58,6 +57,8 @@ void clearBroadcasts(UUID uuid) {
     }
 
     void send(UUID uuid, Duration delay) {
+        Duration actualDelay = delay.isNegative() ? Duration.ofSeconds(2) : delay;
+
         this.broadcasts.forEach((alertKey, broadcasts) -> {
             if (!alertKey.uuid().equals(uuid)) {
                 return;
@@ -67,9 +68,8 @@ void send(UUID uuid, Duration delay) {
             if (DELAYED_TYPES.contains(type)) {
                 for (int i = 0; i < broadcasts.size(); i++) {
                     NoticeBroadcast<Viewer, Translation, ?> broadcast = broadcasts.get(i);
-                    scheduler.runLater(broadcast::send, delay.multipliedBy(i));
+                    scheduler.runLater(broadcast::send, actualDelay.multipliedBy(i + 1));
                 }
-
                 return;
             }
 
@@ -81,5 +81,9 @@ void send(UUID uuid, Duration delay) {
         clearBroadcasts(uuid);
     }
 
+    boolean hasNoBroadcasts(UUID uuid) {
+        return this.broadcasts.keySet().stream().noneMatch(key -> key.uuid().equals(uuid));
+    }
+
     private record AlertKey(UUID uuid, NoticeTextType type) {}
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/alert/AlertQueueCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/alert/AlertQueueCommand.java
@@ -5,18 +5,18 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.notice.NoticeTextType;
 import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Sender;
-import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.literal.Literal;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
-import org.bukkit.entity.Player;
-
 import java.time.Duration;
 import java.util.Optional;
+import java.util.UUID;
+import org.bukkit.entity.Player;
 
-@Command(name = "alert-queue", aliases = { "alert-q" })
+@Command(name = "alert-queue", aliases = {"alert-q"})
 @Permission("eternalcore.alert.queue")
 class AlertQueueCommand {
 
@@ -35,11 +35,11 @@ class AlertQueueCommand {
     @Execute(name = "add")
     @DescriptionDocs(description = "Adds alert to the queue with specified notice type and messages", arguments = "<type> <message>")
     void executeAdd(@Sender Player sender, @Arg NoticeTextType type, @Join String text) {
-
-        this.alertService.addBroadcast(sender.getUniqueId(), type, this.noticeService.create()
-            .notice(type, translation -> translation.chat().alertMessageFormat())
-            .placeholder("{BROADCAST}", text)
-            .onlinePlayers());
+        this.alertService.addBroadcast(
+            sender.getUniqueId(), type, this.noticeService.create()
+                .notice(type, translation -> translation.chat().alertMessageFormat())
+                .placeholder("{BROADCAST}", text)
+                .onlinePlayers());
 
         this.noticeService.create()
             .player(sender.getUniqueId())
@@ -54,7 +54,9 @@ void executeRemoveAll(@Sender Player sender, @Arg NoticeTextType type, @Literal(
 
         this.noticeService.create()
             .player(sender.getUniqueId())
-            .notice(translation -> success ? translation.chat().alertQueueRemoved() : translation.chat().alertQueueEmpty())
+            .notice(translation -> success
+                ? translation.chat().alertQueueRemovedAll()
+                : translation.chat().alertQueueEmpty())
             .send();
     }
 
@@ -65,13 +67,23 @@ void executeRemove(@Sender Player sender, @Arg NoticeTextType type, @Literal("la
 
         this.noticeService.create()
             .player(sender.getUniqueId())
-            .notice(translation -> success ? translation.chat().alertQueueRemoved() : translation.chat().alertQueueEmpty())
+            .notice(translation -> success
+                ? translation.chat().alertQueueRemovedSingle()
+                : translation.chat().alertQueueEmpty())
             .send();
     }
 
     @Execute(name = "clear")
     @DescriptionDocs(description = "Clears all alerts from the queue")
     void executeClear(@Sender Player sender) {
+        if (this.alertService.hasNoBroadcasts(sender.getUniqueId())) {
+            this.noticeService.create()
+                .player(sender.getUniqueId())
+                .notice(translation -> translation.chat().alertQueueEmpty())
+                .send();
+            return;
+        }
+
         this.alertService.clearBroadcasts(sender.getUniqueId());
         this.noticeService.create()
             .player(sender.getUniqueId())
@@ -82,7 +94,17 @@ void executeClear(@Sender Player sender) {
     @Execute(name = "send")
     @DescriptionDocs(description = "Sends all alerts from the queue")
     void executeSend(@Sender Player sender, @Arg Optional<Duration> duration) {
-        this.alertService.send(sender.getUniqueId(), duration.orElse(Duration.ofSeconds(2)));
+        UUID uniqueId = sender.getUniqueId();
+
+        if (this.alertService.hasNoBroadcasts(sender.getUniqueId())) {
+            this.noticeService.create()
+                .player(uniqueId)
+                .notice(translation -> translation.chat().alertQueueEmpty())
+                .send();
+            return;
+        }
+
+        this.alertService.send(uniqueId, duration.orElse(Duration.ofSeconds(2)));
         this.noticeService.create()
             .player(sender.getUniqueId())
             .notice(translation -> translation.chat().alertQueueSent())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
@@ -76,7 +76,8 @@ interface ChatSection {
         Notice tellrawMultipleSent();
         Notice tellrawCleared();
         Notice alertQueueAdded();
-        Notice alertQueueRemoved();
+        Notice alertQueueRemovedSingle();
+        Notice alertQueueRemovedAll();
         Notice alertQueueCleared();
         Notice alertQueueEmpty();
         Notice alertQueueSent();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
@@ -223,9 +223,6 @@ public static class ENChatSection implements ChatSection {
         @Description(" ")
         public Notice disabledChatInfo = Notice.chat("<red>✘ <dark_red>Chat is currently disabled!");
 
-        @Description({" ", "# {BROADCAST} - Broadcast"})
-        public String alertMessageFormat = "<red><bold>BROADCAST: <gray>{BROADCAST}";
-
         @Description(" ")
         public Notice commandNotFound = Notice.chat("<red>✘ <dark_red>Command <red>{COMMAND} <dark_red>doesn't exists!");
 
@@ -237,10 +234,14 @@ public static class ENChatSection implements ChatSection {
         public Notice tellrawNoSaved = Notice.chat("<red>✘ <dark_red>No messages saved in queue!");
         public Notice tellrawMultipleSent = Notice.chat("<green>► <white>Messages sent! Message que has been cleared!");
         public Notice tellrawCleared = Notice.chat("<green>► <white>Message queue cleared!");
+
+        @Description({" ", "# {BROADCAST} - Broadcast"})
+        public String alertMessageFormat = "<red><bold>BROADCAST:</bold> <gray>{BROADCAST}";
         public Notice alertQueueAdded = Notice.chat("<green>► <white>Message added to the queue!");
-        public Notice alertQueueRemoved = Notice.chat("<green>► <white>Message removed from the queue!");
+        public Notice alertQueueRemovedSingle = Notice.chat("<green>► <white>Removed latest message!");
+        public Notice alertQueueRemovedAll = Notice.chat("<green>► <white>Removed all messages!");
         public Notice alertQueueCleared = Notice.chat("<green>► <white>Message queue cleared!");
-        public Notice alertQueueEmpty = Notice.chat("<red>✘ <dark_red>Error: <red>The message queue is empty!");
+        public Notice alertQueueEmpty = Notice.chat("<red>✘ <dark_red>The message queue is empty!");
         public Notice alertQueueSent = Notice.chat("<green>► <white>All messages sent from the queue!");
 
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
@@ -229,9 +229,6 @@ public static class PLChatSection implements ChatSection {
         public Notice disabledChatInfo = Notice.chat("<red>✘ <dark_red>Czat jest obecnie wyłączony!");
 
 
-        @Description({" ", "# {BROADCAST} - Ogłoszenie"})
-        public String alertMessageFormat = "<red><bold>OGŁOSZENIE: <gray>{BROADCAST}";
-
         @Description(" ")
         public Notice commandNotFound = Notice.chat("<red>✘ <dark_red>Komenda <red>{COMMAND} <dark_red>nie istnieje!");
 
@@ -243,8 +240,12 @@ public static class PLChatSection implements ChatSection {
         public Notice tellrawNoSaved = Notice.chat("<red>✘ <dark_red>Nie ma zapisanych wiadomości!");
         public Notice tellrawMultipleSent = Notice.chat("<green>► <white>Wysłano wszystkie zapisane wiadomości!");
         public Notice tellrawCleared = Notice.chat("<green>► <white>Wyczyszczono zapisane wiadomości!");
+
+        @Description({" ", "# {BROADCAST} - Ogłoszenie"})
+        public String alertMessageFormat = "<red><bold>OGŁOSZENIE:</bold> <gray>{BROADCAST}";
         public Notice alertQueueAdded = Notice.chat("<green>► <white>Dodano wiadomość do kolejki!");
-        public Notice alertQueueRemoved = Notice.chat("<green>► <white>Usunięto wiadomość z kolejki!");
+        public Notice alertQueueRemovedSingle = Notice.chat("<green>► <white>Usunięto ostatnią wiadomość z kolejki!");
+        public Notice alertQueueRemovedAll = Notice.chat("<green>► <white>Usunięto wszystkie wiadomości z kolejki!");
         public Notice alertQueueCleared = Notice.chat("<green>► <white>Wyczyszczono kolejkę wiadomości!");
         public Notice alertQueueEmpty = Notice.chat("<red>✘ <dark_red>Kolejka wiadomości jest pusta!");
         public Notice alertQueueSent = Notice.chat("<green>► <white>Wysłano wszystkie wiadomości z kolejki!");
