Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Fix messages with links repeating text #71

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix messages with links repeating text #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 15 additions & 28 deletions src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,7 @@

import io.github.darkkronicle.advancedchatcore.interfaces.IMessageFilter;
import io.github.darkkronicle.advancedchatcore.interfaces.IMessageProcessor;
import io.github.darkkronicle.advancedchatcore.util.FindType;
import io.github.darkkronicle.advancedchatcore.util.SearchResult;
import io.github.darkkronicle.advancedchatcore.util.SearchUtils;
import io.github.darkkronicle.advancedchatcore.util.StringInsert;
import io.github.darkkronicle.advancedchatcore.util.StringMatch;
import io.github.darkkronicle.advancedchatcore.util.StyleFormatter;
import io.github.darkkronicle.advancedchatcore.util.TextUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import io.github.darkkronicle.advancedchatcore.util.*;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.hud.MessageIndicator;
Expand All @@ -30,6 +20,11 @@
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

/**
* A class to handle chat events.
*
Expand All @@ -54,25 +49,18 @@ private MessageDispatcher() {
registerPreFilter(
text -> {
String string = text.getString();
if (string.isEmpty()) {
return Optional.empty();
}
SearchResult search =
SearchResult.searchOf(
string,
"(http(s)?:\\/\\/.)?(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_\\+.~#?&\\/=]*)",
FindType.REGEX);
if (search.size() == 0) {
return Optional.empty();
}
if (string.isEmpty()) return Optional.empty();

SearchResult search = SearchResult.searchOf(string, "(http(s)?:\\/\\/.)?(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_\\+.~#?&\\/=]*)", FindType.REGEX);
if (search.size() == 0) return Optional.empty();

Map<StringMatch, StringInsert> insert = new HashMap<>();
for (StringMatch match : search.getMatches()) {
insert.put(
match,
(current, match1) -> {
String url = match1.match;
if (!SearchUtils.isMatch(
match1.match, "(http(s)?:\\/\\/.)", FindType.REGEX)) {
if (!SearchUtils.isMatch(match1.match, "(http(s)?:\\/\\/.)", FindType.REGEX)) {
url = "https://" + url;
}
if (current.getStyle().getClickEvent() == null) {
Expand All @@ -81,7 +69,6 @@ private MessageDispatcher() {
return MutableText.of(current.getContent()).fillStyle(current.getStyle());
});
}
text = TextUtil.replaceStrings(text, insert);
return Optional.of(text);
},
-1);
Expand Down Expand Up @@ -145,7 +132,7 @@ private void process(Text text, @Nullable MessageSignatureData signature, @Nulla
* registerProcess
*
* @param processor IMessageFilter to modify text
* @param index Index to add it. Supplying a negative value will put it at the end.
* @param index Index to add it. Supplying a negative value will put it at the end.
*/
public void registerPreFilter(IMessageFilter processor, int index) {
if (index < 0) {
Expand All @@ -161,8 +148,8 @@ public void registerPreFilter(IMessageFilter processor, int index) {
* preprocessed.
*
* @param processor IMessageProcessor to get called back
* @param index Index that it will be added to. Supplying a negative value will put it at the
* end.
* @param index Index that it will be added to. Supplying a negative value will put it at the
* end.
*/
public void register(IMessageProcessor processor, int index) {
if (index < 0) {
Expand Down