Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.ZoneOffset;
Expand Down Expand Up @@ -137,9 +141,23 @@ public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedM
action.addFiles(FileUpload.fromData(buildDeletedMessageFile(author, message), message.getMessageId() + ".txt"));
}
action.queue();
requestMessageAttachments(message);
});
}

/**
* Requests each attachment from Discord's CDN.
* This is done in order to prevent Discord from deleting the attachment too quickly.
* @param message the cached message
*/
private void requestMessageAttachments(CachedMessage message) {
HttpClient client = HttpClient.newHttpClient();
for (String attachment : message.getAttachments()) {
HttpRequest request = HttpRequest.newBuilder(URI.create(attachment)).build();
client.sendAsync(request, BodyHandlers.discarding());
}
}

private EmbedBuilder buildMessageCacheEmbed(MessageChannel channel, User author, CachedMessage before) {
long epoch = IdCalculatorCommand.getTimestampFromId(before.getMessageId()) / 1000;
return new EmbedBuilder()
Expand Down