Reupload attachments from messages blocked by the attachment filter

Author: Defective4

src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java

@@ -1,8 +1,10 @@
 package net.discordjug.javabot.data.h2db.message_cache;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.URL;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -150,7 +152,7 @@ public void sendUpdatedMessageToLog(Message updated, CachedMessage before) {
      */
     public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedMessage message) {
         long messageId = message.getMessageId();
-        if(blockedMessages.contains(messageId)) {
+        if (blockedMessages.contains(messageId)) {
             blockedMessages.remove(messageId);
             return;
         }
@@ -160,8 +162,7 @@ public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedM
             MessageCreateAction action = config.getMessageCacheLogChannel()
                     .sendMessageEmbeds(buildMessageDeleteEmbed(guild, author, channel, message));
             if (message.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH) {
-                action.addFiles(
-                        FileUpload.fromData(buildDeletedMessageFile(author, message), messageId + ".txt"));
+                action.addFiles(FileUpload.fromData(buildDeletedMessageFile(author, message), messageId + ".txt"));
             }
             action.queue();
             requestMessageAttachments(message);
@@ -175,13 +176,29 @@ public void sendBlacklistedAttachmentsMessageToLog(Guild guild, MessageChannel c
         CachedMessage cachedMessage = CachedMessage.of(message);
         MessageCreateAction action = config.getMessageCacheLogChannel()
                 .sendMessageEmbeds(buildMessageDeleteEmbed(guild, author, channel, cachedMessage));
+        addAttachmentsToCreateAction(action, message);
         if (message.getContentRaw().length() > MessageEmbed.VALUE_MAX_LENGTH) {
             action.addFiles(
                     FileUpload.fromData(buildDeletedMessageFile(author, cachedMessage), message.getId() + ".txt"));
         }
         action.complete();
     }
 
+    private void addAttachmentsToCreateAction(MessageCreateAction action, Message original) {
+        for (Attachment attachment : original.getAttachments()) {
+            try {
+                URL url = URI.create(attachment.getUrl()).toURL();
+                InputStream attachmentStream = url.openStream();
+                FileUpload upload = FileUpload.fromData(attachmentStream, attachment.getFileName());
+                if (attachment.isVideo() || attachment.isImage()) upload.asSpoiler();
+                action.addFiles(upload);
+            } catch (IOException e) {
+                ExceptionLogger.capture(e, getClass().getSimpleName());
+                log.error("Something went wrong during retrieval of stored messages.");
+            }
+        }
+    }
+
     /**
      * Requests each attachment from Discord's CDN. This is done in order to prevent
      * Discord from deleting the attachment too quickly.