In progress: add messages, setup methods and commands

Author: CitralFlo

eternalcore-api/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleService.java

@@ -1,4 +1,11 @@
 package com.eternalcode.core.feature.msgtoggle;
 
+import java.util.UUID;
+
 public interface MsgToggleService {
+
+    boolean hasMsgToggledOff(UUID uuid);
+
+    void toggleMsg(UUID uuid, boolean toggle);
+
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleCommand.java

@@ -1,35 +1,73 @@
 package com.eternalcode.core.feature.msgtoggle;
 
+import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @Command(name = "msgtoggle")
 @Permission("eternalcore.msgtoggle")
 public class MsgToggleCommand {
 
+    private final MsgToggleService msgToggleService;
+    private final NoticeService noticeService;
+
+    public MsgToggleCommand(MsgToggleService msgToggleService, NoticeService noticeService) {
+        this.msgToggleService = msgToggleService;
+        this.noticeService = noticeService;
+    }
+
     @Execute
     public void execute(@Context Player context) {
+        boolean hasMsgToggledOff = this.msgToggleService.hasMsgToggledOff(context.getUniqueId());
 
+        if (hasMsgToggledOff) {
+            this.on(context);
+        } else {
+            this.off(context);
+        }
     }
 
     @Execute(name = "on")
     public void on(@Context Player context) {
+        this.msgToggleService.toggleMsg(context.getUniqueId(), true);
 
+        this.noticeService.create()
+            .notice(translation -> translation.privateChat().msgToggleSelfOn())
+            .player(context.getUniqueId())
+            .send();
     }
 
     @Execute(name = "off")
     public void off(@Context Player context) {
+        this.msgToggleService.toggleMsg(context.getUniqueId(), false);
+
+        this.noticeService.create()
+            .notice(translation -> translation.privateChat().msgToggleSelfOff())
+            .player(context.getUniqueId())
+            .send();
+    }
 
+    @Execute
+    @Permission("eternalcore.msgtoggle.other")
+    public void other(@Context Player context, @Arg("player") Player player) {
+        boolean hasMsgToggledOff = this.msgToggleService.hasMsgToggledOff(player.getUniqueId());
+
+        this.other(context, player, !hasMsgToggledOff);
     }
 
     @Execute
     @Permission("eternalcore.msgtoggle.other")
-    public void other(@Context Player context, @Arg("player") String player) {
-        context.getSender().sendMessage("You have enabled messages for someone else!");
+    public void other(@Context Player context, @Arg("player") Player player, @Arg boolean toggle) {
+        this.msgToggleService.toggleMsg(player.getUniqueId(), toggle);
+
+        this.noticeService.create()
+            .notice(translation -> translation.privateChat().msgToggleOther(toggle))
+            .player(player.getUniqueId())
+            .send();
+
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleRepositoryOrmLite.java

@@ -15,17 +15,20 @@ class MsgToggleRepositoryOrmLite extends AbstractRepositoryOrmLite implements Ms
     @Inject
     private MsgToggleRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
         super(databaseManager, scheduler);
-        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), MsgToggle.class);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), MsgToggleWrapper.class);
     }
 
     @Override
     public boolean isToggledOff(UUID uuid) {
-        this.selectSafe(MsgToggle.class, uuid).thenApply(optional -> optional.isEmpty())
+//        this.selectSafe(MsgToggle.class, uuid).thenApply(msgToggle -> {
+//            msgToggle.isEmpty();
+//        });
+        return false;
     }
 
     @Override
     public void setToggledOff(UUID uuid, boolean toggledOff) {
-
+        this.save(MsgToggle.class, new MsgToggle(uuid, false));
     }
 
     @Override

eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggle.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/msgtoggle/MsgToggleWrapper.java

@@ -5,20 +5,24 @@
 import java.util.UUID;
 
 @DatabaseTable(tableName = "msgtoggle")
