Merge branch 'refs/heads/master' into develop-1.11.3

API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java

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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java

@@ -49,25 +49,17 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
         }
         combo = msg.getComboCount();
     }
-    
+
-    public TikTokGiftEvent(Gift gift, User user, User toUser, int combo) {
+    public TikTokGiftEvent(Gift gift) {
         this.gift = gift;
-        this.user = user;
+        user = new User(0L, "sender", new Picture(""));
-        this.toUser = toUser;
+        toUser = new User(0L, "receiver", new Picture(""));
-        this.combo = combo;
+        combo = 1;
     }
 
+
     public static TikTokGiftEvent of(Gift gift) {
-        return new TikTokGiftEvent(
+        return new TikTokGiftEvent(gift);
-            gift,
-            new User(0L, "sender", new Picture("")),
-            new User(0L, "reviever", new Picture("")),
-            1
-            );
-    }
-
-    public static TikTokGiftEvent of(Gift gift, User user, User toUser) {
-        return new TikTokGiftEvent(gift, user, toUser, 1) ;
     }
 
     public static TikTokGiftEvent of(String name, int id, int diamonds) {

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java

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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java

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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java

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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java

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

API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java

@@ -66,5 +66,5 @@ public interface LiveHttpClient
 
     LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request);
 
-    boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc);
+    boolean sendChat(LiveRoomInfo roomInfo, String content);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java

@@ -102,12 +102,4 @@ public interface LiveClient {
      * <p>We cannot fix this as it is a TikTok issue, not a library issue.
      */
     boolean sendChat(String content);
-
-    /**
-     * Send a chat message to the connected room
-     * @return true if successful, otherwise false
-     * @apiNote This is known to return true on some sessionIds despite failing!
-     * <p>We cannot fix this as it is a TikTok issue, not a library issue.
-     */
-    boolean sendChat(String content, String sessionId, String ttTargetIdc);
 }

API/src/main/proto/data.proto

