use a message context enum instead of possibly conflicting booleans

Author: zefir-git

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

@@ -47,26 +47,27 @@ public Message(@NotNull OfflinePlayer sender, @NotNull OfflinePlayer recipient,
     }
 
     public void send() throws InvalidPlayerError {
-        send(false, false);
+        send(Context.REGULAR);
     }
 
-    public void send(final boolean channel, final boolean inReply) throws InvalidPlayerError {
+    public void send(final @NotNull Context context) 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 (!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().getConsoleSender();
-                if (inReply) new ReplyOfflineError(recipientUsername).send(senderAudience);
-                else new PlayerNotFoundError(recipientUsername).send(senderAudience);
+            if (context == Context.CHANNEL) {
+                final @NotNull Player player = Objects.requireNonNull(sender.getPlayer());
+                Message.exitChannel(player);
+                new ChannelOfflineError(player.getName(), Optional.ofNullable(recipient.getName())
+                        .orElse("Unknown Player")).send(player);
             }
             else {
-                Message.exitChannel(senderPlayer.get());
-                new ChannelOfflineError(senderPlayer.get().getName(), Optional.ofNullable(recipient.getName())
-                        .orElse("Unknown Player")).send(senderPlayer.get());
+                final @NotNull Audience senderAudience = senderPlayer.isPresent() ? senderPlayer.get() : CloudnodeMSG.getInstance().getServer().getConsoleSender();
+                if (context == Context.REPLY) new ReplyOfflineError(recipientUsername).send(senderAudience);
+                else new PlayerNotFoundError(recipientUsername).send(senderAudience);
             }
             return;
         }
@@ -310,4 +311,24 @@ public static void exitTeamChannel(final @NotNull Player player) {
     public static boolean hasTeamChannel(final @NotNull Player player) {
         return player.getPersistentDataContainer().getOrDefault(CHANNEL_TEAM, PersistentDataType.BOOLEAN, false);
     }
+
+    /**
+     * The context in which this message is sent
+     */
+    public static enum Context {
+        /**
+         * Message sent via command (i.e. no special context)
+         */
+        REGULAR,
+
+        /**
+         * Message sent via messaging channel
+         */
+        CHANNEL,
+
+        /**
+         * Message sent as a reply
+         */
+        REPLY;
+    }
 }

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

@@ -26,7 +26,7 @@ public boolean run(final @NotNull CommandSender sender, final @NotNull String la
         if (recipient.isEmpty()) return new NobodyReplyError().send(sender);
 
         try {
-            new Message(Message.offlinePlayer(sender), recipient.get(), String.join(" ", args)).send(false, true);
+            new Message(Message.offlinePlayer(sender), recipient.get(), String.join(" ", args)).send(Message.Context.REPLY);
             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, false);
+            new Message(sender, channelRecipient.get(), event.message()).send(Message.Context.CHANNEL);
         }
         catch (final @NotNull InvalidPlayerError e) {
             e.log().send(sender);