Altitude/Chat
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix URL clicking in chat.

Browse Source
This commit is contained in:
Len 2025-02-09 18:04:55 +01:00
parent ea705c879f
commit bfc9af69d0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/com/alttd/chat/util/Utility.java
View File

@ -23,6 +23,7 @@ public class Utility {
private static final List<String> EMPTY_LIST = new ArrayList<>(); private static final List<String> EMPTY_LIST = new ArrayList<>();
static final Pattern DEFAULT_URL_PATTERN = Pattern.compile("(?:(https?)://)?([-\\w_.]+\\.\\w{2,})(/\\S*)?"); static final Pattern DEFAULT_URL_PATTERN = Pattern.compile("(?:(https?)://)?([-\\w_.]+\\.\\w{2,})(/\\S*)?");
static final Pattern URL_SCHEME_PATTERN = Pattern.compile("^[a-z][a-z0-9+\\-.]*:");
private static MiniMessage miniMessage = null; private static MiniMessage miniMessage = null;
@ -307,6 +308,9 @@ public class Utility {
String url = matcher.group(); String url = matcher.group();
String clickUrl = url; String clickUrl = url;
String urlFormat = Config.URLFORMAT; String urlFormat = Config.URLFORMAT;
// if (!URL_SCHEME_PATTERN.matcher(clickUrl).find()) {
// clickUrl = "http://" + clickUrl;
// }
message = message.replace(url, urlFormat.replaceAll("<url>", url).replaceAll("<clickurl>", clickUrl)); message = message.replace(url, urlFormat.replaceAll("<url>", url).replaceAll("<clickurl>", clickUrl));
} }
return message; return message;

2
galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
View File

@ -198,7 +198,7 @@ public class ChatListener implements Listener {
}); });
MiniMessage miniMessage = MiniMessage.builder().tags(tagResolver.build()).build(); MiniMessage miniMessage = MiniMessage.builder().tags(tagResolver.build()).build();
Component component = miniMessage.deserialize(rawMessage); Component component = miniMessage.deserialize(Utility.formatText(rawMessage));
for(ChatFilter chatFilter : RegexManager.getEmoteFilters()) { for(ChatFilter chatFilter : RegexManager.getEmoteFilters()) {
component = component.replaceText( component = component.replaceText(
TextReplacementConfig.builder() TextReplacementConfig.builder()