From db81e6cce9c3acc402ca8086e861b1d66230f965 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 21 Jan 2020 15:33:50 +0100
Subject: [PATCH] #336

---
 .../hadder/commands/fun/AvatarCommand.java    | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
index 7d7348b..7d36aa5 100644
--- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
@@ -21,6 +21,12 @@ import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
 
 public class AvatarCommand implements Command {
 
@@ -53,7 +59,6 @@ public class AvatarCommand implements Command {
         } else if (args[0].length() == 18) {
             try {
                 User u = e.getJDA().getUserById(args[0]);
-                System.out.println(u);
                 e.getTextChannel().sendMessage(
                         e.getMessageEditor().getMessage(
                                 MessageEditor.MessageType.INFO,
@@ -65,12 +70,30 @@ public class AvatarCommand implements Command {
                                 .setFooter(u.getAsTag())
                                 .build()).queue();
             } catch (NullPointerException ignore) {
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.fun.avatar.error.title",
-                        "commands.fun.avatar.error.description"
-                ).build()).queue();
-            }
 
+                OkHttpClient client = new OkHttpClient();
+                Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build();
+
+                try {
+                    Response response = client.newCall(request).execute();
+                    JSONObject json = new JSONObject(response.body().string());
+                    String url = "https://cdn.discordapp.com/avatars/" + args[0] + "/" + json.getString("avatar") + ".png";
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                                            MessageEditor.MessageType.INFO,
+                                            "commands.fun.avatar.success.title",
+                                            json.getString("username") + "#" + json.getString("discriminator"),
+                                            "",
+                                            "")
+                                            .setImage(url)
+                                            .setFooter(json.getString("username") + "#" + json.getString("discriminator"))
+                                            .build()).queue();
+                } catch (IOException ex) {
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                            "commands.fun.avatar.error.title",
+                            "commands.fun.avatar.error.description"
+                    ).build()).queue();
+                }
+            }
         } else {
             e.getHelpCommand().sendHelp(this, e);
         }