[AB-xxx] changing types of ids to be string instead for javascript pu…

…rposes
Sheldan · Apr 5, 2024 · 6c6cd13 · 6c6cd13
1 parent 65a1d44
commit 6c6cd13
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/...g-impl/src/main/java/dev/sheldan/abstracto/experience/api/ExperienceConfigController.java b/...g-impl/src/main/java/dev/sheldan/abstracto/experience/api/ExperienceConfigController.java
@@ -56,7 +56,7 @@ private ExperienceRoleDisplay convertRole(LevelRole levelRole, Guild guild) {
         } else {
             roleDisplay = RoleDisplay
                     .builder()
-                    .id(levelRole.getRoleId())
+                    .id(String.valueOf(levelRole.getRoleId()))
                     .build();
         }
         return ExperienceRoleDisplay

diff --git a/...acking-impl/src/main/java/dev/sheldan/abstracto/experience/api/LeaderboardController.java b/...acking-impl/src/main/java/dev/sheldan/abstracto/experience/api/LeaderboardController.java
@@ -68,7 +68,7 @@ private UserExperienceDisplay convertFromUser(Guild guild, AUserExperience aUser
         }
         return UserExperienceDisplay
                 .builder()
-                .id(userId)
+                .id(String.valueOf(userId))
                 .messages(aUserExperience.getMessageCount())
                 .level(aUserExperience.getLevelOrDefault())
                 .rank((int) pageable.getOffset() + page.getContent().indexOf(aUserExperience) + 1)

diff --git a/...-impl/src/main/java/dev/sheldan/abstracto/experience/model/api/UserExperienceDisplay.java b/...-impl/src/main/java/dev/sheldan/abstracto/experience/model/api/UserExperienceDisplay.java
@@ -10,7 +10,7 @@
 @Builder
 public class UserExperienceDisplay {
     private UserDisplay member;
-    private Long id;
+    private String id;
     private Integer rank;
     private Integer level;
     private Long experience;

diff --git a/...ication/core/core-impl/src/main/java/dev/sheldan/abstracto/core/api/ServerController.java b/...ication/core/core-impl/src/main/java/dev/sheldan/abstracto/core/api/ServerController.java
@@ -27,7 +27,7 @@ public GuildDisplay getLeaderboard(@PathVariable("serverId") Long serverId) {
         return GuildDisplay
                 .builder()
                 .name(guild.getName())
-                .id(guild.getIdLong())
+                .id(guild.getId())
                 .bannerUrl(guild.getBannerUrl())
                 .iconUrl(guild.getIconUrl())
                 .build();

diff --git a/...ation/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/api/GuildDisplay.java b/...ation/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/api/GuildDisplay.java
@@ -6,7 +6,7 @@
 @Getter
 @Builder
 public class GuildDisplay {
-    private Long id;
+    private String id;
     private String name;
     private String iconUrl;
     private String bannerUrl;

diff --git a/...n/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/RoleDisplay.java b/...n/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/RoleDisplay.java
@@ -10,7 +10,7 @@
 @Getter
 @Builder
 public class RoleDisplay {
-    private Long id;
+    private String id;
     private String name;
     private Integer r;
     private Integer g;
@@ -19,7 +19,7 @@ public class RoleDisplay {
     public static RoleDisplay fromRole(Role role) {
         RoleDisplayBuilder builder = builder()
                 .name(role.getName())
-                .id(role.getIdLong());
+                .id(role.getId());
         Color roleColor = role.getColor();
         if(roleColor != null) {
             builder.r(roleColor.getRed()).
@@ -30,7 +30,7 @@ public static RoleDisplay fromRole(Role role) {
     }
     public static RoleDisplay fromARole(ARole role) {
         return builder()
-                .id(role.getId())
+                .id(String.valueOf(role.getId()))
                 .build();
     }
 }
diff --git a/...n/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/UserDisplay.java b/...n/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/UserDisplay.java
@@ -9,13 +9,13 @@
 public class UserDisplay {
     private String avatarUrl;
     private String name;
-    private Long id;
+    private String id;
 
     public static UserDisplay fromMember(Member member) {
         return builder()
                 .avatarUrl(member.getEffectiveAvatarUrl())
                 .name(member.getEffectiveName())
-                .id(member.getIdLong())
+                .id(member.getId())
                 .build();
     }
 }
diff --git a/ui/experience-tracking/src/data/leaderboard.tsx b/ui/experience-tracking/src/data/leaderboard.tsx
@@ -1,7 +1,7 @@
 export interface ExperienceMember {
     experience: bigint;
     rank: number;
-    id: bigint;
+    id: string;
     level: number;
     messages: bigint;
     member: Member | null;
@@ -11,15 +11,15 @@ export interface ExperienceMember {
 export interface Member {
     avatarUrl: string;
     name: string;
-    id: bigint;
+    id: string;
 }
 
 export interface Role {
     r: number | null;
     g: number | null;
     b: number | null;
     name: string | null;
-    id: number;
+    id: string;
 }
 
 export interface ExperienceRole {
@@ -32,7 +32,7 @@ export interface ExperienceConfig {
 }
 
 export interface GuildInfo {
-    id: number;
+    id: string;
     name: string;
     iconUrl: string | null;
     bannerUrl: string | null;