Merge pull request #30 from Paddyk45/fix-null-avatar-1

Fix null avatars
DAMcraft · Jan 24, 2024 · 1b83045 · 1b83045
2 parents 41a16bc + ebb0e9c
commit 1b83045
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/de/damcraft/serverseeker/DiscordAuth.java b/src/main/java/de/damcraft/serverseeker/DiscordAuth.java
@@ -152,7 +152,7 @@ public void handleCode(String code) {
 
             Systems.get(ServerSeekerSystem.class).discordId = discordId;
             Systems.get(ServerSeekerSystem.class).discordUsername = discordUsername;
-            Systems.get(ServerSeekerSystem.class).discordAvatarUrl = discordAvatarUrl;
+            Systems.get(ServerSeekerSystem.class).discordAvatarUrl = discordAvatarUrl == null ? "" : discordAvatarUrl;
 
             callback.accept(apiKey, null);
         }

diff --git a/src/main/java/de/damcraft/serverseeker/DiscordAvatar.java b/src/main/java/de/damcraft/serverseeker/DiscordAvatar.java
@@ -35,14 +35,18 @@ public DiscordAvatar(String url) {
                 }
                 String discordId = userInfo.discord_id;
                 String discordUsername = userInfo.discord_username;
-                String discordAvatarUrl = userInfo.discord_avatar_url;
+                String discordAvatarUrl = userInfo.discord_avatar_url == null ? "" : userInfo.discord_avatar_url;
 
                 Systems.get(ServerSeekerSystem.class).discordId = discordId;
                 Systems.get(ServerSeekerSystem.class).discordUsername = discordUsername;
                 Systems.get(ServerSeekerSystem.class).discordAvatarUrl = discordAvatarUrl;
 
                 stream = Http.get(discordAvatarUrl).sendInputStream();
             }
+            if (stream == null) {
+                System.err.println("Failed to get avatar, are you Vero?");
+                return;
+            }
             avatar = ImageIO.read(stream);
         } catch (IOException e) {
             e.printStackTrace();