From 3abb875e5c8128de39c0443297b9f314c5431cd0 Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sat, 5 Aug 2023 19:16:22 +0200 Subject: [PATCH] [BUG] Detect if message contains attachments, and don't relay empty messages to discord --- .../core/discord/hooks/DiscordMessageHooks.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/hypherionmc/sdlink/core/discord/hooks/DiscordMessageHooks.java b/src/main/java/com/hypherionmc/sdlink/core/discord/hooks/DiscordMessageHooks.java index 8ad50eb..271f846 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/discord/hooks/DiscordMessageHooks.java +++ b/src/main/java/com/hypherionmc/sdlink/core/discord/hooks/DiscordMessageHooks.java @@ -31,6 +31,19 @@ public class DiscordMessageHooks { if (SDLinkConfig.INSTANCE.generalConfig.debugging) { BotController.INSTANCE.getLogger().info("Sending Message from {}: {}", event.getAuthor().getName(), event.getMessage().getContentStripped()); } + + String message = event.getMessage().getContentRaw(); + if (message.isEmpty() && !event.getMessage().getAttachments().isEmpty()) { + message = (long) event.getMessage().getAttachments().size() + " attachments"; + } + + if (!message.isEmpty() && !event.getMessage().getAttachments().isEmpty()) { + message = message + " (+" + (long) event.getMessage().getAttachments().size() + " attachments)"; + } + + if (message.isEmpty()) + return; + SDLinkPlatform.minecraftHelper.discordMessageReceived(event.getMember(), event.getMessage().getContentRaw()); } catch (Exception e) { if (SDLinkConfig.INSTANCE.generalConfig.debugging) {