Add signature to user class and remove no longer UUC param!

This commit is contained in:
kohlerpop1
2025-02-10 23:32:11 -05:00
parent d74c294323
commit 33f9862758
4 changed files with 8 additions and 3 deletions

View File

@@ -33,6 +33,7 @@ import java.util.*;
public class User { public class User {
private final Long id; private final Long id;
private final String name; private final String name;
private String signature;
private String profileName; private String profileName;
private Picture picture; private Picture picture;
private long following; private long following;
@@ -106,6 +107,7 @@ public class User {
public User(Long id, public User(Long id,
String name, String name,
String profileName, String profileName,
String signature,
Picture picture, Picture picture,
long following, long following,
long followers, long followers,
@@ -113,6 +115,7 @@ public class User {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.profileName = profileName; this.profileName = profileName;
this.signature = signature;
this.picture = picture; this.picture = picture;
this.following = following; this.following = following;
this.followers = followers; this.followers = followers;
@@ -133,7 +136,7 @@ public class User {
} }
public User(long id, String name, String profileId, Picture picture) { 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) { public User(WebcastLinkMicBattle.LinkMicBattleHost.HostGroup.Host host) {
@@ -142,6 +145,7 @@ public class User {
public User(io.github.jwdeveloper.tiktok.messages.data.User user) { public User(io.github.jwdeveloper.tiktok.messages.data.User user) {
this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb())); this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb()));
signature = user.getBioDescription();
profileName = user.getNickname(); profileName = user.getNickname();
following = user.getFollowInfo().getFollowingCount(); following = user.getFollowInfo().getFollowingCount();
followers = user.getFollowInfo().getFollowerCount(); followers = user.getFollowInfo().getFollowerCount();

View File

@@ -219,7 +219,6 @@ public class TikTokLiveHttpClient implements LiveHttpClient
protected ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) { protected ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API) HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API)
.withParam("client", "ttlive-java") .withParam("client", "ttlive-java")
.withParam("uuc", "1") //MAGIC NUMBER!
.withParam("room_id", room_id); .withParam("room_id", room_id);
if (clientSettings.getApiKey() != null) if (clientSettings.getApiKey() != null)

View File

@@ -131,6 +131,7 @@ public class LiveDataMapper {
var id = jsonElement.get("id").getAsLong(); var id = jsonElement.get("id").getAsLong();
var name = jsonElement.get("display_id").getAsString(); var name = jsonElement.get("display_id").getAsString();
var profileName = jsonElement.get("nickname").getAsString(); var profileName = jsonElement.get("nickname").getAsString();
var signature = jsonElement.get("bio_description").getAsString();
var followElement = jsonElement.getAsJsonObject("follow_info"); var followElement = jsonElement.getAsJsonObject("follow_info");
@@ -142,7 +143,7 @@ public class LiveDataMapper {
var link = pictureElement.getAsJsonArray("url_list").get(1).getAsString(); var link = pictureElement.getAsJsonArray("url_list").get(1).getAsString();
var picture = new Picture(link); 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); user.addAttribute(UserAttribute.LiveHost);
return user; return user;
} }

View File

@@ -72,6 +72,7 @@ public class LiveUserDataMapper
Long.parseLong(user.get("id").getAsString()), Long.parseLong(user.get("id").getAsString()),
user.get("uniqueId").getAsString(), user.get("uniqueId").getAsString(),
user.get("nickname").getAsString(), user.get("nickname").getAsString(),
user.get("signature").getAsString(),
new Picture(user.get("avatarLarger").getAsString()), new Picture(user.get("avatarLarger").getAsString()),
stats.get("followingCount").getAsLong(), stats.get("followingCount").getAsLong(),
stats.get("followerCount").getAsLong(), stats.get("followerCount").getAsLong(),