Fix logic, rename messages

CitralFlo · CitralFlo · commit 2437624c46b4 · 2025-01-22T22:22:16.000+01:00
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleService.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleService.java
@@ -5,7 +5,7 @@
 
 public interface MsgToggleService {
 
-    CompletableFuture<Boolean> hasMsgToggledOff(UUID uuid);
+    CompletableFuture<Boolean> hasMsgToggled(UUID uuid);
 
     void toggleMsg(UUID uuid, boolean toggle);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleCommand.java
@@ -27,39 +27,43 @@ public MsgToggleCommand(MsgToggleService msgToggleService, NoticeService noticeS
         this.noticeService = noticeService;
     }
 
+    public enum STATE {
+        ON,
+        OFF
+    }
+
     @Execute
-    @DescriptionDocs(description = "Toggle private messages")
+    @DescriptionDocs(description = "Toggle receiving private messages on and off")
     public void execute(@Context Player context) {
-
-        CompletableFuture<Boolean> hasMsgToggledOff = this.msgToggleService.hasMsgToggledOff(context.getUniqueId());
+        CompletableFuture<Boolean> hasMsgToggledOff = this.msgToggleService.hasMsgToggled(context.getUniqueId());
 
         hasMsgToggledOff.thenAccept(toggledOff -> {
             if (!toggledOff) {
-                this.on(context);
+                this.toggleOff(context);
             } else {
-                this.off(context);
+                this.toggleOn(context);
             }
         });
     }
 
-    @Execute(name = "off")
-    @DescriptionDocs(description = "Enable private messages")
-    public void on(@Context Player context) {
+    @Execute(name = "on")
+    @DescriptionDocs(description = "Block incoming private messages")
+    public void toggleOn(@Context Player context) {
         this.msgToggleService.toggleMsg(context.getUniqueId(), true);
 
         this.noticeService.create()
-            .notice(translation -> translation.privateChat().msgToggleSelfOn())
+            .notice(translation -> translation.privateChat().msgToggledSelf())
             .player(context.getUniqueId())
             .send();
     }
 
-    @Execute(name = "on")
-    @DescriptionDocs(description = "Disable private messages")
-    public void off(@Context Player context) {
+    @Execute(name = "off")
+    @DescriptionDocs(description = "Unblock incoming private messages")
+    public void toggleOff(@Context Player context) {
         this.msgToggleService.toggleMsg(context.getUniqueId(), false);
 
         this.noticeService.create()
-            .notice(translation -> translation.privateChat().msgToggleSelfOff())
+            .notice(translation -> translation.privateChat().msgUntoggleSelf())
             .player(context.getUniqueId())
             .send();
     }
@@ -68,7 +72,7 @@ public void off(@Context Player context) {
     @Permission("eternalcore.msgtoggle.other")
     @DescriptionDocs(description = "Toggle private messages for other player", arguments = "<player>")
     public void other(@Context Player context, @Arg("player") Player player) {
-        CompletableFuture<Boolean> hasMsgToggledOff = this.msgToggleService.hasMsgToggledOff(player.getUniqueId());
+        CompletableFuture<Boolean> hasMsgToggledOff = this.msgToggleService.hasMsgToggled(player.getUniqueId());
 
         hasMsgToggledOff.thenAccept(toggledOff -> this.other(context, player, !toggledOff ? STATE.ON : STATE.OFF));
     }
@@ -82,17 +86,13 @@ public void other(@Context Player context, @Arg("player") Player player, @Arg("<
         this.noticeService.create()
             .notice(
                 translation -> toggle == STATE.ON ?
-                    translation.privateChat().msgTogglePlayerOn() :
-                    translation.privateChat().msgTogglePlayerOff()
+                    translation.privateChat().msgUntogglePlayer() :
+                    translation.privateChat().msgToggledPlayer()
             )
             .player(context.getUniqueId())
             .placeholder("{PLAYER}", player.getName())
             .send();
 
     }
 
-    public enum STATE {
-        ON,
-        OFF
-    }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleRepository.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleRepository.java
@@ -5,7 +5,7 @@
 
 public interface MsgToggleRepository {
 
-    CompletableFuture<Boolean> isToggledOff(UUID uuid);
+    CompletableFuture<Boolean> isToggled(UUID uuid);
 
     CompletableFuture<Void> setToggledOff(UUID uuid, boolean toggledOff);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleRepositoryOrmLite.java
@@ -20,7 +20,7 @@ private MsgToggleRepositoryOrmLite(DatabaseManager databaseManager, Scheduler sc
     }
 
     @Override
-    public CompletableFuture<Boolean> isToggledOff(UUID uuid) {
+    public CompletableFuture<Boolean> isToggled(UUID uuid) {
         return this.selectSafe(MsgToggleWrapper.class, uuid)
             .thenApply(
                 optional -> optional.map(MsgToggleWrapper::isEnabled).orElse(true)
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleServiceImpl.java
@@ -18,8 +18,8 @@ public MsgToggleServiceImpl(MsgToggleRepository msgToggleRepository) {
 
 
     @Override
-    public CompletableFuture<Boolean> hasMsgToggledOff(UUID uuid) {
-        return this.msgToggleRepository.isToggledOff(uuid);
+    public CompletableFuture<Boolean> hasMsgToggled(UUID uuid) {
+        return this.msgToggleRepository.isToggled(uuid);
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/PrivateChatServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/PrivateChatServiceImpl.java
@@ -59,8 +59,8 @@ void privateMessage(User sender, User target, String message) {
 
         UUID uniqueId = target.getUniqueId();
 
-        this.msgToggleService.hasMsgToggledOff(uniqueId).thenAccept(hasToggledOff -> {
-            if (hasToggledOff) {
+        this.msgToggleService.hasMsgToggled(uniqueId).thenAccept(hasMsgToggled -> {
+            if (hasMsgToggled) {
                 this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().msgToggledOff());
 
                 return;
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
@@ -261,10 +261,10 @@ interface PrivateChatSection {
         Notice socialSpyDisable();
 
         Notice msgToggledOff();
-        Notice msgToggleSelfOff();
-        Notice msgToggleSelfOn();
-        Notice msgTogglePlayerOff();
-        Notice msgTogglePlayerOn();
+        Notice msgToggledSelf();
+        Notice msgUntoggleSelf();
+        Notice msgToggledPlayer();
+        Notice msgUntogglePlayer();
 
         Notice ignorePlayer();
         Notice ignoreAll();
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
@@ -499,12 +499,12 @@ public static class ENPrivateSection implements PrivateChatSection {
 
         public Notice msgToggledOff = Notice.chat("<red>► <dark_red>This player has disabled private messages!");
 
-        public Notice msgToggleSelfOff = Notice.chat("<green>► <white>Private messages have been <red>disabled<white>!");
-        public Notice msgToggleSelfOn = Notice.chat("<green>► <white>Private messages have been <green>enabled<white>!");
+        public Notice msgToggledSelf = Notice.chat("<green>► <white>Private messages have been <red>disabled<white>!");
+        public Notice msgUntoggleSelf = Notice.chat("<green>► <white>Private messages have been <green>enabled<white>!");
 
         @Description("# {PLAYER} - Player")
-        public Notice msgTogglePlayerOff = Notice.chat("<green>► <white>Private messages have been disabled for <green>{PLAYER}<white>!");
-        public Notice msgTogglePlayerOn = Notice.chat("<green>► <white>Private messages have been enabled for <green>{PLAYER}<white>!");
+        public Notice msgToggledPlayer = Notice.chat("<green>► <white>Private messages have been disabled for <green>{PLAYER}<white>!");
+        public Notice msgUntogglePlayer = Notice.chat("<green>► <white>Private messages have been enabled for <green>{PLAYER}<white>!");
 
 
 
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
@@ -507,12 +507,12 @@ public static class PLPrivateChatSection implements PrivateChatSection {
 
         public Notice msgToggledOff = Notice.chat("<red>► <dark_red>Wiadomości prywatne zostały wyłączone!");
 
-        public Notice msgToggleSelfOff = Notice.chat("<green>► <white>Wiadomości prywatne zostały <red>wyłączone!");
-        public Notice msgToggleSelfOn = Notice.chat("<green>► <white>Wiadomości prywatne zostały <green>włączone!");
+        public Notice msgToggledSelf = Notice.chat("<green>► <white>Wiadomości prywatne zostały <red>wyłączone!");
+        public Notice msgUntoggleSelf = Notice.chat("<green>► <white>Wiadomości prywatne zostały <green>włączone!");
 
         @Description({" ", "# {PLAYER} - Gracz któremu wyłączono wiadomości prywatne"})
-        public Notice msgTogglePlayerOff = Notice.chat("<green>► <white>Wiadomości prywatne zostały <red>wyłączone <white>dla gracza <green>{PLAYER}<white>!");
-        public Notice msgTogglePlayerOn = Notice.chat("<green>► <white>Wiadomości prywatne zostały <green>włączone <white>dla gracza <green>{PLAYER}<white>!");
+        public Notice msgToggledPlayer = Notice.chat("<green>► <white>Wiadomości prywatne zostały <red>wyłączone <white>dla gracza <green>{PLAYER}<white>!");
+        public Notice msgUntogglePlayer = Notice.chat("<green>► <white>Wiadomości prywatne zostały <green>włączone <white>dla gracza <green>{PLAYER}<white>!");
 
         @Description({" ", "# {PLAYER} - Gracz który jest zignorowany"})
         public Notice ignorePlayer = Notice.chat("<green>► <white>Zignorowano gracza <red>{PLAYER}<white>!");

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ private MsgToggleRepositoryOrmLite(DatabaseManager databaseManager, Scheduler sc`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
`23`		`- public CompletableFuture<Boolean> isToggledOff(UUID uuid) {`
	`23`	`+ public CompletableFuture<Boolean> isToggled(UUID uuid) {`
`24`	`24`	`return this.selectSafe(MsgToggleWrapper.class, uuid)`
`25`	`25`	`.thenApply(`
`26`	`26`	`optional -> optional.map(MsgToggleWrapper::isEnabled).orElse(true)`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public MsgToggleServiceImpl(MsgToggleRepository msgToggleRepository) {`
`18`	`18`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- public CompletableFuture<Boolean> hasMsgToggledOff(UUID uuid) {`
`22`		`- return this.msgToggleRepository.isToggledOff(uuid);`
	`21`	`+ public CompletableFuture<Boolean> hasMsgToggled(UUID uuid) {`
	`22`	`+ return this.msgToggleRepository.isToggled(uuid);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`