Reupload attachments from other deleted messages

Author: Defective4

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

@@ -161,6 +161,7 @@ public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedM
         guild.getJDA().retrieveUserById(message.getAuthorId()).queue(author -> {
             MessageCreateAction action = config.getMessageCacheLogChannel()
                     .sendMessageEmbeds(buildMessageDeleteEmbed(guild, author, channel, message));
+            addAttachmentsToCreateAction(action, message);
             if (message.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH) {
                 action.addFiles(FileUpload.fromData(buildDeletedMessageFile(author, message), messageId + ".txt"));
             }
@@ -184,6 +185,28 @@ public void sendBlacklistedAttachmentsMessageToLog(Guild guild, MessageChannel c
         action.complete();
     }
 
+    private void addAttachmentsToCreateAction(MessageCreateAction action, CachedMessage cached) {
+        for (String urlString : cached.getAttachments()) {
+            try {
+                URL url = URI.create(urlString).toURL();
+                String attachmentName = url.getFile();
+                
+                int slashIndex = attachmentName.lastIndexOf('/');
+                if (slashIndex > -1) attachmentName = attachmentName.substring(slashIndex + 1);
+                
+                int questionIndex = attachmentName.indexOf('?');
+                if (questionIndex > -1) attachmentName = attachmentName.substring(0, questionIndex);
+
+                InputStream attachmentStream = url.openStream();
+                FileUpload upload = FileUpload.fromData(attachmentStream, attachmentName).asSpoiler();
+                action.addFiles(upload);
+            } catch (IOException e) {
+                ExceptionLogger.capture(e, getClass().getSimpleName());
+                log.error("Something went wrong while retrieving attachments for a deleted message");
+            }
+        }
+    }
+
     private void addAttachmentsToCreateAction(MessageCreateAction action, Message original) {
         for (Attachment attachment : original.getAttachments()) {
             try {
@@ -194,7 +217,7 @@ private void addAttachmentsToCreateAction(MessageCreateAction action, Message or
                 action.addFiles(upload);
             } catch (IOException e) {
                 ExceptionLogger.capture(e, getClass().getSimpleName());
-                log.error("Something went wrong during retrieval of stored messages.");
+                log.error("Something went wrong while retrieving attachments for a deleted message");
             }
         }
     }