exit channel if recipient is vanished

Author: zefir-git

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

@@ -8,7 +8,9 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import pro.cloudnode.smp.cloudnodemsg.error.ChannelOfflineError;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
+import pro.cloudnode.smp.cloudnodemsg.error.PlayerNotFoundError;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -42,12 +44,25 @@ public Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient,
     }
 
     public void send() throws InvalidPlayerError {
+        send(false);
+    }
+
+    public void send(final boolean channel) 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());
+            else {
+                Message.exitChannel(senderPlayer.get());
+                new ChannelOfflineError(senderPlayer.get().getName(), Optional.ofNullable(recipient.getName()).orElse("Unknown Player")).send(senderPlayer.get());
+            }
+            return;
+        }
+
         sendMessage(sender, CloudnodeMSG.getInstance().config().outgoing(senderUsername, recipientUsername, message));
         if (senderPlayer.isPresent() && !Message.hasChannel(senderPlayer.get(), recipient))
             setReplyTo(sender, recipient);

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

@@ -33,10 +33,12 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
 
         final @NotNull Optional<@NotNull Player> recipient = Optional.ofNullable(CloudnodeMSG.getInstance().getServer()
                 .getPlayer(args[0]));
-        if (recipient.isEmpty() || (CloudnodeMSG.isVanished(recipient.get()) && !sender.hasPermission(Permission.SEND_VANISHED))) return new PlayerNotFoundError(args[0]).send(sender);
+        if (recipient.isEmpty() || (CloudnodeMSG.isVanished(recipient.get()) && !sender.hasPermission(Permission.SEND_VANISHED)))
+            return new PlayerNotFoundError(args[0]).send(sender);
         if (sender instanceof final @NotNull Player player && recipient.get().getUniqueId().equals(player.getUniqueId()))
             return new MessageYourselfError().send(sender);
-        if (!Message.isIncomingEnabled(recipient.get()) && !sender.hasPermission(Permission.TOGGLE_BYPASS)) return new PlayerHasIncomingDisabledError(recipient.get().getName()).send(sender);
+        if (!Message.isIncomingEnabled(recipient.get()) && !sender.hasPermission(Permission.TOGGLE_BYPASS))
+            return new PlayerHasIncomingDisabledError(recipient.get().getName()).send(sender);
 
         if (args.length == 1) {
             final @NotNull Player player = (Player) sender;

src/main/java/pro/cloudnode/smp/cloudnodemsg/error/ChannelOfflineError.java

@@ -0,0 +1,19 @@
+package pro.cloudnode.smp.cloudnodemsg.error;
+
+import org.jetbrains.annotations.NotNull;
+import pro.cloudnode.smp.cloudnodemsg.CloudnodeMSG;
+
+/**
+ * Channel recipient not found (the channel should be closed after this error)
+ */
+public final class ChannelOfflineError extends Error {
+    /**
+     * Channel recipient not found (the channel should be closed after this error)
+     *
+     * @param sender The username of the message sender
+     * @param recipient The username of the message recipient
+     */
+    public ChannelOfflineError(final @NotNull String sender, final @NotNull String recipient) {
+        super(CloudnodeMSG.getInstance().config().channelOffline(sender, recipient));
+    }
+}

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

@@ -11,10 +11,10 @@
 import org.bukkit.scoreboard.Team;
 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.command.TeamMessageCommand;
 import pro.cloudnode.smp.cloudnodemsg.error.InvalidPlayerError;
-import pro.cloudnode.smp.cloudnodemsg.Message;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -45,15 +45,8 @@ public void channels(final @NotNull AsyncChatEvent event) {
         final @NotNull Optional<@NotNull OfflinePlayer> channelRecipient = Message.getChannel(sender);
         if (channelRecipient.isEmpty()) return;
         event.setCancelled(true);
-        final @NotNull Optional<@NotNull Player> recipient = channelRecipient.map(p -> p.isOnline() ? p.getPlayer() : null);
-        if (recipient.isEmpty()) {
-            Message.exitChannel(sender);
-            sender.sendMessage(CloudnodeMSG.getInstance().config().channelOffline(sender.getName(), Optional.ofNullable(channelRecipient.get().getName()).orElse("Unknown Player")));
-            return;
-        }
-
         try {
-            new Message(sender, recipient.get(), event.message()).send();
+            new Message(sender, channelRecipient.get(), event.message()).send(true);
         }
         catch (final @NotNull InvalidPlayerError e) {
             e.log().send(sender);