Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-19 21:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sheldan
2024-04-05 15:06:10 +02:00
parent 65a1d44069
commit 6c6cd130aa
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/api/ExperienceConfigController.java
View File

@@ -56,7 +56,7 @@ public class ExperienceConfigController {
} else { } else {
roleDisplay = RoleDisplay roleDisplay = RoleDisplay
.builder() .builder()
.id(levelRole.getRoleId()) .id(String.valueOf(levelRole.getRoleId()))
.build(); .build();
} }
return ExperienceRoleDisplay return ExperienceRoleDisplay

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/api/LeaderboardController.java
View File

@@ -68,7 +68,7 @@ public class LeaderboardController {
} }
return UserExperienceDisplay return UserExperienceDisplay
.builder() .builder()
.id(userId) .id(String.valueOf(userId))
.messages(aUserExperience.getMessageCount()) .messages(aUserExperience.getMessageCount())
.level(aUserExperience.getLevelOrDefault()) .level(aUserExperience.getLevelOrDefault())
.rank((int) pageable.getOffset() + page.getContent().indexOf(aUserExperience) + 1) .rank((int) pageable.getOffset() + page.getContent().indexOf(aUserExperience) + 1)

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/model/api/UserExperienceDisplay.java
View File

@@ -10,7 +10,7 @@ import lombok.Getter;
@Builder @Builder
public class UserExperienceDisplay { public class UserExperienceDisplay {
private UserDisplay member; private UserDisplay member;
private Long id; private String id;
private Integer rank; private Integer rank;
private Integer level; private Integer level;
private Long experience; private Long experience;

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/api/ServerController.java
View File

@@ -27,7 +27,7 @@ public class ServerController {
return GuildDisplay return GuildDisplay
.builder() .builder()
.name(guild.getName()) .name(guild.getName())
.id(guild.getIdLong()) .id(guild.getId())
.bannerUrl(guild.getBannerUrl()) .bannerUrl(guild.getBannerUrl())
.iconUrl(guild.getIconUrl()) .iconUrl(guild.getIconUrl())
.build(); .build();

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/api/GuildDisplay.java
View File

@@ -6,7 +6,7 @@ import lombok.Getter;
@Getter @Getter
@Builder @Builder
public class GuildDisplay { public class GuildDisplay {
private Long id; private String id;
private String name; private String name;
private String iconUrl; private String iconUrl;
private String bannerUrl; private String bannerUrl;

6
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/RoleDisplay.java
View File

@@ -10,7 +10,7 @@ import java.awt.*;
@Getter @Getter
@Builder @Builder
public class RoleDisplay { public class RoleDisplay {
private Long id; private String id;
private String name; private String name;
private Integer r; private Integer r;
private Integer g; private Integer g;
@@ -19,7 +19,7 @@ public class RoleDisplay {
public static RoleDisplay fromRole(Role role) { public static RoleDisplay fromRole(Role role) {
RoleDisplayBuilder builder = builder() RoleDisplayBuilder builder = builder()
.name(role.getName()) .name(role.getName())
.id(role.getIdLong()); .id(role.getId());
Color roleColor = role.getColor(); Color roleColor = role.getColor();
if(roleColor != null) { if(roleColor != null) {
builder.r(roleColor.getRed()). builder.r(roleColor.getRed()).
@@ -30,7 +30,7 @@ public class RoleDisplay {
} }
public static RoleDisplay fromARole(ARole role) { public static RoleDisplay fromARole(ARole role) {
return builder() return builder()
.id(role.getId()) .id(String.valueOf(role.getId()))
.build(); .build();
} }
} }

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/frontend/UserDisplay.java
View File

@@ -9,13 +9,13 @@ import net.dv8tion.jda.api.entities.Member;
public class UserDisplay { public class UserDisplay {
private String avatarUrl; private String avatarUrl;
private String name; private String name;
private Long id; private String id;
public static UserDisplay fromMember(Member member) { public static UserDisplay fromMember(Member member) {
return builder() return builder()
.avatarUrl(member.getEffectiveAvatarUrl()) .avatarUrl(member.getEffectiveAvatarUrl())
.name(member.getEffectiveName()) .name(member.getEffectiveName())
.id(member.getIdLong()) .id(member.getId())
.build(); .build();
} }
} }

8
ui/experience-tracking/src/data/leaderboard.tsx
View File

@@ -1,7 +1,7 @@
export interface ExperienceMember { export interface ExperienceMember {
experience: bigint; experience: bigint;
rank: number; rank: number;
id: bigint; id: string;
level: number; level: number;
messages: bigint; messages: bigint;
member: Member | null; member: Member | null;
@@ -11,7 +11,7 @@ export interface ExperienceMember {
export interface Member { export interface Member {
avatarUrl: string; avatarUrl: string;
name: string; name: string;
id: bigint; id: string;
} }
export interface Role { export interface Role {
@@ -19,7 +19,7 @@ export interface Role {
g: number | null; g: number | null;
b: number | null; b: number | null;
name: string | null; name: string | null;
id: number; id: string;
} }
export interface ExperienceRole { export interface ExperienceRole {
@@ -32,7 +32,7 @@ export interface ExperienceConfig {
} }
export interface GuildInfo { export interface GuildInfo {
id: number; id: string;
name: string; name: string;
iconUrl: string | null; iconUrl: string | null;
bannerUrl: string | null; bannerUrl: string | null;