Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-01 08:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add check for attachments in blocking empty messages

Browse Source
This commit is contained in:
Vankka 2023-10-29 22:53:47 +02:00
parent ad769cb251
commit 4bab23bc35
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordChatMessageModule.java
View File

@ -197,8 +197,9 @@ public class DiscordChatMessageModule extends AbstractModule<DiscordSRV> {
} }
chatConfig.contentRegexFilters.forEach(message::replaceAll); chatConfig.contentRegexFilters.forEach(message::replaceAll);
boolean attachments = !discordMessage.getAttachments().isEmpty() && format.contains("message_attachments");
String finalMessage = message.toString(); String finalMessage = message.toString();
if (finalMessage.trim().isEmpty()) { if (finalMessage.trim().isEmpty() && !attachments) {
// No sending empty messages // No sending empty messages
return; return;
} }
@ -206,7 +207,7 @@ public class DiscordChatMessageModule extends AbstractModule<DiscordSRV> {
Component messageComponent = DiscordSRVMinecraftRenderer.getWithContext(guild, chatConfig, () -> Component messageComponent = DiscordSRVMinecraftRenderer.getWithContext(guild, chatConfig, () ->
discordSRV.componentFactory().minecraftSerializer().serialize(finalMessage)); discordSRV.componentFactory().minecraftSerializer().serialize(finalMessage));
if (discordSRV.componentFactory().plainSerializer().serialize(messageComponent).trim().isEmpty()) { if (discordSRV.componentFactory().plainSerializer().serialize(messageComponent).trim().isEmpty() && !attachments) {
// Check empty-ness again after rendering // Check empty-ness again after rendering
return; return;
} }