Resolved conflicts

Author: BlitzOffline

api/src/main/java/at/helpch/chatchat/api/Channel.java

@@ -19,5 +19,5 @@ public interface Channel {
 
     Set<User> targets(@NotNull final User source);
 
-    boolean isUseableBy(@NotNull final ChatUser user);
+    boolean isUsableBy(@NotNull final ChatUser user);
 }

plugin/src/main/java/at/helpch/chatchat/channel/AbstractChannel.java

@@ -57,9 +57,12 @@ public int radius() {
         return radius;
     }
 
-
     @Override
-    public boolean isUseableBy(@NotNull final ChatUser user) {
+    public boolean isUsableBy(@NotNull final ChatUser user) {
+        if (ChatChannel.defaultChannel().equals(this)) {
+            return true;
+        }
+
         return user.hasPermission(ChannelUtils.USE_CHANNEL_PERMISSION + name());
     }
 

plugin/src/main/java/at/helpch/chatchat/command/IgnoreCommand.java

@@ -21,6 +21,11 @@ public IgnoreCommand(final ChatChatPlugin plugin) {
     @Permission(IGNORE_PERMISSION)
     @Default
     public void ignore(ChatUser sender, ChatUser target) {
+        if (sender.uuid().equals(target.uuid())) {
+            sender.sendMessage(plugin.configManager().messages().cantIgnoreYourself());
+            return;
+        }
+
         if (sender.ignoredUsers().contains(target.uuid())) {
             sender.sendMessage(plugin.configManager().messages().alreadyIgnored()
                 .replaceText(builder -> builder.matchLiteral("<player>").replacement(target.player().getDisplayName())));

plugin/src/main/java/at/helpch/chatchat/command/SwitchChannelCommand.java

@@ -45,7 +45,7 @@ public void switchChannel(final ChatUser user, @Join @Optional @NotNull final St
             }
         }
 
-        if (!channel.isUseableBy(user)) {
+        if (!channel.isUsableBy(user)) {
             user.sendMessage(plugin.configManager().messages().channelNoPermission());
             return;
         }

plugin/src/main/java/at/helpch/chatchat/config/holder/MessagesHolder.java

@@ -35,6 +35,7 @@ public final class MessagesHolder {
     private Component unignoredPlayer = text("Successfully un-ignored <player>.", GREEN);
     private Component alreadyIgnored = text("You are already ignoring <player>.", RED);
     private Component notIgnored = text("You are not ignoring <player>.", RED);
+    private Component cantIgnoreYourself = text("You cannot ignore yourself!", RED);
     private Component cantMessageIgnoredPlayer = text("You cannot message a player who you ignore.", RED);
     private Component cantMessageGeneral = text("You cannot message this player.", RED);
 
@@ -165,6 +166,10 @@ public final class MessagesHolder {
         return notIgnored;
     }
 
+    public @NotNull Component cantIgnoreYourself() {
+        return cantIgnoreYourself;
+    }
+
     public @NotNull Component personalMentionsEnabled() {
         return personalMentionsEnabled;
     }

plugin/src/main/java/at/helpch/chatchat/hooks/towny/AbstractTownyChannel.java

@@ -34,8 +34,8 @@ private Optional<ResidentList> residentList(@NotNull final UUID uuid) {
     }
 
     @Override
-    public boolean isUseableBy(@NotNull final ChatUser user) {
-        return super.isUseableBy(user) && residentList(user.uuid()).isPresent();
+    public boolean isUsableBy(@NotNull final ChatUser user) {
+        return super.isUsableBy(user) && residentList(user.uuid()).isPresent();
     }
 
     protected abstract @Nullable ResidentList residentList(@NotNull final Resident resident);

plugin/src/main/java/at/helpch/chatchat/listener/ChatListener.java

@@ -45,11 +45,11 @@ public void onChat(final AsyncPlayerChatEvent event) {
                 List.copyOf(plugin.configManager().channels().channels().values()),
                 event.getMessage());
 
-        final var message = channelByPrefix.isEmpty() || !channelByPrefix.get().isUseableBy(user)
+        final var message = channelByPrefix.isEmpty() || !channelByPrefix.get().isUsableBy(user)
             ? event.getMessage()
             : event.getMessage().replaceFirst(Pattern.quote(channelByPrefix.get().messagePrefix()), "");
 
-        final var channel = channelByPrefix.isEmpty() || !channelByPrefix.get().isUseableBy(user)
+        final var channel = channelByPrefix.isEmpty() || !channelByPrefix.get().isUsableBy(user)
             ? user.channel()
             : channelByPrefix.get();
 

plugin/src/main/java/at/helpch/chatchat/util/PapiTagUtils.java

@@ -20,14 +20,11 @@ private PapiTagUtils() {
                 return null;
             }
 
-            final String next = argumentQueue.pop().value().toLowerCase(Locale.ROOT);
-            if (!argumentQueue.hasNext()) {
-                return null;
-            }
+            final String next = argumentQueue.pop().value();
 
             final boolean inserting;
             final boolean append;
-            switch (next) {
+            switch (next.toLowerCase(Locale.ROOT)) {
                 case "closing":
                     inserting = false;
                     append = false;
@@ -57,6 +54,10 @@ private PapiTagUtils() {
             }
 
             final var parsedPlaceholder = PlaceholderAPI.setPlaceholders(player, '%' + placeholder + '%');
+            if (parsedPlaceholder.equals("%" + placeholder + '%')) {
+                return null;
+            }
+
             final var kyorifiedPlaceholder = Kyorifier.kyorify(parsedPlaceholder);
             final var componentPlaceholder = MessageUtils.parseToMiniMessage(kyorifiedPlaceholder);
 
@@ -73,24 +74,30 @@ private PapiTagUtils() {
                 return null;
             }
 
-            final String next = argumentQueue.pop().value().toLowerCase(Locale.ROOT);
-            if (!argumentQueue.hasNext()) {
-                return null;
-            }
+            final String next = argumentQueue.pop().value();
 
             final boolean inserting;
-            switch (next) {
+            final boolean append;
+            switch (next.toLowerCase(Locale.ROOT)) {
                 case "closing":
                     inserting = false;
+                    append = false;
                     break;
                 case "inserting":
                     inserting = true;
+                    append = false;
                     break;
                 default:
-                    return null;
+                    inserting = false;
+                    append = true;
+                    break;
             }
 
             final var arguments = new ArrayList<String>();
+            if (append) {
+                arguments.add(next);
+            }
+
             while (argumentQueue.hasNext()) {
                 arguments.add(argumentQueue.pop().value());
             }
@@ -106,6 +113,10 @@ private PapiTagUtils() {
                 target,
                 '%' + placeholder + '%'
             );
+            if (parsedPlaceholder.equals("%" + placeholder + '%')) {
+                return null;
+            }
+
             final var kyorifiedPlaceholder = Kyorifier.kyorify(parsedPlaceholder);
             final var componentPlaceholder = MessageUtils.parseToMiniMessage(kyorifiedPlaceholder);