AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Discord bridge sanitization

Browse Source
This commit is contained in:
Allink 2023-07-25 17:32:28 +01:00
parent 9bef4581aa
commit 476c87ceb0
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
View File

@ -279,12 +279,6 @@ public class Discord extends FreedomService
{ {
String newMessage = message; String newMessage = message;
if (message.contains("@"))
{
// \u200B is Zero Width Space, invisible on Discord
newMessage = message.replaceAll("@", "@\u200B");
}
if (message.toLowerCase().contains("discord.gg")) // discord.gg/invite works as an invite if (message.toLowerCase().contains("discord.gg")) // discord.gg/invite works as an invite
{ {
return ""; return "";
@ -300,10 +294,10 @@ public class Discord extends FreedomService
if (message.contains("§")) if (message.contains("§"))
{ {
newMessage = message.replaceAll("§", ""); newMessage = message.replace("§", "");
} }
return deformat(newMessage); return newMessage;
} }
public void messageChatChannel(String message) public void messageChatChannel(String message)
@ -321,7 +315,7 @@ public class Discord extends FreedomService
if (enabled && !chat_channel_id.isEmpty()) if (enabled && !chat_channel_id.isEmpty())
{ {
CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true); CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).allowedMentions(Collections.emptyList()).submit(true);
sentMessages.add(sentMessage); sentMessages.add(sentMessage);
} }
} }
@ -341,7 +335,7 @@ public class Discord extends FreedomService
if (enabled && !chat_channel_id.isEmpty()) if (enabled && !chat_channel_id.isEmpty())
{ {
CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true); CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).allowedMentions(Collections.emptyList()).submit(true);
sentMessages.add(sentMessage); sentMessages.add(sentMessage);
} }
} }
@ -512,6 +506,6 @@ public class Discord extends FreedomService
return; return;
} }
messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message)); messageChatChannel(deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message));
} }
} }