Skip to content

Commit

Permalink
Tweak order of link parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
@Patbox
Patbox committed Nov 2, 2022
1 parent 78dd71d commit 9e99434
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 51 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ loader_version=0.14.8
fabric_version=0.59.0+1.19.2

# Mod Properties
mod_version = 2.0.1+1.19.2
mod_version = 2.0.2+1.19.2
maven_group = eu.pb4
archives_base_name = styled-chat

Expand Down
70 changes: 20 additions & 50 deletions src/main/java/eu/pb4/styledchat/StyledChatUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import eu.pb4.styledchat.config.data.VersionedChatStyleData;
import eu.pb4.styledchat.ducks.ExtPlayNetworkHandler;
import eu.pb4.styledchat.ducks.ExtSignedMessage;
import eu.pb4.styledchat.parser.LinkParser;
import eu.pb4.styledchat.parser.SpoilerNode;
import me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.command.EntitySelector;
Expand Down Expand Up @@ -75,11 +76,20 @@ public static TextNode parseText(String input) {
}

public static NodeParser createParser(ServerCommandSource source) {
return createParser(PlaceholderContext.of(source));
}

public static NodeParser createParser(PlaceholderContext context) {
var config = ConfigManager.getConfig();
var list = new ArrayList<NodeParser>();
var base = createTextParserV1(source);
var base = createTextParserV1(context.source());

list.add(base);

if (config.configData.formatting.parseLinksInChat) {
list.add(new LinkParser(ConfigManager.getConfig().getLinkStyle(context)));
}

if (config.configData.formatting.markdown) {
var form = new ArrayList<MarkdownLiteParserV1.MarkdownFormat>();

Expand Down Expand Up @@ -127,7 +137,7 @@ public static NodeParser createParser(ServerCommandSource source) {
}


public static TextParserV1 createTextParserV1(ServerCommandSource source) {
public static TextParserV1 createTextParserV1(ServerCommandSource source) {
var parser = new TextParserV1();
Config config = ConfigManager.getConfig();

Expand Down Expand Up @@ -157,15 +167,15 @@ public static Map<String, TextNode> getEmotes(PlaceholderContext context) {
}

public static Text formatFor(PlaceholderContext context, String input) {
var parser = createParser(context.hasPlayer() ? context.player().getCommandSource() : context.server().getCommandSource());
var parser = createParser(context);
var config = ConfigManager.getConfig();
if (StyledChatMod.USE_FABRIC_API) {
input = StyledChatEvents.PRE_MESSAGE_CONTENT.invoker().onPreMessage(input, context);
}

var emotes = getEmotes(context);

var value = additionalParsing(new ParentNode(parser.parseNodes(new LiteralNode(input))), context);
var value = TextNode.asSingle(parser.parseNodes(new LiteralNode(input)));

if (StyledChatMod.USE_FABRIC_API) {
value = StyledChatEvents.MESSAGE_CONTENT.invoker().onMessage(value, context);
Expand Down Expand Up @@ -287,59 +297,19 @@ public static <T> MessageDecorator getCommandDecorator(String context, ServerCom
});
};
}

@Deprecated
public static TextNode additionalParsing(TextNode node, PlaceholderContext context) {
var config = ConfigManager.getConfig();
if (config.configData.formatting.parseLinksInChat) {

if (ConfigManager.getConfig().configData.formatting.parseLinksInChat) {
node = parseLinks(node, context);
}
return node;
}

@Deprecated
public static TextNode parseLinks(TextNode node, PlaceholderContext context) {
if (node instanceof LiteralNode literalNode) {
var style = ConfigManager.getConfig().getLinkStyle(context);
var input = literalNode.value();
var list = new ArrayList<TextNode>();

Matcher matcher = URL_REGEX.matcher(input);
int currentPos = 0;
int currentEnd = input.length();

while (matcher.find()) {
if (currentEnd <= matcher.start()) {
break;
}

String betweenText = input.substring(currentPos, matcher.start());

if (betweenText.length() != 0) {
list.add(new LiteralNode(betweenText));
}

list.add(new ClickActionNode(Placeholders.parseNodes(style, Placeholders.PREDEFINED_PLACEHOLDER_PATTERN, Map.of("link", Text.literal(matcher.group()))).getChildren(), ClickEvent.Action.OPEN_URL, new LiteralNode(matcher.group())));

currentPos = matcher.end();
}

if (currentPos < currentEnd) {
String restOfText = input.substring(currentPos, currentEnd);
if (restOfText.length() != 0) {
list.add(new LiteralNode(restOfText));
}
}

return list.size() == 1 ? list.get(0) : new ParentNode(list.toArray(new TextNode[0]));
} else if (node instanceof ParentTextNode parentTextNode) {
var list = new ArrayList<TextNode>();

for (var child : parentTextNode.getChildren()) {
list.add(parseLinks(child, context));
}

return parentTextNode.copyWith(list.toArray(new TextNode[0]));
}

return node;
return TextNode.asSingle(LinkParser.parse(node, context));
}

public static boolean isHandledByMod(RegistryKey<MessageType> typeKey) {
Expand Down
73 changes: 73 additions & 0 deletions src/main/java/eu/pb4/styledchat/parser/LinkParser.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package eu.pb4.styledchat.parser;

import eu.pb4.placeholders.api.PlaceholderContext;
import eu.pb4.placeholders.api.Placeholders;
import eu.pb4.placeholders.api.node.LiteralNode;
import eu.pb4.placeholders.api.node.TextNode;
import eu.pb4.placeholders.api.node.parent.ClickActionNode;
import eu.pb4.placeholders.api.node.parent.ParentTextNode;
import eu.pb4.placeholders.api.parsers.NodeParser;
import eu.pb4.styledchat.config.ConfigManager;
import net.minecraft.text.ClickEvent;
import net.minecraft.text.Text;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;

import static eu.pb4.styledchat.StyledChatUtils.URL_REGEX;

public record LinkParser(TextNode style) implements NodeParser {

@Override
public TextNode[] parseNodes(TextNode node) {
if (node instanceof LiteralNode literalNode) {
var input = literalNode.value();
var list = new ArrayList<TextNode>();

Matcher matcher = URL_REGEX.matcher(input);
int currentPos = 0;
int currentEnd = input.length();

while (matcher.find()) {
if (currentEnd <= matcher.start()) {
break;
}

String betweenText = input.substring(currentPos, matcher.start());

if (betweenText.length() != 0) {
list.add(new LiteralNode(betweenText));
}

list.add(new ClickActionNode(Placeholders.parseNodes(style, Placeholders.PREDEFINED_PLACEHOLDER_PATTERN, Map.of("link", Text.literal(matcher.group()))).getChildren(), ClickEvent.Action.OPEN_URL, new LiteralNode(matcher.group())));

currentPos = matcher.end();
}

if (currentPos < currentEnd) {
String restOfText = input.substring(currentPos, currentEnd);
if (restOfText.length() != 0) {
list.add(new LiteralNode(restOfText));
}
}

return list.toArray(new TextNode[0]);
} else if (node instanceof ParentTextNode parentTextNode) {
var list = new ArrayList<TextNode>();

for (var child : parentTextNode.getChildren()) {
list.addAll(List.of(this.parseNodes(child)));
}

return new TextNode[] { parentTextNode.copyWith(list.toArray(new TextNode[0])) };
}

return new TextNode[] { node };
}

public static TextNode[] parse(TextNode node, PlaceholderContext context) {
return new LinkParser(ConfigManager.getConfig().getLinkStyle(context)).parseNodes(node);
}
}

0 comments on commit 9e99434

Please sign in to comment.