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/privatechat/toggle/PrivateChatToggle.java

@@ -0,0 +1,26 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+import java.util.UUID;
+
+public class PrivateChatToggle {
+
+    UUID uuid;
+    PrivateChatToggleState state;
+
+    public PrivateChatToggle() {
+
+    }
+
+    public PrivateChatToggle(UUID uuid, PrivateChatToggleState toggle) {
+        this.uuid = uuid;
+        this.state = toggle;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public PrivateChatToggleState getState() {
+        return state;
+    }
+}

eternalcore-api/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatToggleService.java

@@ -0,0 +1,12 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface PrivateChatToggleService {
+
+    CompletableFuture<PrivateChatToggleState> getPrivateChatToggleState(UUID uuid);
+
+    void togglePrivateChat(UUID uuid, PrivateChatToggleState toggle);
+
+}

eternalcore-api/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatToggleState.java

@@ -0,0 +1,8 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+public enum PrivateChatToggleState {
+
+    ON,
+    OFF
+
+}

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

@@ -2,6 +2,8 @@
 
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.ignore.IgnoreService;
+import com.eternalcode.core.feature.privatechat.toggle.PrivateChatToggleService;
+import com.eternalcode.core.feature.privatechat.toggle.PrivateChatToggleState;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Service;
 import com.eternalcode.core.notice.NoticeService;
@@ -24,6 +26,7 @@ class PrivateChatServiceImpl implements PrivateChatService {
     private final UserManager userManager;
     private final PrivateChatPresenter presenter;
     private final EventCaller eventCaller;
+    private final PrivateChatToggleService privateChatToggleService;
 
     private final Cache<UUID, UUID> replies = CacheBuilder.newBuilder()
         .expireAfterWrite(Duration.ofHours(1))
@@ -36,12 +39,14 @@ class PrivateChatServiceImpl implements PrivateChatService {
         NoticeService noticeService,
         IgnoreService ignoreService,
         UserManager userManager,
-        EventCaller eventCaller
+        EventCaller eventCaller,
+        PrivateChatToggleService privateChatToggleService
     ) {
         this.noticeService = noticeService;
         this.ignoreService = ignoreService;
         this.userManager = userManager;
         this.eventCaller = eventCaller;
+        this.privateChatToggleService = privateChatToggleService;
 
         this.presenter = new PrivateChatPresenter(noticeService);
     }
@@ -53,15 +58,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.privateChatToggleService.getPrivateChatToggleState(uniqueId).thenAccept(privateChatToggleState -> {
+            if (privateChatToggleState.equals(PrivateChatToggleState.ON)) {
+                this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().receiverDisabledMessages());
+
+                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/feature/privatechat/toggle/PrivateChatToggleCommand.java

@@ -0,0 +1,140 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+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.optional.OptionalArg;
+import dev.rollczi.litecommands.annotations.permission.Permission;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@Command(name = "msgtoggle")
+@Permission("eternalcore.msgtoggle")
+public class PrivateChatToggleCommand {
+
+    private final PrivateChatToggleService privateChatToggleService;
+    private final NoticeService noticeService;
+
+    @Inject
+    public PrivateChatToggleCommand(PrivateChatToggleService privateChatToggleService, NoticeService noticeService) {
+        this.privateChatToggleService = privateChatToggleService;
+        this.noticeService = noticeService;
+    }
+
+    @Execute
+    @DescriptionDocs(description = "Toggle receiving private messages on and off")
+    public void execute(@Context Player context, @OptionalArg PrivateChatToggleState state) {
+        UUID uniqueId = context.getUniqueId();
+
+        if (state == null) {
+            CompletableFuture<PrivateChatToggleState> privateChatToggleState = this.privateChatToggleService.getPrivateChatToggleState(context.getUniqueId());
+
+            privateChatToggleState.thenAccept(toggleState -> {
+                if (toggleState.equals(PrivateChatToggleState.OFF)) {
+                    this.toggleOn(uniqueId);
+                }
+                else {
+                    this.toggleOff(uniqueId);
+                }
+            });
+
+            return;
+        }
+
+        if (state.equals(PrivateChatToggleState.OFF)) {
+            this.toggleOn(uniqueId);
+        }
+        else {
+            this.toggleOff(uniqueId);
+        }
+    }
+
+    @Execute
+    @Permission("eternalcore.msgtoggle.other")
+    @DescriptionDocs(description = "Toggle private messages for other player", arguments = "<player>  <toggle>")
+    public void other(@Context CommandSender context, @Arg("player") Player player, @OptionalArg PrivateChatToggleState state) {
+
+        UUID uniqueId = player.getUniqueId();
+
+        if (state == null) {
+            CompletableFuture<PrivateChatToggleState> privateChatToggleState = this.privateChatToggleService.getPrivateChatToggleState(uniqueId);
+
+            privateChatToggleState.thenAccept(toggleState -> {
+                if (toggleState.equals(PrivateChatToggleState.OFF)) {
+                    this.toggleOn(uniqueId);
+
+                    this.noticeService.create()
+                        .notice( translation -> translation.privateChat().otherMessagesEnabled())
+                        .sender(context)
+                        .placeholder("{PLAYER}", player.getName())
+                        .send();
+                }
+                else {
+                    this.toggleOff(uniqueId);
+
+                    this.noticeService.create()
+                        .notice( translation -> translation.privateChat().otherMessagesDisabled())
+                        .sender(context)
+                        .placeholder("{PLAYER}", player.getName())
+                        .send();
+                }
+            });
+
+            return;
+        }
+
+        if (state.equals(PrivateChatToggleState.OFF)) {
+            this.toggleOn(uniqueId);
+
+            if (this.isCommandSenderSameAsTarget(context, player)) {
+                this.noticeService.create()
+                    .notice(translation -> translation.privateChat().otherMessagesDisabled())
+                    .sender(context)
+                    .placeholder("{PLAYER}", player.getName())
+                    .send();
+            }
+        }
+        else {
+            this.toggleOff(uniqueId);
+
+            if (this.isCommandSenderSameAsTarget(context, player)) {
+                this.noticeService.create()
+                    .notice(translation -> translation.privateChat().otherMessagesEnabled())
+                    .sender(context)
+                    .placeholder("{PLAYER}", player.getName())
+                    .send();
+            }
+        }
+    }
+
+    private void toggleOn(UUID uniqueId) {
+        this.privateChatToggleService.togglePrivateChat(uniqueId, PrivateChatToggleState.ON);
+
+        this.noticeService.create()
+            .notice(translation -> translation.privateChat().selfMessagesDisabled())
+            .player(uniqueId)
+            .send();
+    }
+
+    private void toggleOff(UUID uniqueId) {
+        this.privateChatToggleService.togglePrivateChat(uniqueId, PrivateChatToggleState.OFF);
+
+        this.noticeService.create()
+            .notice(translation -> translation.privateChat().selfMessagesEnabled())
+            .player(uniqueId)
+            .send();
+    }
+
+    private boolean isCommandSenderSameAsTarget(CommandSender context, Player player) {
+        if (context instanceof Player commandSender) {
+            return commandSender.getUniqueId().equals(player.getUniqueId());
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+import com.eternalcode.core.feature.privatechat.toggle.PrivateChatToggleState;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public interface PrivateChatToggleRepository {
+
+    CompletableFuture<PrivateChatToggleState> getPrivateChatToggleState(UUID uuid);
+
+    CompletableFuture<Void> setPrivateChatToggle(UUID uuid, PrivateChatToggleState toggledOff);
+
+}

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

@@ -0,0 +1,35 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+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 PrivateChatToggleRepositoryOrmLite extends AbstractRepositoryOrmLite implements PrivateChatToggleRepository {
+
+    @Inject
+    private PrivateChatToggleRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
+        super(databaseManager, scheduler);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), PrivateChatToggleWrapper.class);
+    }
+
+    @Override
+    public CompletableFuture<PrivateChatToggleState> getPrivateChatToggleState(UUID uuid) {
+        return this.selectSafe(PrivateChatToggleWrapper.class, uuid)
+            .thenApply(
+                optional -> optional.map(PrivateChatToggleWrapper::isEnabled).orElse(PrivateChatToggleState.OFF)
+            );
+    }
+
+    @Override
+    public CompletableFuture<Void> setPrivateChatToggle(UUID uuid, PrivateChatToggleState toggledOff) {
+        return this.save(PrivateChatToggleWrapper.class, new PrivateChatToggleWrapper(uuid, toggledOff))
+            .thenApply(status -> null);
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.injector.annotations.component.Service;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+@Service
+public class PrivateChatToggleServiceImpl implements PrivateChatToggleService {
+
+    private final PrivateChatToggleRepository msgToggleRepository;
+
+    @Inject
+    public PrivateChatToggleServiceImpl(PrivateChatToggleRepository msgToggleRepository) {
+        this.msgToggleRepository = msgToggleRepository;
+    }
+
+
+    @Override
+    public CompletableFuture<PrivateChatToggleState> getPrivateChatToggleState(UUID uuid) {
+        return this.msgToggleRepository.getPrivateChatToggleState(uuid);
+    }
+
+    @Override
+    public void togglePrivateChat(UUID uuid, PrivateChatToggleState toggle) {
+        this.msgToggleRepository.setPrivateChatToggle(uuid, toggle);
+    }
+
+
+}

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

@@ -0,0 +1,34 @@
+package com.eternalcode.core.feature.privatechat.toggle;
+
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+import java.util.UUID;
+
+@DatabaseTable(tableName = "eternal_core_private_chat_toggle")
+class PrivateChatToggleWrapper {
+
+    @DatabaseField(columnName = "id", id = true)
+    private UUID uniqueId;
+
+    @DatabaseField(columnName = "enabled")
+    private PrivateChatToggleState state;
+
+    PrivateChatToggleWrapper(UUID id, PrivateChatToggleState enabled) {
+        this.uniqueId = id;
+        this.state = enabled;
+    }
+
+    PrivateChatToggleWrapper() {}
+
+    static PrivateChatToggleWrapper from(PrivateChatToggle msgToggle) {
+        return new PrivateChatToggleWrapper(msgToggle.uuid, msgToggle.state);
+    }
+
+    PrivateChatToggleState isEnabled() {
+        return this.state;
+    }
+
+    void setState(PrivateChatToggleState state) {
+        this.state = state;
+    }
+}

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

@@ -260,6 +260,12 @@ interface PrivateChatSection {
         Notice socialSpyEnable();
         Notice socialSpyDisable();
 
+        Notice receiverDisabledMessages();
+        Notice selfMessagesDisabled();
+        Notice selfMessagesEnabled();
+        Notice otherMessagesDisabled();
+        Notice otherMessagesEnabled();
+
         Notice ignorePlayer();
         Notice ignoreAll();
         Notice unIgnorePlayer();