From 33f9862758f8818af1cfb0e3a60a6e4b5fa15c84 Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Mon, 10 Feb 2025 23:32:11 -0500 Subject: [PATCH] Add signature to user class and remove no longer UUC param! --- .../github/jwdeveloper/tiktok/data/models/users/User.java | 6 +++++- .../io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java | 1 - .../jwdeveloper/tiktok/http/mappers/LiveDataMapper.java | 3 ++- .../jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java index 53def273..de3ded56 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java @@ -33,6 +33,7 @@ public class User { private final Long id; private final String name; + private String signature; private String profileName; private Picture picture; private long following; @@ -106,6 +107,7 @@ public User(Long userId, public User(Long id, String name, String profileName, + String signature, Picture picture, long following, long followers, @@ -113,6 +115,7 @@ public User(Long id, this.id = id; this.name = name; this.profileName = profileName; + this.signature = signature; this.picture = picture; this.following = following; this.followers = followers; @@ -133,7 +136,7 @@ public User(Long userId, } public User(long id, String name, String profileId, Picture picture) { - this(id, name, profileId, picture, 0, 0, List.of(Badge.empty())); + this(id, name, profileId, null, picture, 0, 0, List.of(Badge.empty())); } public User(WebcastLinkMicBattle.LinkMicBattleHost.HostGroup.Host host) { @@ -142,6 +145,7 @@ public User(WebcastLinkMicBattle.LinkMicBattleHost.HostGroup.Host host) { public User(io.github.jwdeveloper.tiktok.messages.data.User user) { this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb())); + signature = user.getBioDescription(); profileName = user.getNickname(); following = user.getFollowInfo().getFollowingCount(); followers = user.getFollowInfo().getFollowerCount(); diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java index 908a29e1..d5259a1f 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java @@ -219,7 +219,6 @@ protected ActionResult> getStartingPayload(LiveConnectionDa protected ActionResult> getByteResponse(String room_id) { HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API) .withParam("client", "ttlive-java") - .withParam("uuc", "1") //MAGIC NUMBER! .withParam("room_id", room_id); if (clientSettings.getApiKey() != null) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java index 27e011db..fb82d178 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java @@ -131,6 +131,7 @@ public User getUser(JsonObject jsonElement) { var id = jsonElement.get("id").getAsLong(); var name = jsonElement.get("display_id").getAsString(); var profileName = jsonElement.get("nickname").getAsString(); + var signature = jsonElement.get("bio_description").getAsString(); var followElement = jsonElement.getAsJsonObject("follow_info"); @@ -142,7 +143,7 @@ public User getUser(JsonObject jsonElement) { var link = pictureElement.getAsJsonArray("url_list").get(1).getAsString(); var picture = new Picture(link); - var user = new User(id, name, profileName, picture, followingCount, followers, new ArrayList<>()); + var user = new User(id, name, profileName, signature, picture, followingCount, followers, new ArrayList<>()); user.addAttribute(UserAttribute.LiveHost); return user; } diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java index 034cc296..c60d0567 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java @@ -72,6 +72,7 @@ public LiveUserData.Response map(String json, Logger logger) { Long.parseLong(user.get("id").getAsString()), user.get("uniqueId").getAsString(), user.get("nickname").getAsString(), + user.get("signature").getAsString(), new Picture(user.get("avatarLarger").getAsString()), stats.get("followingCount").getAsLong(), stats.get("followerCount").getAsLong(),