GH-870 Add /msgtoggle command

README.md

@@ -40,6 +40,7 @@ Get the latest development builds from our [GitHub Actions](https://github.com/E
   - Chat On/Off Switch
   - Chat Slow Mode
   - /ignore and /unignore (with -all option)
+  - /msgtoggle
   - /msg, /socialspy, and /reply commands
   - /helpop command
   - Advanced Notification System allowing you to customize every message to your liking (Title, Subtitle, Actionbar, Chat, etc.) 

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

@@ -0,0 +1,26 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import java.util.UUID;
+
+public class MsgToggle {
+
+    UUID uuid;
+    boolean toggle;
+
+    public MsgToggle() {
+
+    }
+
+    public MsgToggle(UUID uuid, boolean toggle) {
+        this.uuid = uuid;
+        this.toggle = toggle;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public boolean getToggle() {
+        return toggle;
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface MsgToggleService {
+
+    CompletableFuture<Boolean> hasMsgToggled(UUID uuid);
+
+    void toggleMsg(UUID uuid, boolean toggle);
+
+}

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

@@ -0,0 +1,95 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.core.injector.annotations.Inject;
+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 java.util.concurrent.CompletableFuture;
+import org.bukkit.entity.Player;
+
+@Command(name = "msgtoggle")
+@Permission("eternalcore.msgtoggle")
+public class MsgToggleCommand {
+
+    private final MsgToggleService msgToggleService;
+    private final NoticeService noticeService;
+
+    @Inject
+    public MsgToggleCommand(MsgToggleService msgToggleService, NoticeService noticeService) {
+        this.msgToggleService = msgToggleService;
+        this.noticeService = noticeService;
+    }
+
+    public enum STATE {
+        ON,
+        OFF
+    }
+
+    @Execute
+    @DescriptionDocs(description = "Toggle receiving private messages on and off")
+    public void execute(@Context Player context) {
+        CompletableFuture<Boolean> hasMsgToggledOff = this.msgToggleService.hasMsgToggled(context.getUniqueId());
+
+        hasMsgToggledOff.thenAccept(toggledOff -> {
+            if (toggledOff) {
+                this.toggleOff(context);
+            } else {
+                this.toggleOn(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().msgToggledSelf())
+            .player(context.getUniqueId())
+            .send();
+    }
+
+    @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().msgUntoggleSelf())
+            .player(context.getUniqueId())
+            .send();
+    }
+
+    @Execute
+    @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.hasMsgToggled(player.getUniqueId());
+
+        hasMsgToggledOff.thenAccept(toggledOff -> this.other(context, player, !toggledOff ? STATE.ON : STATE.OFF));
+    }
+
+    @Execute
+    @Permission("eternalcore.msgtoggle.other")
+    @DescriptionDocs(description = "Toggle private messages for other player", arguments = "<player> <toggle>")
+    public void other(@Context Player context, @Arg("player") Player player, @Arg("<on/off>") STATE toggle) {
+        this.msgToggleService.toggleMsg(player.getUniqueId(), toggle == STATE.ON);
+
+        this.noticeService.create()
+            .notice(
+                translation -> toggle == STATE.ON ?
+                    translation.privateChat().msgUntogglePlayer() :
+                    translation.privateChat().msgToggledPlayer()
+            )
+            .player(context.getUniqueId())
+            .placeholder("{PLAYER}", player.getName())
+            .send();
+
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface MsgToggleRepository {
+
+    CompletableFuture<Boolean> isToggled(UUID uuid);
+
+    CompletableFuture<Void> setToggledOff(UUID uuid, boolean toggledOff);
+
+}

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

@@ -0,0 +1,35 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import com.eternalcode.commons.scheduler.Scheduler;
+import com.eternalcode.core.database.DatabaseManager;
+import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.component.Repository;
+import com.j256.ormlite.table.TableUtils;
+import java.sql.SQLException;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+@Repository
+class MsgToggleRepositoryOrmLite extends AbstractRepositoryOrmLite implements MsgToggleRepository {
+
+    @Inject
+    private MsgToggleRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
+        super(databaseManager, scheduler);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), MsgToggleWrapper.class);
+    }
+
+    @Override
+    public CompletableFuture<Boolean> isToggled(UUID uuid) {
+        return this.selectSafe(MsgToggleWrapper.class, uuid)
+            .thenApply(
+                optional -> optional.map(MsgToggleWrapper::isEnabled).orElse(true)
+            );
+    }
+
+    @Override
+    public CompletableFuture<Void> setToggledOff(UUID uuid, boolean toggledOff) {
+        return this.save(MsgToggleWrapper.class, new MsgToggleWrapper(uuid, toggledOff))
+            .thenApply(status -> null);
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.component.Service;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import org.jetbrains.annotations.Blocking;
+
+@Service
+public class MsgToggleServiceImpl implements MsgToggleService{
+
+    private final MsgToggleRepository msgToggleRepository;
+
+    @Inject
+    public MsgToggleServiceImpl(MsgToggleRepository msgToggleRepository) {
+        this.msgToggleRepository = msgToggleRepository;
+    }
+
+
+    @Override
+    public CompletableFuture<Boolean> hasMsgToggled(UUID uuid) {
+        return this.msgToggleRepository.isToggled(uuid);
+    }
+
+    @Override
+    @Blocking
+    public void toggleMsg(UUID uuid, boolean toggle) {
+        this.msgToggleRepository.setToggledOff(uuid, toggle);
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.eternalcode.core.feature.msgtoggle;
+
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+import java.util.UUID;
+
+@DatabaseTable(tableName = "eternal_core_msg_toggles")
+class MsgToggleWrapper {
+
+    @DatabaseField(columnName = "id", id = true)
+    private UUID uniqueId;
+
+    @DatabaseField(columnName = "enabled")
+    private boolean enabled;
+
+    MsgToggleWrapper(UUID id, boolean enabled) {
+        this.uniqueId = id;
+        this.enabled = enabled;
+    }
+
+    MsgToggleWrapper() {}
+
+    static MsgToggleWrapper from(MsgToggle msgToggle) {
+        return new MsgToggleWrapper(msgToggle.uuid, msgToggle.toggle);
+    }
+
+    boolean isEnabled() {
+        return this.enabled;
+    }
+
+    void setEnabled(boolean enabled) {
+        this.enabled = 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,15 +57,25 @@ void privateMessage(User sender, User target, String message) {
             return;
         }
 
-        this.ignoreService.isIgnored(target.getUniqueId(), sender.getUniqueId()).thenAccept(isIgnored -> {
-            if (!isIgnored) {
-                this.replies.put(target.getUniqueId(), sender.getUniqueId());
-                this.replies.put(sender.getUniqueId(), target.getUniqueId());
+        UUID uniqueId = target.getUniqueId();
+
+        this.msgToggleService.hasMsgToggled(uniqueId).thenAccept(hasMsgToggled -> {
+            if (hasMsgToggled) {
+                this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().msgToggledOff());
+
+                return;
             }
 
-            PrivateChatEvent event = new PrivateChatEvent(sender.getUniqueId(), target.getUniqueId(), message);
-            this.eventCaller.callEvent(event);
-            this.presenter.onPrivate(new PrivateMessage(sender, target, event.getContent(), this.socialSpy, isIgnored));
+            this.ignoreService.isIgnored(uniqueId, sender.getUniqueId()).thenAccept(isIgnored -> {
+                if (!isIgnored) {
+                    this.replies.put(uniqueId, sender.getUniqueId());
+                    this.replies.put(sender.getUniqueId(), uniqueId);
+                }
+
+                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

@@ -260,6 +260,12 @@ interface PrivateChatSection {
         Notice socialSpyEnable();
         Notice socialSpyDisable();
 
+        Notice msgToggledOff();
+        Notice msgToggledSelf();
+        Notice msgUntoggleSelf();
+        Notice msgToggledPlayer();
+        Notice msgUntogglePlayer();
+
         Notice ignorePlayer();
         Notice ignoreAll();
         Notice unIgnorePlayer();

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

@@ -496,6 +496,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 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 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>!");
+
+
+
         @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

@@ -505,6 +505,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 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 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>!");