Fix placeholder replacements in click events

spigot/src/main/java/ru/brikster/chatty/chat/component/impl/LinkParserComponentTransformer.java

@@ -37,7 +37,7 @@ public final class LinkParserComponentTransformer implements ComponentTransforme
             } catch (MalformedURLException | URISyntaxException e) {
                 return null;
             }
-        });
+        }, __ -> null);
     }
 
 }

spigot/src/main/java/ru/brikster/chatty/chat/component/impl/papi/AbstractPlaceholderApiComponentTransformer.java

@@ -29,6 +29,14 @@ public abstract class AbstractPlaceholderApiComponentTransformer implements Plac
             } else {
                 return componentStringConverter.stringToComponent(matchedWithPlaceholders + " ");
             }
+        }, matchedString -> {
+            String matchedTransformed = matchedStringTransformFunction.apply(matchedString);
+            String matchedWithPlaceholders = PlaceholderAPI.setPlaceholders(context.getPlayer(), matchedTransformed);
+            if (matchedWithPlaceholders.equals(matchedString)) {
+                return null;
+            } else {
+                return matchedWithPlaceholders;
+            }
         });
     }
 

spigot/src/main/java/ru/brikster/chatty/chat/component/impl/papi/PlaceholderApiRelationalComponentTransformer.java

@@ -29,6 +29,13 @@ public final class PlaceholderApiRelationalComponentTransformer extends Relation
             } else {
                 return componentStringConverter.stringToComponent(matchedWithPlaceholders + " ");
             }
+        }, matchedString -> {
+            String matchedWithPlaceholders = PlaceholderAPI.setRelationalPlaceholders(context.getOne(), context.getTwo(), matchedString);
+            if (matchedWithPlaceholders.equals(matchedString)) {
+                return null;
+            } else {
+                return matchedWithPlaceholders;
+            }
         });
     }
 

spigot/src/main/java/ru/brikster/chatty/chat/component/impl/prefix/AbstractPrefixComponentTransformer.java

@@ -43,6 +43,14 @@ public AbstractPrefixComponentTransformer(PrefixProvider prefixProvider,
            } else {
                throw new IllegalStateException("Illegal string matched: " + matchedString);
            }
+        }, matchedString -> {
+            if (matchedString.equals(prefixPlaceholder)) {
+                return ObjectUtil.requireNonNullElse(prefix, "");
+            } else if (matchedString.equals(suffixPlaceholder)) {
+                return ObjectUtil.requireNonNullElse(suffix, "");
+            } else {
+                throw new IllegalStateException("Illegal string matched: " + matchedString);
+            }
         });
     }
 

spigot/src/main/java/ru/brikster/chatty/util/AdventureUtil.java

@@ -252,16 +252,20 @@ private List<ComponentPart> parts(Component component) {
      * > inserted components uses previous click/hover events, fonts and insertion, if they don't have own <br>
      * > inserted components do NOT share their click/hover events, fonts and insertions with the following components <br>
      * <br>
-     * If replaceFunction returns null, matched string won't be replaced.
+     * If componentReplaceFunction returns null, matched string won't be replaced.
      * Processed component should have ending space as a trick for keeping ending styles (for example, component from
-     * legacy string "&6&lPrefix &e" will lose yellow color without ending space)
+     * legacy string "&6&lPrefix &e" will lose yellow color without ending space).
+     * stringReplaceFunction used for non-styled text sections in click event and shouldn't be end-spaced
      * @author Brikster
      * @param componentWithEndingSpace the component with ending space
      * @param pattern the pattern to match
-     * @param replaceFunction the function to process a matched string
+     * @param componentReplaceFunction the function to process a matched string into a component
+     * @param stringReplaceFunction the function to process a matched string into a string
      * @return the processed component
      */
-    public Component replaceWithEndingSpace(Component componentWithEndingSpace, Pattern pattern, Function<String, @Nullable Component> replaceFunction) {
+    public Component replaceWithEndingSpace(Component componentWithEndingSpace, Pattern pattern,
+                                            Function<String, @Nullable Component> componentReplaceFunction,
+                                            Function<String, @Nullable String> stringReplaceFunction) {
         List<ComponentPart> originalParts = parts(componentWithEndingSpace);
         Component resultComponent = Component.empty();
 
@@ -274,17 +278,41 @@ public Component replaceWithEndingSpace(Component componentWithEndingSpace, Patt
                 hoverEvent = hoverEvent.value(replaceWithEndingSpace(
                         hoverEvent.value(),
                         pattern,
-                        replaceFunction));
+                        componentReplaceFunction,
+                        stringReplaceFunction));
                 part = part.hoverEvent(hoverEvent);
             }
 
+            if (part.clickEvent != null) {
+                StringBuilder builder = new StringBuilder();
+
+                String clickEventValue = part.clickEvent.value();
+
+                int beginIndex = 0;
+                Matcher matcher = pattern.matcher(clickEventValue);
+                while (matcher.find()) {
+                    builder.append(clickEventValue, beginIndex, matcher.start());
+                    String group = matcher.group();
+                    String replacement = stringReplaceFunction.apply(group);
+                    builder.append(replacement == null ? group : replacement);
+                    beginIndex = matcher.end();
+                }
+
+                if (beginIndex != clickEventValue.length()) {
+                    builder.append(clickEventValue.substring(beginIndex));
+                }
+
+                part = part.clickEvent(ClickEvent
+                        .clickEvent(part.clickEvent.action(), builder.toString()));
+            }
+
             state.apply(part);
 
             int beginIndex = 0;
             Matcher matcher = pattern.matcher(part.text);
             while (matcher.find()) {
                 String group = matcher.group();
-                Component replaced = replaceFunction.apply(group);
+                Component replaced = componentReplaceFunction.apply(group);
                 if (replaced != null) {
                     String previousText = part.text.substring(beginIndex, matcher.start());
                     beginIndex = matcher.end();