-class MsgToggle {
+class MsgToggleWrapper {
 
     @DatabaseField(columnName = "id", id = true)
     private UUID id;
 
     @DatabaseField(columnName = "enabled")
     private boolean enabled;
 
-    MsgToggle() {
+    MsgToggleWrapper() {
     }
 
-    MsgToggle(UUID id, boolean enabled) {
+    MsgToggleWrapper(UUID id, boolean enabled) {
         this.id = id;
         this.enabled = enabled;
     }
 
+    static MsgToggleWrapper from(MsgToggleWrapper msgToggle) {
+        return new MsgToggleWrapper(msgToggle.id, msgToggle.enabled);
+    }
+
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/PrivateChatServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.ignore.IgnoreService;
+import com.eternalcode.core.feature.msgtoggle.MsgToggleService;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Service;
 import com.eternalcode.core.notice.NoticeService;
@@ -24,6 +25,7 @@ class PrivateChatServiceImpl implements PrivateChatService {
     private final UserManager userManager;
     private final PrivateChatPresenter presenter;
     private final EventCaller eventCaller;
+    private final MsgToggleService msgToggleService;
 
     private final Cache<UUID, UUID> replies = CacheBuilder.newBuilder()
         .expireAfterWrite(Duration.ofHours(1))
@@ -36,12 +38,14 @@ class PrivateChatServiceImpl implements PrivateChatService {
         NoticeService noticeService,
         IgnoreService ignoreService,
         UserManager userManager,
-        EventCaller eventCaller
+        EventCaller eventCaller,
+        MsgToggleService msgToggleService
     ) {
         this.noticeService = noticeService;
         this.ignoreService = ignoreService;
         this.userManager = userManager;
         this.eventCaller = eventCaller;
+        this.msgToggleService = msgToggleService;
 
         this.presenter = new PrivateChatPresenter(noticeService);
     }
@@ -53,13 +57,21 @@ void privateMessage(User sender, User target, String message) {
             return;
         }
 
-        this.ignoreService.isIgnored(target.getUniqueId(), sender.getUniqueId()).thenAccept(isIgnored -> {
+        UUID uniqueId = target.getUniqueId();
+
+        if (this.msgToggleService.hasMsgToggledOff(uniqueId)) {
+            this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().msgToggledOff());
+
+            return;
+        }
+
+        this.ignoreService.isIgnored(uniqueId, sender.getUniqueId()).thenAccept(isIgnored -> {
             if (!isIgnored) {
-                this.replies.put(target.getUniqueId(), sender.getUniqueId());
-                this.replies.put(sender.getUniqueId(), target.getUniqueId());
+                this.replies.put(uniqueId, sender.getUniqueId());
+                this.replies.put(sender.getUniqueId(), uniqueId);
             }
 
-            PrivateChatEvent event = new PrivateChatEvent(sender.getUniqueId(), target.getUniqueId(), message);
+            PrivateChatEvent event = new PrivateChatEvent(sender.getUniqueId(), uniqueId, message);
             this.eventCaller.callEvent(event);
             this.presenter.onPrivate(new PrivateMessage(sender, target, event.getContent(), this.socialSpy, isIgnored));
         });

eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java

@@ -252,6 +252,12 @@ interface PrivateChatSection {
         Notice socialSpyEnable();
         Notice socialSpyDisable();
 
+        Notice msgToggledOff();
+        Notice msgToggleSelfOff();
+        Notice msgToggleSelfOn();
+        Notice msgTogglePlayerOff();
+        Notice msgTogglePlayerOn();
+
         Notice ignorePlayer();
         Notice ignoreAll();
         Notice unIgnorePlayer();

eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java

@@ -487,6 +487,18 @@ public static class ENPrivateSection implements PrivateChatSection {
         public Notice socialSpyEnable = Notice.chat("<green>► <white>SocialSpy has been {STATE}<white>!");
         public Notice socialSpyDisable = Notice.chat("<red>► <white>SocialSpy has been {STATE}<white>!");
 
+
+        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 disabled!");
+        public Notice msgToggleSelfOn = Notice.chat("<green>► <white>Private messages have been enabled!");
+
+        @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>!");
+
+
+
         @Description({" ", "# {PLAYER} - Ignored player"})
         public Notice ignorePlayer = Notice.chat("<green>► {PLAYER} <white>player has been ignored!");
 

eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java

@@ -494,6 +494,15 @@ public static class PLPrivateChatSection implements PrivateChatSection {
         public Notice socialSpyEnable = Notice.chat("<green>► <white>SocialSpy został {STATE}<white>!");
         public Notice socialSpyDisable = Notice.chat("<red>► <white>SocialSpy został {STATE}<white>!");
 
+        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 wyłączone!");
+        public Notice msgToggleSelfOn = Notice.chat("<green>► <white>Wiadomości prywatne zostały włączone!");
+
+        @Description({" ", "# {PLAYER} - Gracz któremu wyłączono wiadomości prywatne"})
+        public Notice msgTogglePlayerOff = Notice.chat("<green>► <white>Wiadomości prywatne zostały wyłączone dla gracza <green>{PLAYER}<white>!");
+        public Notice msgTogglePlayerOn = Notice.chat("<green>► <white>Wiadomości prywatne zostały włączone dla gracza <green>{PLAYER}<white>!");
+
         @Description({" ", "# {PLAYER} - Gracz który jest zignorowany"})
         public Notice ignorePlayer = Notice.chat("<green>► <white>Zignorowano gracza <red>{PLAYER}<white>!");