Rainnny/Tether
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Wiki Activity

Update DiscordUser model
All checks were successful
Deploy API / deploy (ubuntu-latest, 2.44.0) (push) Successful in 55s
Details

Browse Source
This commit is contained in:
Braydon 2024-09-10 14:28:50 -04:00
parent 3d6c8b5b8c
commit 4bb5554a71
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
API/src/main/java/me/braydon/tether/model/user/DiscordUser.java
View File

@ -173,6 +173,9 @@ public final class DiscordUser {
String bannerColor = detailsJson.optString("banner_color", null); String bannerColor = detailsJson.optString("banner_color", null);
String bio = detailsJson.optString("bio", null); String bio = detailsJson.optString("bio", null);
if (bio != null && (bio = bio.trim()).isEmpty()) {
bio = null;
}
String accentColor = String.format("#%06X", detailsJson.isNull("accent_color") ? 0xFFFFFF String accentColor = String.format("#%06X", detailsJson.isNull("accent_color") ? 0xFFFFFF
: 0xFFFFFF & detailsJson.getInt("accent_color")); : 0xFFFFFF & detailsJson.getInt("accent_color"));
Clan clan = detailsJson.isNull("clan") ? null : Clan.fromJson(detailsJson.getJSONObject("clan")); Clan clan = detailsJson.isNull("clan") ? null : Clan.fromJson(detailsJson.getJSONObject("clan"));
@ -183,6 +186,9 @@ public final class DiscordUser {
String pronouns = null; String pronouns = null;
if (profileJson != null) { if (profileJson != null) {
pronouns = profileJson.optString("pronouns", null); pronouns = profileJson.optString("pronouns", null);
if (pronouns != null && (pronouns = pronouns.trim()).isEmpty()) {
pronouns = null;
}
} }
boolean bot = detailsJson.optBoolean("bot", false); boolean bot = detailsJson.optBoolean("bot", false);
@ -196,9 +202,8 @@ public final class DiscordUser {
// Get the user's active clients and activities // Get the user's active clients and activities
EnumSet<ClientType> activeClients = member == null ? EnumSet.noneOf(ClientType.class) : member.getActiveClients(); EnumSet<ClientType> activeClients = member == null ? EnumSet.noneOf(ClientType.class) : member.getActiveClients();
List<Activity> activities = member == null ? null : member.getActivities(); List<Activity> activities = member == null ? Collections.emptyList() : member.getActivities();
SpotifyActivity spotify = null; SpotifyActivity spotify = null;
if (activities != null) {
for (Activity activity : activities) { for (Activity activity : activities) {
if (!activity.getName().equals("Spotify") || !activity.isRich()) { if (!activity.getName().equals("Spotify") || !activity.isRich()) {
continue; continue;
@ -206,7 +211,6 @@ public final class DiscordUser {
spotify = SpotifyActivity.fromActivity(Objects.requireNonNull(activity.asRichPresence())); spotify = SpotifyActivity.fromActivity(Objects.requireNonNull(activity.asRichPresence()));
break; break;
} }
}
// Get the user's badges // Get the user's badges
Set<UserBadge> badges = new HashSet<>(); Set<UserBadge> badges = new HashSet<>();