diff --git a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java index 8723206e1..98de350ce 100644 --- a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java +++ b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java @@ -132,25 +132,10 @@ public String handleCallback(HttpServletRequest request) throws IOException, Int String id = String.valueOf(idAsLong); contributor.setProviderIdDiscord(id); } - private static final String DEFAULT_AVATAR_URL = "https://e7.pngegg.com/pngimages/84/165/" - + "png-clipart-united-states-avatar-organization-information" - + "-user-avatar-service-computer-wallpaper-thumbnail.png"; - - - if (jsonObject.has("avatar")) { - if (jsonObject.get("avatar") instanceof String) { - String avatar = jsonObject.getString("avatar"); - if (!avatar.isEmpty()) { - String uriAvatar = "https://cdn.discordapp.com/avatars/" + jsonObject.getLong("id") + "/" + avatar + ".png"; - logger.info(uriAvatar); - contributor.setImageUrl(uriAvatar); - } else { - contributor.setImageUrl(DEFAULT_AVATAR_URL); - } - } else { - logger.warn("Avatar field is not a string: " + jsonObject.get("avatar")); - contributor.setImageUrl(DEFAULT_AVATAR_URL); - } + if (!jsonObject.isNull("avatar")) { + String uriAvatar = "https://cdn.discordapp.com/avatars/" + jsonObject.getLong("id") + "/" + jsonObject.getString("avatar") + ".png"; + logger.info("Avatar URL: " + uriAvatar); + contributor.setImageUrl(uriAvatar); } if (jsonObject.has("username")) { contributor.setFirstName(jsonObject.getString("username")); @@ -203,4 +188,4 @@ public String handleCallback(HttpServletRequest request) throws IOException, Int return "redirect:/content"; } } -} +} \ No newline at end of file