Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ansi color codes not getting stripped on Paper #4942

Merged
merged 3 commits into from
Jun 15, 2022
Merged

Fix ansi color codes not getting stripped on Paper #4942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a92d635
Fix ansi color codes not getting stripped on Paper
JRoy Jun 14, 2022
bcbd71e
Whoops lmfao
JRoy Jun 14, 2022
85c5860
Merge branch '2.x' into fix/paper-discord-strip
mdcfe Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/utils/FormatUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public final class FormatUtil {
private static final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-zA-Z]{2,3}(?:/\\S+)?)");
//Used to strip ANSI control codes from console
private static final Pattern ANSI_CONTROL_PATTERN = Pattern.compile("\u001B(?:\\[0?m|\\[38;2(?:;\\d{1,3}){3}m|\\[([0-9]{1,2}[;m]?){3})");
private static final Pattern PAPER_CONTROL_PATTERN = Pattern.compile("(?i)" + (char) 0x7f + "[0-9A-FK-ORX]");

private FormatUtil() {
}
Expand Down Expand Up @@ -54,6 +55,13 @@ public static String stripAnsi(final String input) {
return stripColor(input, ANSI_CONTROL_PATTERN);
}

public static String stripPaper(final String input) {
if (input == null) {
return null;
}
return stripColor(input, PAPER_CONTROL_PATTERN);
}

//This is the general permission sensitive message format function, checks for urls.
public static String formatMessage(final IUser user, final String permBase, final String input) {
if (input == null) {
Expand Down
4 changes: 2 additions & 2 deletions EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public void append(LogEvent event) {
return;
}

// Ansi strip is for normal colors, normal strip is for 1.16 hex color codes as they are not formatted correctly
String entry = FormatUtil.stripFormat(FormatUtil.stripAnsi(event.getMessage().getFormattedMessage())).trim();
// Ansi strip is for normal colors, normal strip is for 1.16 hex color codes as they are not formatted correctly, adventure strip is for magic color char strip
String entry = FormatUtil.stripPaper(FormatUtil.stripFormat(FormatUtil.stripAnsi(event.getMessage().getFormattedMessage()))).trim();
if (entry.isEmpty()) {
return;
}
Expand Down