Reupload avatar data in *avatar as an attachment

This prevents the data from being lost when the user removes or changes
their avatar

2 files changed, 35 insertions, 8 deletions

diff --git a/pom.xml b/pom.xml
index 31a8ad4..2eb7e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,12 @@
                         <groupId>zajc.libot</groupId>
                         <artifactId>core</artifactId>
                 </dependency>
+                
+                <!-- HTTP -->
+                <dependency>
+                        <groupId>com.konghq</groupId>
+                        <artifactId>unirest-java</artifactId>
+                </dependency>
         </dependencies>
 
         <build>
diff --git a/src/main/java/libot/commands/AvatarCommand.java b/src/main/java/libot/commands/AvatarCommand.java
index 1d21ade..da3f069 100644
--- a/src/main/java/libot/commands/AvatarCommand.java
+++ b/src/main/java/libot/commands/AvatarCommand.java
@@ -2,6 +2,7 @@ package libot.commands;
 
 import static libot.core.Constants.LITHIUM;
 import static libot.core.commands.CommandCategory.INFORMATIVE;
+import static libot.core.commands.exceptions.ExceptionHandler.reportException;
 import static libot.utils.CommandUtils.findUserOrAuthor;
 import static libot.utils.ParseUtils.parseLong;
 import static libot.utils.Utilities.array;
@@ -10,6 +11,7 @@ import static net.dv8tion.jda.internal.requests.RestActionImpl.getDefaultFailure
 
 import javax.annotation.Nonnull;
 
+import kong.unirest.*;
 import libot.core.commands.*;
 import libot.core.entities.CommandContext;
 import libot.core.extensions.EmbedPrebuilder;
@@ -26,9 +28,9 @@ public class AvatarCommand extends Command {
                         long id = parseLong(c.params().get(0));
                         var user = c.shredder().getUserById(id);
                         if (user != null) {
-                                sendAvatar(c, user);
+                                downloadAndSendAvatar(c, user);
                         } else {
-                                c.jda().retrieveUserById(id).queue(u -> sendAvatar(c, u), e -> {
+                                c.jda().retrieveUserById(id).queue(u -> downloadAndSendAvatar(c, u), e -> {
                                         if (e instanceof ErrorResponseException ere && ere.getErrorResponse() == UNKNOWN_USER) {
                                                 c.reply("Couldn't find a user with that ID.");
                                         } else {
@@ -38,16 +40,35 @@ public class AvatarCommand extends Command {
                         }
 
                 } else {
-                        sendAvatar(c, findUserOrAuthor(c));
+                        downloadAndSendAvatar(c, findUserOrAuthor(c));
                 }
         }
 
-        private static void sendAvatar(@Nonnull CommandContext c, @Nonnull User user) {
-                var url = user.getEffectiveAvatarUrl() + "?size=4096";
+        @SuppressWarnings("null")
+        private static void downloadAndSendAvatar(@Nonnull CommandContext c, @Nonnull User user) {
+                var url = user.getEffectiveAvatarUrl();
+                Unirest.get(url + "?size=4096").asBytesAsync().thenAccept(b -> sendAvatar(c, url, b)).exceptionally(t -> {
+                        reportException(c, t);
+                        c.error("Couldn't download the avatar due to an unknown error");
+                        return null;
+                });
+        }
+
+        @SuppressWarnings("null")
+        private static void sendAvatar(@Nonnull CommandContext c, @Nonnull String url, @Nonnull HttpResponse<byte[]> b) {
+                if (!b.isSuccess())
+                        throw new RuntimeException("Non-zero status code when downloading '%s?size=4096':%d %s"
+                                .formatted(url, b.getStatus(), b.getStatusText()));
+
+                sendAvatar(c, url, b.getBody());
+        }
+
+        private static void sendAvatar(@Nonnull CommandContext c, @Nonnull String url, @Nonnull byte[] data) {
+                var extension = url.substring(url.lastIndexOf('.') + 1);
                 var e = new EmbedPrebuilder(LITHIUM);
-                e.setImage(url);
-                e.setDescriptionf("[Download](%s)", url);
-                c.reply(e);
+                e.setDescriptionf("[View original (%d KiB)](%s?size=4096)", data.length / 1024, url)
+                        .setImage("attachment://avatar." + extension);
+                c.getChannel().sendFile(data, "avatar." + extension).setEmbeds(e.build()).queue();
         }
 
         @Override