Fix replying to/from console

Author: zefir-git

src/main/java/pro/cloudnode/smp/cloudnodemsg/Message.java

@@ -1,5 +1,6 @@
 package pro.cloudnode.smp.cloudnodemsg;
 
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import org.bukkit.NamespacedKey;
 import org.bukkit.OfflinePlayer;
@@ -12,6 +13,7 @@
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
 import pro.cloudnode.smp.cloudnodemsg.error.PlayerHasIncomingDisabledError;
 import pro.cloudnode.smp.cloudnodemsg.error.PlayerNotFoundError;
+import pro.cloudnode.smp.cloudnodemsg.error.ReplyOfflineError;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -45,19 +47,22 @@ public Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient,
     }
 
     public void send() throws InvalidPlayerError {
-        send(false);
+        send(false, false);
     }
 
-    public void send(final boolean channel) throws InvalidPlayerError {
+    public void send(final boolean channel, final boolean inReply) throws InvalidPlayerError {
         final @NotNull String senderUsername = playerOrServerUsername(this.sender);
         final @NotNull String recipientUsername = playerOrServerUsername(this.recipient);
 
         final @NotNull Optional<@NotNull Player> senderPlayer = Optional.ofNullable(this.sender.getPlayer());
         final @NotNull Optional<@NotNull Player> recipientPlayer = Optional.ofNullable(this.recipient.getPlayer());
 
-        if (senderPlayer.isPresent() && (recipientPlayer.isEmpty() || (CloudnodeMSG.isVanished(recipientPlayer.get()) && !senderPlayer
-                .get().hasPermission(Permission.SEND_VANISHED)))) {
-            if (!channel) new PlayerNotFoundError(senderPlayer.get().getName()).send(senderPlayer.get());
+        if (!recipient.getUniqueId().equals(console.getUniqueId()) && recipientPlayer.isEmpty() || (recipientPlayer.isPresent() && senderPlayer.isPresent() && CloudnodeMSG.isVanished(recipientPlayer.get()) && !senderPlayer.get().hasPermission(Permission.SEND_VANISHED))) {
+            if (!channel) {
+                final @NotNull Audience senderAudience = senderPlayer.isPresent() ? senderPlayer.get() : CloudnodeMSG.getInstance().getServer();
+                if (inReply) new ReplyOfflineError(recipientUsername).send(senderAudience);
+                else new PlayerNotFoundError(recipientUsername).send(senderAudience);
+            }
             else {
                 Message.exitChannel(senderPlayer.get());
                 new ChannelOfflineError(senderPlayer.get().getName(), Optional.ofNullable(recipient.getName())
@@ -72,17 +77,16 @@ public void send(final boolean channel) throws InvalidPlayerError {
             return;
         }
 
-        sendMessage(sender, CloudnodeMSG.getInstance().config().outgoing(senderUsername, recipientUsername, message));
-        if (senderPlayer.isPresent() && !Message.hasChannel(senderPlayer.get(), recipient))
-            setReplyTo(sender, recipient);
-
         sendSpyMessage(sender, recipient, message);
-
+        sendMessage(sender, CloudnodeMSG.getInstance().config().outgoing(senderUsername, recipientUsername, message));
         if ((recipientPlayer.isPresent() && Message.isIgnored(recipientPlayer.get(), sender)) && (senderPlayer.isPresent() && !senderPlayer
                 .get().hasPermission(Permission.IGNORE_BYPASS))) return;
         sendMessage(recipient, CloudnodeMSG.getInstance().config()
                 .incoming(senderUsername, recipientUsername, message));
-        if (recipientPlayer.isPresent() && !Message.hasChannel(recipientPlayer.get(), sender))
+
+        if (sender.getUniqueId().equals(console.getUniqueId()) || (senderPlayer.isPresent() && !Message.hasChannel(senderPlayer.get(), recipient)))
+            setReplyTo(sender, recipient);
+        if (recipient.getUniqueId().equals(console.getUniqueId()) || (recipientPlayer.isPresent() && !Message.hasChannel(recipientPlayer.get(), sender)))
             setReplyTo(recipient, sender);
     }
 

src/main/java/pro/cloudnode/smp/cloudnodemsg/command/ReplyCommand.java

@@ -4,17 +4,14 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
+import pro.cloudnode.smp.cloudnodemsg.Message;
 import pro.cloudnode.smp.cloudnodemsg.Permission;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
 import pro.cloudnode.smp.cloudnodemsg.error.NoPermissionError;
 import pro.cloudnode.smp.cloudnodemsg.error.NobodyReplyError;
-import pro.cloudnode.smp.cloudnodemsg.error.ReplyOfflineError;
-import pro.cloudnode.smp.cloudnodemsg.error.PlayerHasIncomingDisabledError;
-import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 public final class ReplyCommand extends Command {
@@ -27,18 +24,9 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
 
         final @NotNull Optional<@NotNull OfflinePlayer> recipient = Message.getReplyTo(Message.offlinePlayer(sender));
         if (recipient.isEmpty()) return new NobodyReplyError().send(sender);
-        if (!recipient.get().getUniqueId()
-                .equals(Message.console.getUniqueId()) && !Message.isIncomingEnabled(Objects.requireNonNull(recipient
-                .get().getPlayer())) && !sender.hasPermission(Permission.TOGGLE_BYPASS))
-            return new PlayerHasIncomingDisabledError(Objects.requireNonNull(recipient.get().getName())).send(sender);
-        if (!recipient.get().getUniqueId().equals(Message.console.getUniqueId()) && (!recipient.get()
-                .isOnline() || (CloudnodeMSG.isVanished(Objects.requireNonNull(recipient.get()
-                .getPlayer())) && !sender.hasPermission(Permission.SEND_VANISHED))))
-            return new ReplyOfflineError(Optional.ofNullable(recipient.get().getName())
-                    .orElse("Unknown Player")).send(sender);
 
         try {
-            new Message(Message.offlinePlayer(sender), recipient.get(), String.join(" ", args)).send();
+            new Message(Message.offlinePlayer(sender), recipient.get(), String.join(" ", args)).send(false, true);
             return true;
         }
         catch (final @NotNull InvalidPlayerError e) {

src/main/java/pro/cloudnode/smp/cloudnodemsg/listener/AsyncChatListener.java

@@ -48,7 +48,7 @@ public void channels(final @NotNull AsyncChatEvent event) {
         if (channelRecipient.isEmpty()) return;
         event.setCancelled(true);
         try {
-            new Message(sender, channelRecipient.get(), event.message()).send(true);
+            new Message(sender, channelRecipient.get(), event.message()).send(true, false);
         }
         catch (final @NotNull InvalidPlayerError e) {
             e.log().send(sender);