[Change] Updates for Pomelo API Changes

Ref: https://discord.com/developers/docs/change-log#unique-usernames-on-discord - Added null-safety for the discriminator field (Now defaults to `0` if no longer present in the Json) - Fixed `getDefaultAvatarId` calculation to support non-discriminator lookups - `global_name` is not being supported at this time, due to its infancy in the API. It will be added in a future commit once it becomes present in the API.
CCBlueX · Jun 16, 2023 · 9ba0ce3 · 9ba0ce3
1 parent 663d4fc
commit 9ba0ce3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/jagrosh/discordipc/IPCClient.java b/src/main/java/com/jagrosh/discordipc/IPCClient.java
@@ -700,7 +700,7 @@ private void readPipe(final IPCClient instance) {
                                     final JsonObject u = data.getAsJsonObject("user");
                                     final User user = new User(
                                             u.getAsJsonPrimitive("username").getAsString(),
-                                            u.getAsJsonPrimitive("discriminator").getAsString(),
+                                            u.has("discriminator") ? u.getAsJsonPrimitive("discriminator").getAsString() : "0",
                                             Long.parseLong(u.getAsJsonPrimitive("id").getAsString()),
                                             u.has("avatar") && u.get("avatar").isJsonPrimitive() ? u.getAsJsonPrimitive("avatar").getAsString() : null
                                     );

diff --git a/src/main/java/com/jagrosh/discordipc/entities/User.java b/src/main/java/com/jagrosh/discordipc/entities/User.java
@@ -111,7 +111,7 @@ public String getAvatarUrl() {
      * @return The Users {@link DefaultAvatar} avatar ID.
      */
     public String getDefaultAvatarId() {
-        return DefaultAvatar.values()[Integer.parseInt(getDiscriminator()) % DefaultAvatar.values().length].toString();
+        return DefaultAvatar.values()[(getDiscriminator().equals("0") ? (int) getIdLong() >> 22 : Integer.parseInt(getDiscriminator())) % DefaultAvatar.values().length].toString();
     }
 
     /**

diff --git a/src/main/java/com/jagrosh/discordipc/entities/pipe/Pipe.java b/src/main/java/com/jagrosh/discordipc/entities/pipe/Pipe.java
@@ -96,7 +96,7 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,
 
                         pipe.currentUser = new User(
                                 userData.getAsJsonPrimitive("username").getAsString(),
-                                userData.getAsJsonPrimitive("discriminator").getAsString(),
+                                userData.has("discriminator") ? userData.getAsJsonPrimitive("discriminator").getAsString() : "0",
                                 Long.parseLong(userData.getAsJsonPrimitive("id").getAsString()),
                                 userData.has("avatar") && userData.get("avatar").isJsonPrimitive() ? userData.getAsJsonPrimitive("avatar").getAsString() : null
                         );