Use webhooks for message logs

Author: Matyrobbrt

src/commander/java/com/mcmoddev/mmdbot/commander/updatenotifiers/UpdateNotifier.java

@@ -33,8 +33,7 @@
 import lombok.Data;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.IWebhookContainer;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
@@ -145,12 +144,12 @@ public final void run() {
             //noinspection ConstantConditions
             configuration.channelGetter.apply(TheCommander.getInstance().getGeneralConfig().channels().updateNotifiers())
                 .stream()
-                .map(it -> it.resolve(id -> TheCommander.getJDA().getChannelById(IWebhookContainer.class, id)))
+                .map(it -> it.resolve(id -> TheCommander.getJDA().getChannelById(StandardGuildMessageChannel.class, id)))
                 .filter(Objects::nonNull)
                 .forEach(channel -> {
                     embed.setTimestamp(Instant.now());
                     if (configuration.webhookInfo == null) {
-                        ((MessageChannel) channel).sendMessageEmbeds(embed.build()).queue(msg -> {
+                        channel.sendMessageEmbeds(embed.build()).queue(msg -> {
                             if (channel.getType() == ChannelType.NEWS) {
                                 msg.crosspost().queue();
                             }

src/core/java/com/mcmoddev/mmdbot/core/util/Utils.java

@@ -20,7 +20,11 @@
  */
 package com.mcmoddev.mmdbot.core.util;
 
+import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
+import club.minnced.discord.webhook.send.WebhookMessage;
+import club.minnced.discord.webhook.send.WebhookMessageBuilder;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -104,4 +108,8 @@ public static String makeMessageLink(final long guildId, final long channelId, f
         return Message.JUMP_URL.formatted(guildId, channelId, messageId);
     }
 
+    public static WebhookMessageBuilder webhookMessage(MessageEmbed embed) {
+        return new WebhookMessageBuilder()
+            .addEmbeds(WebhookEmbedBuilder.fromJDA(embed).build());
+    }
 }

src/core/java/com/mcmoddev/mmdbot/core/util/jda/caching/MessageData.java

@@ -52,7 +52,7 @@ static MessageData from(Message message) {
                 .map(Message.Attachment::getUrl)
                 .toList();
             final String authorName = message.getAuthor().getName();
-            final String authorAvatar = message.getAuthor().getAvatarUrl();
+            final String authorAvatar = message.getAuthor().getEffectiveAvatarUrl();
             final InteractionData interactionData = message.getInteraction() == null ? null :
                 new InteractionData() {
                     final long authorId = message.getInteraction().getUser().getIdLong();

src/listener/java/com/mcmoddev/mmdbot/thelistener/events/MessageEvents.java

@@ -20,16 +20,18 @@
  */
 package com.mcmoddev.mmdbot.thelistener.events;
 
+import club.minnced.discord.webhook.send.AllowedMentions;
 import com.mcmoddev.mmdbot.core.event.moderation.ScamLinkEvent;
 import com.mcmoddev.mmdbot.core.util.Utils;
 import com.mcmoddev.mmdbot.core.util.jda.caching.MessageData;
+import com.mcmoddev.mmdbot.core.util.webhook.WebhookManager;
 import com.mcmoddev.mmdbot.thelistener.TheListener;
 import com.mcmoddev.mmdbot.thelistener.util.LoggingType;
 import io.github.matyrobbrt.eventdispatcher.SubscribeEvent;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
 
@@ -40,6 +42,9 @@ public final class MessageEvents extends ListenerAdapter {
 
     public static final MessageEvents INSTANCE = new MessageEvents();
 
+    private static final String WEBHOOK_NAME = "MessageLogs";
+    private static final WebhookManager WEBHOOKS = WebhookManager.of(e -> e.trim().equals(WEBHOOK_NAME), WEBHOOK_NAME, AllowedMentions.none());
+
     public static final java.awt.Color GRAY_CHATEAOU = new java.awt.Color(0x979C9F);
     public static final java.awt.Color VIVID_VIOLET = new java.awt.Color(0x71368A);
 
@@ -75,9 +80,14 @@ public void onMessageDelete(final net.dv8tion.jda.api.events.message.MessageDele
         }
         final var embed = embedBuilder.build();
         loggingChannels.forEach(id -> {
-            final var ch = id.resolve(idL -> event.getJDA().getChannelById(MessageChannel.class, idL));
-            if (ch != null)
-                ch.sendMessageEmbeds(embed).queue();
+            final var ch = id.resolve(idL -> event.getJDA().getChannelById(StandardGuildMessageChannel.class, idL));
+            if (ch != null) {
+                WEBHOOKS.getWebhook(ch)
+                    .send(Utils.webhookMessage(embed)
+                        .setUsername(data.getAuthorUsername())
+                        .setAvatarUrl(data.getAuthorAvatar())
+                        .build());
+            }
         });
     }
 
@@ -108,9 +118,13 @@ public void onMessageUpdate(final net.dv8tion.jda.api.events.message.MessageUpda
         final var embed = embedBuilder.build();
         loggingChannels
             .forEach(id -> {
-                final var ch = id.resolve(idL -> event.getJDA().getChannelById(net.dv8tion.jda.api.entities.MessageChannel.class, idL));
+                final var ch = id.resolve(idL -> event.getJDA().getChannelById(StandardGuildMessageChannel.class, idL));
                 if (ch != null) {
-                    ch.sendMessageEmbeds(embed).queue();
+                    WEBHOOKS.getWebhook(ch)
+                            .send(Utils.webhookMessage(embed)
+                                .setUsername(data.getAuthorUsername())
+                                .setAvatarUrl(data.getAuthorAvatar())
+                                .build());
                 }
             });
     }