Minor changes to new social/gift events!

This commit is contained in:
kohlerpop1
2025-11-15 23:17:39 -05:00
parent 4be74c45ff
commit 089d8d6ed8
5 changed files with 50 additions and 60 deletions

View File

@@ -45,18 +45,10 @@ public class TikTokGiftComboEvent extends TikTokGiftEvent {
} }
public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) { public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) {
return new TikTokGiftComboEvent( return new TikTokGiftComboEvent(gift, new User(0L, "Test", new Picture("")), WebcastGiftMessage.newBuilder().setComboCount(combo).build(), comboState);
gift,
new User(0L, "Test", new Picture("")),
WebcastGiftMessage.newBuilder().setComboCount(combo).build(),
comboState);
} }
public static TikTokGiftComboEvent of(Gift gift, User host, User user, int combo, GiftComboStateType comboState) { public static TikTokGiftComboEvent of(Gift gift, User host, User user, int combo, GiftComboStateType comboState) {
return new TikTokGiftComboEvent(gift, return new TikTokGiftComboEvent(gift, host, user, combo, comboState);
host,
user,
combo,
comboState);
} }
} }

View File

@@ -44,20 +44,20 @@ public class TikTokFollowEvent extends TikTokHeaderEvent {
public static TikTokFollowEvent of(String userName) { public static TikTokFollowEvent of(String userName) {
return new TikTokFollowEvent(WebcastSocialMessage.newBuilder() return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(userName) .setUsername(userName)
.setNickname(userName) .setNickname(userName)
.build()) .build())
.build()); .build());
} }
public static TikTokFollowEvent of(User user) { public static TikTokFollowEvent of(User user) {
return new TikTokFollowEvent(WebcastSocialMessage.newBuilder() return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(user.getName()) .setUsername(user.getName())
.setNickname(user.getProfileName() != null ? user.getProfileName() : user.getName()) .setNickname(user.getProfileName() != null ? user.getProfileName() : user.getName())
.setId(user.getId()) .setId(user.getId())
.build()) .build())
.build()); .build());
} }
} }

View File

@@ -48,23 +48,22 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
totalUsers = msg.getMemberCount(); totalUsers = msg.getMemberCount();
} }
public static TikTokJoinEvent of(String userName) public static TikTokJoinEvent of(String userName) {
{
return new TikTokJoinEvent(WebcastMemberMessage.newBuilder() return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(userName) .setUsername(userName)
.setNickname(userName) .setNickname(userName)
.build()) .build())
.build()); .build());
} }
public static TikTokJoinEvent of(User user) { public static TikTokJoinEvent of(User user) {
return new TikTokJoinEvent(WebcastMemberMessage.newBuilder() return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(user.getName()) .setUsername(user.getName())
.setNickname(user.getProfileName()) .setNickname(user.getProfileName())
.setId(user.getId()) .setId(user.getId())
.build()) .build())
.build()); .build());
} }
} }

View File

@@ -56,26 +56,25 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
totalLikes = msg.getTotal(); totalLikes = msg.getTotal();
} }
public static TikTokLikeEvent of(String userName, int likes) public static TikTokLikeEvent of(String userName, int likes) {
{
return new TikTokLikeEvent(WebcastLikeMessage.newBuilder() return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
.setCount(likes) .setCount(likes)
.setTotal(likes) .setTotal(likes)
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(userName) .setUsername(userName)
.setNickname(userName) .setNickname(userName)
.build()) .build())
.build()); .build());
} }
public static TikTokLikeEvent of(User user, int likes) { public static TikTokLikeEvent of(User user, int likes) {
return new TikTokLikeEvent(WebcastLikeMessage.newBuilder() return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
.setCount(likes) .setCount(likes)
.setTotal(likes) .setTotal(likes)
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(user.getName()) .setUsername(user.getName())
.setNickname(user.getProfileName()) .setNickname(user.getProfileName())
.build()) .build())
.build()); .build());
} }
} }

View File

@@ -49,19 +49,19 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
public static TikTokShareEvent of(String userName, int shaders) { public static TikTokShareEvent of(String userName, int shaders) {
return new TikTokShareEvent(WebcastSocialMessage.newBuilder() return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(userName) .setUsername(userName)
.setNickname(userName) .setNickname(userName)
.build()) .build())
.build(), shaders); .build(), shaders);
} }
public static TikTokShareEvent of(User user, int shaders) { public static TikTokShareEvent of(User user, int shaders) {
return new TikTokShareEvent(WebcastSocialMessage.newBuilder() return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
.setUsername(user.getName()) .setUsername(user.getName())
.setNickname(user.getProfileName()) .setNickname(user.getProfileName())
.build()) .build())
.build(), shaders); .build(), shaders);
} }
} }