Merge branch 'main' into resolve-228

M0diis · web-flow · commit afbfd44d668a · 2025-02-27T22:10:00.000+02:00
diff --git a/api/src/main/java/at/helpch/chatchat/api/user/ChatUser.java b/api/src/main/java/at/helpch/chatchat/api/user/ChatUser.java
@@ -16,7 +16,7 @@ public interface ChatUser extends User {
      *
      * @return The player that this user is backed by.
      */
-    @NotNull Player player();
+    @NotNull Optional<Player> player();
 
     /**
      * Gets the user that this user has last sent a private message to.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@
 spigot = "1.20.1-R0.1-SNAPSHOT"
 
 # Adventure
-minimessage = "4.15.0"
-adventure-platform = "4.3.2"
+minimessage = "4.16.0"
+adventure-platform = "4.3.3-SNAPSHOT"
 
 # Other
 configurate = "4.1.2"
diff --git a/plugin/src/main/java/at/helpch/chatchat/ChatChatPlugin.java b/plugin/src/main/java/at/helpch/chatchat/ChatChatPlugin.java
@@ -52,6 +52,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @BukkitMain
@@ -226,8 +227,8 @@ private void registerSuggestions() {
                 .filter(ChatUser.class::isInstance)
                 .map(ChatUser.class::cast)
                 .filter(sender::canSee)
-                .map(ChatUser::player)
-                .map(Player::getName)
+                .map(user -> user.player().map(Player::getName).orElse(null))
+                .filter(Objects::nonNull)
                 .collect(Collectors.toUnmodifiableList())
         );
         commandManager.registerSuggestion(SuggestionKey.of("files"), (sender, context) -> DumpUtils.FILES);
diff --git a/plugin/src/main/java/at/helpch/chatchat/command/FormatTestCommand.java b/plugin/src/main/java/at/helpch/chatchat/command/FormatTestCommand.java
@@ -29,6 +29,12 @@ public void testFormat(
         @NotNull final PriorityFormat format,
         @Join @NotNull final String message
     ) {
+        var player = sender.player();
+        if (player.isEmpty()) {
+            sender.sendMessage(plugin.configManager().messages().genericError());
+            return;
+        }
+
         if (message.isBlank()) {
             sender.sendMessage(plugin.configManager().messages().emptyMessage());
             return;
@@ -37,8 +43,8 @@ public void testFormat(
         sender.sendMessage(
             FormatUtils.parseFormat(
                 format,
-                sender.player(),
-                sender.player(),
+                player.get(),
+                player.get(),
                 MessageProcessor.processMessage(plugin, sender, ConsoleUser.INSTANCE, message),
                 plugin.miniPlaceholdersManager().compileTags(MiniPlaceholderContext.builder().inMessage(false).sender(sender).recipient(sender).build())
             )
diff --git a/plugin/src/main/java/at/helpch/chatchat/command/IgnoreCommand.java b/plugin/src/main/java/at/helpch/chatchat/command/IgnoreCommand.java
@@ -26,14 +26,20 @@ public void ignore(ChatUser sender, ChatUser target) {
             return;
         }
 
+        var targetPlayer = target.player();
+        if (targetPlayer.isEmpty()) {
+            sender.sendMessage(plugin.configManager().messages().userOffline());
+            return;
+        }
+
         if (sender.ignoredUsers().contains(target.uuid())) {
             sender.sendMessage(plugin.configManager().messages().alreadyIgnored()
-                .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));
+                .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));
             return;
         }
 
         sender.ignoreUser(target);
         sender.sendMessage(plugin.configManager().messages().ignoredPlayer()
-            .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));
+            .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/command/UnignoreCommand.java b/plugin/src/main/java/at/helpch/chatchat/command/UnignoreCommand.java
@@ -20,14 +20,20 @@ public UnignoreCommand(final ChatChatPlugin plugin) {
     @Permission(IGNORE_PERMISSION)
     @Default
     public void unignore(ChatUser sender, ChatUser target) {
+        var targetPlayer = target.player();
+        if (targetPlayer.isEmpty()) {
+            sender.sendMessage(plugin.configManager().messages().userOffline());
+            return;
+        }
+
         if (!sender.ignoredUsers().contains(target.uuid())) {
             sender.sendMessage(plugin.configManager().messages().notIgnored()
-                .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));
+                .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));
             return;
         }
 
         sender.unignoreUser(target);
         sender.sendMessage(plugin.configManager().messages().unignoredPlayer()
-            .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));
+            .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/command/WhisperCommand.java b/plugin/src/main/java/at/helpch/chatchat/command/WhisperCommand.java
@@ -37,6 +37,13 @@ public void whisperCommand(
         @Suggestion(value = "recipients") final ChatUser recipient,
         @Join final String message
     ) {
+        var senderPlayer = sender.player();
+        var recipientPlayer = recipient.player();
+        if (senderPlayer.isEmpty() || recipientPlayer.isEmpty()) {
+            sender.sendMessage(plugin.configManager().messages().userOffline());
+            return;
+        }
+
         if (!plugin.configManager().settings().privateMessagesSettings().enabled()) {
             sender.sendMessage(plugin.configManager().messages().unknownCommand());
             return;
@@ -123,8 +130,8 @@ public void whisperCommand(
         formats.forEach((Audience audience, Format format) ->
             audience.sendMessage(FormatUtils.parseFormat(
                 format,
-                sender.player(),
-                recipient.player(),
+                senderPlayer.get(),
+                recipientPlayer.get(),
                 pmSendEvent.message()
             ))
         );
diff --git a/plugin/src/main/java/at/helpch/chatchat/config/holder/MessagesHolder.java b/plugin/src/main/java/at/helpch/chatchat/config/holder/MessagesHolder.java
@@ -76,6 +76,9 @@ public final class MessagesHolder {
     // format related
     private Component invalidFormat = text("Invalid format.", RED);
 
+    // generic
+    private Component genericError = text("An unexpected error occurred!", RED);
+
     public @NotNull Component consoleOnly() {
         return consoleOnly;
     }
@@ -240,12 +243,15 @@ public final class MessagesHolder {
         return chatDisabled;
     }
 
+
     public @NotNull Component rangedChatEnabledSuccessfully() {
         return rangedChatEnabledSuccessfully;
     }
 
     public @NotNull Component rangedChatDisabledSuccessfully() {
         return rangedChatDisabledSuccessfully;
-    }
 
+    public @NotNull Component genericError() {
+        return genericError;
+    }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/hooks/dsrv/DsrvListener.java b/plugin/src/main/java/at/helpch/chatchat/hooks/dsrv/DsrvListener.java
@@ -43,10 +43,14 @@ public void broadcastMessageToChannel(final String channelName, final Component
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onChat(ChatChatEvent event) {
+        var player = event.user().player();
+        if (player.isEmpty()) {
+            return;
+        }
+
         final var message = github.scarsz.discordsrv.dependencies.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(
                 GsonComponentSerializer.gson().serialize(event.message())
         );
-        DiscordSRV.getPlugin().processChatMessage(event.user().player(), message,
-                event.channel().name(), event.isCancelled());
+        DiscordSRV.getPlugin().processChatMessage(player.get(), message, event.channel().name(), event.isCancelled());
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/EssentialsVanishHook.java b/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/EssentialsVanishHook.java
@@ -45,6 +45,8 @@ public void enable() {
 
     @Override
     public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
-        return user.player().canSee(target.player());
+        return user.player()
+            .map(player -> target.player().map(player::canSee).orElse(true))
+            .orElse(true);
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/SuperVanishHook.java b/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/SuperVanishHook.java
@@ -48,6 +48,9 @@ public void enable() {
 
     @Override
     public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
-        return VanishAPI.canSee(user.player(), target.player());
+        return user.player()
+            .map(player -> target.player().map(targetPlayer -> VanishAPI.canSee(player, targetPlayer))
+                .orElse(true))
+            .orElse(true);
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/VanillaVanishHook.java b/plugin/src/main/java/at/helpch/chatchat/hooks/vanish/VanillaVanishHook.java
@@ -44,6 +44,8 @@ public void enable() {
 
     @Override
     public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
-        return user.player().canSee(target.player());
+        return user.player()
+            .map(player -> target.player().map(player::canSee).orElse(true))
+            .orElse(true);
     }
 }
diff --git a/plugin/src/main/java/at/helpch/chatchat/listener/ChatListener.java b/plugin/src/main/java/at/helpch/chatchat/listener/ChatListener.java
@@ -99,9 +99,12 @@ public void onChat(final AsyncPlayerChatEvent event) {
                     "format are installed and work properly.");
         }
 
+        var sent = MessageProcessor.process(plugin, user, channel, message, event.isAsynchronous());
         // Cancel the event if the message doesn't end up being sent
         // This only happens if the message contains illegal characters or if the ChatChatEvent is canceled.
-        event.setCancelled(!MessageProcessor.process(plugin, user, channel, message, event.isAsynchronous()));
+        if (!event.isCancelled() && !sent) {
+            event.setCancelled(false);
+        }
         user.channel(oldChannel);
     }
 
diff --git a/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderImpl.java b/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderImpl.java
@@ -9,6 +9,7 @@
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
@@ -59,7 +60,7 @@ public MiniPlaceholderImpl(
             return TagResolver.empty();
         }
 
-        if (context.inMessage() && !sender.get().player().hasPermission(MINI_PLACEHOLDER_PERMISSION + tagName)) {
+        if (context.inMessage() && !sender.get().hasPermission(MINI_PLACEHOLDER_PERMISSION + tagName)) {
             return TagResolver.empty();
         }
 
@@ -78,14 +79,20 @@ public MiniPlaceholderImpl(
         }
 
         final boolean recipientIsChatUser = recipient.isPresent() && recipient.get() instanceof ChatUser;
+        final Player senderPlayer = sender.get().player().orElse(null);
+        final Player recipientPlayer = recipientIsChatUser ? ((ChatUser) recipient.get()).player().orElse(null) : null;
+
+        if (senderPlayer == null) {
+            return TagResolver.empty();
+        }
 
         final TagResolver papiTag = isRelationalTag && recipientIsChatUser
             ? TagResolver.resolver(
-                PapiTagUtils.createPlaceholderAPITag(sender.get().player()),
-                PapiTagUtils.createRelPlaceholderAPITag(sender.get().player(), ((ChatUser) recipient.get()).player()),
-                PapiTagUtils.createRecipientTag(((ChatUser) recipient.get()).player())
+                PapiTagUtils.createPlaceholderAPITag(senderPlayer),
+                PapiTagUtils.createRelPlaceholderAPITag(senderPlayer, recipientPlayer),
+                PapiTagUtils.createRecipientTag(recipientPlayer)
             )
-            : PapiTagUtils.createPlaceholderAPITag(sender.get().player());
+            : PapiTagUtils.createPlaceholderAPITag(senderPlayer);
 
         return shouldAutoCloseTags
             ? Placeholder.component(tagName, MessageUtils.parseToMiniMessage(message, papiTag))
diff --git a/plugin/src/main/java/at/helpch/chatchat/placeholder/PlaceholderAPIPlaceholders.java b/plugin/src/main/java/at/helpch/chatchat/placeholder/PlaceholderAPIPlaceholders.java
@@ -7,9 +7,11 @@
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.kyori.adventure.identity.Identity;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Optional;
 
 public final class PlaceholderAPIPlaceholders extends PlaceholderExpansion {
     private final ChatChatPlugin plugin;
@@ -89,6 +91,8 @@ public String onRequest(final OfflinePlayer offlinePlayer, @NotNull final String
                 return chatUser.lastMessagedUser().map(value -> value.player().getName()).orElse("");
             case "ranged_chat_enabled":
                 return formatBoolean(chatUser.rangedChat());
+            case "private_messages_recipient":
+                return chatUser.lastMessagedUser().map(value -> value.player().map(Player::getName).orElse("")).orElse("");
         }
 
         return null;
diff --git a/plugin/src/main/java/at/helpch/chatchat/rule/InvalidCharsRule.java b/plugin/src/main/java/at/helpch/chatchat/rule/InvalidCharsRule.java
@@ -21,11 +21,11 @@ public InvalidCharsRule(@NotNull final ChatChatPlugin plugin) {
     }
 
     public boolean isAllowedPublic(@NotNull final ChatUser sender, @NotNull final String message) {
-        return message.chars().noneMatch(it -> it > 127 && it != 248) || sender.player().hasPermission(UTF_PERMISSION);
+        return message.chars().noneMatch(it -> it > 127 && it != 248) || sender.hasPermission(UTF_PERMISSION);
     }
 
     public boolean isAllowedPrivate(@NotNull ChatUser sender, @NotNull User recipient, @NotNull String message) {
-        return message.chars().noneMatch(it -> it > 127 && it != 248) || sender.player().hasPermission(UTF_PERMISSION);
+        return message.chars().noneMatch(it -> it > 127 && it != 248) || sender.hasPermission(UTF_PERMISSION);
     }
 
     public @NotNull Optional<@NotNull Component> publicDeniedMessage() {
diff --git a/plugin/src/main/java/at/helpch/chatchat/user/ChatUserImpl.java b/plugin/src/main/java/at/helpch/chatchat/user/ChatUserImpl.java
@@ -69,7 +69,7 @@ public void format(@NotNull final Format format) {
 
     @Override
     public boolean hasPermission(@NotNull final String node) {
-        return player().hasPermission(node);
+        return player().map(value -> value.hasPermission(node)).orElse(false);
     }
 
     @Override
@@ -179,8 +179,8 @@ public boolean canSee(@NotNull final User target) {
     }
 
     @Override
-    public @NotNull Player player() {
-        return Objects.requireNonNull(Bukkit.getPlayer(uuid)); // this will never be null
+    public @NotNull Optional<Player> player() {
+        return Optional.ofNullable(Bukkit.getPlayer(uuid));
     }
 
     @Override
diff --git a/plugin/src/main/java/at/helpch/chatchat/util/ChannelUtils.java b/plugin/src/main/java/at/helpch/chatchat/util/ChannelUtils.java
@@ -54,8 +54,15 @@ public static boolean isTargetWithinRadius(
         }
 
         if (radius != -1 && source instanceof ChatUser) {
-            final Location sourceLocation = targetChatUser.player().getLocation();
-            final Location targetLocation = ((ChatUser) target).player().getLocation();
+            var sourcePlayer = ((ChatUser) source).player();
+            var targetPlayer = targetChatUser.player();
+
+            if (sourcePlayer.isEmpty() || targetPlayer.isEmpty()) {
+                return false;
+            }
+
+            final Location sourceLocation = sourcePlayer.get().getLocation();
+            final Location targetLocation = targetPlayer.get().getLocation();
 
             final World sourceWorld = sourceLocation.getWorld();
             final World targetWorld = targetLocation.getWorld();
diff --git a/plugin/src/main/java/at/helpch/chatchat/util/MentionUtils.java b/plugin/src/main/java/at/helpch/chatchat/util/MentionUtils.java
@@ -73,7 +73,7 @@ public static MentionReplaceResult replaceMention(
         @NotNull final Component component,
         @NotNull final Format format) {
         return replaceMention(username, component, (r) -> user instanceof ChatUser
-            ? FormatUtils.parseFormat(format, ((ChatUser) user).player(), component)
+            ? FormatUtils.parseFormat(format, ((ChatUser) user).player().get(), component)
             : FormatUtils.parseFormat(format, component));
     }
 
@@ -84,8 +84,9 @@ public static MentionReplaceResult replaceMention(
         @NotNull final Component component,
         @NotNull final Format format
     ) {
-        return replaceMention(prefix + user.player().getName(), component,
-            r -> FormatUtils.parseFormat(format, user.player(), component));
+        return user.player()
+            .map(value -> replaceMention(prefix + value.getName(), component, r -> FormatUtils.parseFormat(format, value, component)))
+            .orElseGet(() -> new MentionReplaceResult(false, component));
     }
 
     public static @NotNull Map.Entry<@NotNull Boolean, @NotNull Component> processChannelMentions(
diff --git a/plugin/src/main/java/at/helpch/chatchat/util/MessageProcessor.java b/plugin/src/main/java/at/helpch/chatchat/util/MessageProcessor.java
diff --git a/plugin/src/main/java/at/helpch/chatchat/util/PapiTagUtils.java b/plugin/src/main/java/at/helpch/chatchat/util/PapiTagUtils.java
diff --git a/plugin/src/main/resources/messages.yml b/plugin/src/main/resources/messages.yml

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public interface ChatUser extends User {`
`16`	`16`	`*`
`17`	`17`	`* @return The player that this user is backed by.`
`18`	`18`	`*/`
`19`		`- @NotNull Player player();`
	`19`	`+ @NotNull Optional<Player> player();`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* Gets the user that this user has last sent a private message to.`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,20 @@ public void ignore(ChatUser sender, ChatUser target) {`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ var targetPlayer = target.player();`
	`30`	`+ if (targetPlayer.isEmpty()) {`
	`31`	`+ sender.sendMessage(plugin.configManager().messages().userOffline());`
	`32`	`+ return;`
	`33`	`+ }`
	`34`	`+`
`29`	`35`	`if (sender.ignoredUsers().contains(target.uuid())) {`
`30`	`36`	`sender.sendMessage(plugin.configManager().messages().alreadyIgnored()`
`31`		`- .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));`
	`37`	`+ .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));`
`32`	`38`	`return;`
`33`	`39`	`}`
`34`	`40`
`35`	`41`	`sender.ignoreUser(target);`
`36`	`42`	`sender.sendMessage(plugin.configManager().messages().ignoredPlayer()`
`37`		`- .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));`
	`43`	`+ .replaceText(builder -> builder.matchLiteral("<player>").replacement(targetPlayer.get().getDisplayName())));`
`38`	`44`	`}`
`39`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public final class MessagesHolder {`
`76`	`76`	`// format related`
`77`	`77`	`private Component invalidFormat = text("Invalid format.", RED);`
`78`	`78`
	`79`	`+ // generic`
	`80`	`+ private Component genericError = text("An unexpected error occurred!", RED);`
	`81`	`+`
`79`	`82`	`public @NotNull Component consoleOnly() {`
`80`	`83`	`return consoleOnly;`
`81`	`84`	`}`
`@@ -240,12 +243,15 @@ public final class MessagesHolder {`
`240`	`243`	`return chatDisabled;`
`241`	`244`	`}`
`242`	`245`
	`246`	`+`
`243`	`247`	`public @NotNull Component rangedChatEnabledSuccessfully() {`
`244`	`248`	`return rangedChatEnabledSuccessfully;`
`245`	`249`	`}`
`246`	`250`
`247`	`251`	`public @NotNull Component rangedChatDisabledSuccessfully() {`
`248`	`252`	`return rangedChatDisabledSuccessfully;`
`249`		`- }`
`250`	`253`
	`254`	`+ public @NotNull Component genericError() {`
	`255`	`+ return genericError;`
	`256`	`+ }`
`251`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ public void enable() {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {`
`48`		`- return user.player().canSee(target.player());`
	`48`	`+ return user.player()`
	`49`	`+ .map(player -> target.player().map(player::canSee).orElse(true))`
	`50`	`+ .orElse(true);`
`49`	`51`	`}`
`50`	`52`	`}`