@@ -62,11 +62,12 @@ message Text {
     int32 type = 1;
     TextFormat format = 2;
     string stringValue = 11;
-    TextPieceUser userValue = 21;
+    oneof textPieceType
-    TextPieceGift giftValue = 22;
+    {
-    TextPieceHeart heartValue = 23;
+      TextPieceUser userValue = 21;
+      TextPieceGift giftValue = 22;
+    }
     TextPiecePatternRef patternRefValue = 24;
-    TextPieceImage imageValue = 25;
   }
 
   message TextFormat {
@@ -82,7 +83,7 @@ message Text {
 
   message TextPieceGift {
     int32 giftId = 1;
-    TextPiecePatternRef nameRef = 2;
+    PatternRef nameRef = 2;
     ShowType showType = 3; // Enum
     int64 colorId = 4;
   }
@@ -97,19 +98,16 @@ message Text {
     bool withColon = 2;
   }
 
+  message PatternRef {
+    string key = 1;
+    string default_pattern = 2;
+  }
+
   enum ShowType {
     SHOW_TYPE_NORMAL = 0;
     SHOW_TYPE_FADE_IN_OUT = 1;
   }
 
-  message TextPieceHeart {
-    string color = 1;
-  }
-
-  message TextPieceImage {
-    Image image_model = 1;
-  }
-
 }
 
 // @Image
@@ -153,7 +151,7 @@ message BadgeStruct {
   bool is_customized = 24;
 
   message CombineBadge {
-    BadgeDisplayType badge_display_type = 1;
+    int32 badge_display_type = 1;
     Image icon = 2;
     TextBadge text = 3;
     string str = 4;

Client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java

@@ -199,12 +199,7 @@ public class TikTokLiveClient implements LiveClient
 
     @Override
     public boolean sendChat(String content) {
-        return sendChat(content, clientSettings.getSessionId(), clientSettings.getTtTargetIdc());
+        return httpClient.sendChat(roomInfo, content);
-    }
-
-    @Override
-    public boolean sendChat(String content, String sessionId, String ttTargetIdc) {
-        return httpClient.sendChat(roomInfo, content, sessionId, ttTargetIdc);
     }
 
     public void connectAsync(Consumer<LiveClient> onConnection) {

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java

@@ -182,23 +182,23 @@ public class TikTokLiveHttpClient implements LiveHttpClient
     }
 
     @Override
-    public boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
+    public boolean sendChat(LiveRoomInfo roomInfo, String content) {
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    return requestSendChat(roomInfo, content, sessionId, ttTargetIdc);
+                    return requestSendChat(roomInfo, content);
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        return requestSendChat(roomInfo, content, sessionId, ttTargetIdc);
+        return requestSendChat(roomInfo, content);
     }
 
-    public boolean requestSendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
+    public boolean requestSendChat(LiveRoomInfo roomInfo, String content) {
         JsonObject body = new JsonObject();
         body.addProperty("content", content);
-        body.addProperty("sessionId", sessionId);
+        body.addProperty("sessionId", clientSettings.getSessionId());
-        body.addProperty("ttTargetIdc", ttTargetIdc);
+        body.addProperty("ttTargetIdc", clientSettings.getTtTargetIdc());
         body.addProperty("roomId", roomInfo.getRoomId());
         HttpClientBuilder builder = httpFactory.client(clientSettings.isUseEulerstreamEnterprise() ? TIKTOK_CHAT_ENTERPRISE_URL : TIKTOK_CHAT_URL)
             .withHeader("Content-Type", "application/json");

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpOfflineClient.java

@@ -64,7 +64,7 @@ public class TikTokLiveHttpOfflineClient implements LiveHttpClient {
     }
 
     @Override
-    public boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
+    public boolean sendChat(LiveRoomInfo roomInfo, String content) {
         // DO NOTHING
         return false;
     }

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java

@@ -29,7 +29,7 @@ import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 
-import java.util.*;
+import java.util.List;
 import java.util.logging.Logger;
 
 public class LiveUserDataMapper
@@ -66,6 +66,7 @@ public class LiveUserDataMapper
 
             roomInfo.setTitle(liveRoom.get("title").getAsString());
             roomInfo.setStartTime(liveRoom.get("startTime").getAsLong());
+            roomInfo.setTitle(liveRoom.get("title").getAsString());
             roomInfo.setViewersCount(liveRoom.getAsJsonObject("liveRoomStats").get("userCount").getAsInt());
             roomInfo.setTotalViewersCount(liveRoom.getAsJsonObject("liveRoomStats").get("enterCount").getAsInt());
             roomInfo.setAgeRestricted(jsonObject.get("statusCode").getAsInt() == TikTokLiveHttpClient.TIKTOK_AGE_RESTRICTED_CODE);
@@ -91,51 +92,9 @@ public class LiveUserDataMapper
             roomInfo.setHostName(foundUser.getName());
 
             return new LiveUserData.Response(json, statusEnum, roomInfo);
-        } catch (JsonSyntaxException | IllegalStateException | NullPointerException e) {
+        } catch (JsonSyntaxException | IllegalStateException e) {
             logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
             return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, null);
         }
     }
-
-    public static LiveUserData.Response mapEulerstream(JsonObject jsonObject, Logger logger) {
-        try {
-			JsonObject roomInfoJson = jsonObject.getAsJsonObject("roomInfo");
-			JsonObject userJson = jsonObject.getAsJsonObject("user");
-
-            var roomId = roomInfoJson.get("id").getAsString();
-            var status = roomInfoJson.get("status").getAsInt();
-
-            TikTokRoomInfo roomInfo = new TikTokRoomInfo();
-            roomInfo.setRoomId(roomId);
-            roomInfo.setTitle(roomInfoJson.get("title").getAsString());
-            roomInfo.setStartTime(roomInfoJson.get("startTime").getAsLong());
-            roomInfo.setViewersCount(Optional.ofNullable(roomInfoJson.get("currentViewers")).filter(JsonElement::isJsonPrimitive).map(JsonElement::getAsInt).orElse(0));
-            roomInfo.setTotalViewersCount(roomInfoJson.get("totalViewers").getAsInt());
-
-            var statusEnum = switch (status) {
-                case 2 -> LiveUserData.UserStatus.Live;
-                case 3 -> LiveUserData.UserStatus.LivePaused;
-                case 4 -> LiveUserData.UserStatus.Offline;
-                default -> LiveUserData.UserStatus.NotFound;
-            };
-
-            User foundUser = new User(
-                Long.parseLong(userJson.get("numericUid").getAsString()),
-                userJson.get("uniqueId").getAsString(),
-                userJson.get("nickname").getAsString(),
-                userJson.get("signature").getAsString(),
-                new Picture(userJson.get("avatarUrl").getAsString()),
-                userJson.get("following").getAsLong(),
-                userJson.get("followers").getAsLong(),
-                List.of());
-
-            roomInfo.setHost(foundUser);
-            roomInfo.setHostName(foundUser.getName());
-
-            return new LiveUserData.Response(jsonObject.toString(), statusEnum, roomInfo);
-        } catch (JsonSyntaxException | IllegalStateException | NullPointerException e) {
-            logger.warning("Malformed Json: '"+jsonObject.toString()+"' - Error Message: "+e.getMessage());
-            return new LiveUserData.Response(jsonObject.toString(), LiveUserData.UserStatus.NotFound, null);
-        }
-    }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java

@@ -56,7 +56,7 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
                             switch (oMsg.get("type").getAsString()) { // Should only receive these 2 types ever
                                 case "workerInfo" -> liveClient.getLogger().info(oMsg.toString()); // Always 1st message
                                 case "roomInfo" -> { // Always 2nd message
-									LiveUserData.Response data = LiveUserDataMapper.mapEulerstream(oMsg.getAsJsonObject("data"), liveClient.getLogger());
+									LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
                                     liveClient.getRoomInfo().copy(data.getRoomInfo());
                                     eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
                                 }
@@ -67,7 +67,6 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
             } else
                 throw new IllegalArgumentException("Invalid JsonObject: "+element);
         } catch (Exception e) {
-            e.printStackTrace();
             eventHandler.publish(liveClient, new TikTokErrorEvent(e));
         }
         if (isOpen()) {

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
 
 

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.11.7-Release</version>
+    <version>1.11.2-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>

tools-readme/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.7-Release</version>
+        <version>1.11.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>