GH-495 AutoMessage fix (#528)

* Fixed showing messages * Update eternalcore-core/src/main/java/com/eternalcode/core/database/wrapper/AutoMessageRepositoryOrmLite.java Co-authored-by: Norbert Dejlich <[email protected]> * Use Set instead of List * fix --------- Co-authored-by: Norbert Dejlich <[email protected]>
EternalCodeTeam · Sep 14, 2023 · 3fba755 · 3fba755
1 parent e8c376a
commit 3fba755
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/NoneRepository.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/NoneRepository.java
@@ -77,8 +77,8 @@ public Completable<Blank> unIgnoreAll(UUID by) {
     }
 
     @Override
-    public Completable<List<UUID>> findReceivers(List<UUID> onlineUniqueIds) {
-        return Completable.completed(Collections.emptyList());
+    public Completable<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
+        return Completable.completed(Collections.emptySet());
     }
 
     @Override

diff --git a/...ore/src/main/java/com/eternalcode/core/database/wrapper/AutoMessageRepositoryOrmLite.java b/...ore/src/main/java/com/eternalcode/core/database/wrapper/AutoMessageRepositoryOrmLite.java
@@ -10,9 +10,12 @@
 import panda.std.reactive.Completable;
 
 import java.sql.SQLException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class AutoMessageRepositoryOrmLite extends AbstractRepositoryOrmLite implements AutoMessageRepository {
 
@@ -21,7 +24,7 @@ private AutoMessageRepositoryOrmLite(DatabaseManager databaseManager, Scheduler
     }
 
     @Override
-    public Completable<List<UUID>> findReceivers(List<UUID> onlineUniqueIds) {
+    public Completable<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
         if (onlineUniqueIds.isEmpty()) {
             return Completable.completed(onlineUniqueIds);
         }
@@ -38,9 +41,21 @@ public Completable<List<UUID>> findReceivers(List<UUID> onlineUniqueIds) {
             return where.query();
         });
 
-        return wrapperList.thenApply(ignores -> ignores.stream()
-            .map(wrapper -> wrapper.uniqueId)
-            .toList());
+        return wrapperList.thenApply(ignores -> {
+            Set<UUID> ignoredIds = ignores.stream()
+                .map(wrapper -> wrapper.uniqueId)
+                .collect(Collectors.toSet());
+
+            Set<UUID> onlineUniqueIdsWithoutIngores = new HashSet<>();
+
+            for (UUID onlineUniqueId : onlineUniqueIds) {
+                if (!ignoredIds.contains(onlineUniqueId)) {
+                    onlineUniqueIdsWithoutIngores.add(onlineUniqueId);
+                }
+            }
+
+            return onlineUniqueIdsWithoutIngores;
+        });
     }
 
     @Override
@@ -52,12 +67,12 @@ public Completable<Boolean> isReceiving(UUID uniqueId) {
     public Completable<Boolean> switchReceiving(UUID uniqueId) {
         return this.selectSafe(AutoMessageIgnoreWrapper.class, uniqueId).thenCompose(optional -> {
             if (optional.isEmpty()) {
-                return this.save(AutoMessageIgnoreWrapper.class, new AutoMessageIgnoreWrapper(uniqueId)).thenApply(result -> true);
+                return this.save(AutoMessageIgnoreWrapper.class, new AutoMessageIgnoreWrapper(uniqueId)).thenApply(result -> false);
             }
 
             AutoMessageIgnoreWrapper wrapper = optional.get();
 
-            return this.delete(AutoMessageIgnoreWrapper.class, wrapper).thenApply(state -> false);
+            return this.delete(AutoMessageIgnoreWrapper.class, wrapper).thenApply(state -> true);
         });
     }
 

diff --git a/...re-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepository.java b/...re-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepository.java
@@ -2,12 +2,12 @@
 
 import panda.std.reactive.Completable;
 
-import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 public interface AutoMessageRepository {
 
-    Completable<List<UUID>> findReceivers(List<UUID> onlineUniqueIds);
+    Completable<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds);
 
     // for nearby feafure like placeholders etc
     Completable<Boolean> isReceiving(UUID uniqueId);

diff --git a/...lcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageService.java b/...lcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageService.java
@@ -13,8 +13,10 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 @FeatureDocs(name = "AutoMessage", description = "Automatically sends messages to players at a given time interval.")
 public class AutoMessageService {
@@ -42,9 +44,9 @@ public Completable<Boolean> switchReceiving(UUID uniqueId) {
     }
 
     public void broadcastNextMessage() {
-        List<UUID> onlineUniqueIds = this.server.getOnlinePlayers().stream()
+        Set<UUID> onlineUniqueIds = this.server.getOnlinePlayers().stream()
             .map(Entity::getUniqueId)
-            .toList();
+            .collect(Collectors.toSet());
 
         this.repository.findReceivers(onlineUniqueIds).then(receivers -> {
             if (receivers.isEmpty()) {