File tree Expand file tree Collapse file tree 2 files changed +16
-13
lines changed
Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler Expand file tree Collapse file tree 2 files changed +16
-13
lines changed Original file line number Diff line number Diff line change @@ -62,12 +62,11 @@ message Text {
6262 int32 type = 1 ;
6363 TextFormat format = 2 ;
6464 string stringValue = 11 ;
65- oneof textPieceType
66- {
67- TextPieceUser userValue = 21 ;
68- TextPieceGift giftValue = 22 ;
69- }
65+ TextPieceUser userValue = 21 ;
66+ TextPieceGift giftValue = 22 ;
67+ TextPieceHeart heartValue = 23 ;
7068 TextPiecePatternRef patternRefValue = 24 ;
69+ TextPieceImage imageValue = 25 ;
7170 }
7271
7372 message TextFormat {
@@ -83,7 +82,7 @@ message Text {
8382
8483 message TextPieceGift {
8584 int32 giftId = 1 ;
86- PatternRef nameRef = 2 ;
85+ TextPiecePatternRef nameRef = 2 ;
8786 ShowType showType = 3 ; // Enum
8887 int64 colorId = 4 ;
8988 }
@@ -98,16 +97,19 @@ message Text {
9897 bool withColon = 2 ;
9998 }
10099
101- message PatternRef {
102- string key = 1 ;
103- string default_pattern = 2 ;
104- }
105-
106100 enum ShowType {
107101 SHOW_TYPE_NORMAL = 0 ;
108102 SHOW_TYPE_FADE_IN_OUT = 1 ;
109103 }
110104
105+ message TextPieceHeart {
106+ string color = 1 ;
107+ }
108+
109+ message TextPieceImage {
110+ Image image_model = 1 ;
111+ }
112+
111113}
112114
113115// @Image
@@ -151,7 +153,7 @@ message BadgeStruct {
151153 bool is_customized = 24 ;
152154
153155 message CombineBadge {
154- int32 badge_display_type = 1 ;
156+ BadgeDisplayType badge_display_type = 1 ;
155157 Image icon = 2 ;
156158 TextBadge text = 3 ;
157159 string str = 4 ;
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ public void onMessage(String raw) {
5656 switch (oMsg .get ("type" ).getAsString ()) { // Should only receive these 2 types ever
5757 case "workerInfo" -> liveClient .getLogger ().info (oMsg .toString ()); // Always 1st message
5858 case "roomInfo" -> { // Always 2nd message
59- LiveUserData .Response data = LiveUserDataMapper .map (oMsg .getAsJsonObject ("data" ).getAsJsonObject ("data" ). getAsJsonObject ( " raw" ).toString (), liveClient .getLogger ());
59+ LiveUserData .Response data = LiveUserDataMapper .map (oMsg .getAsJsonObject ("data" ).getAsJsonObject ("raw" ).toString (), liveClient .getLogger ());
6060 liveClient .getRoomInfo ().copy (data .getRoomInfo ());
6161 eventHandler .publish (liveClient , new TikTokRoomInfoEvent (liveClient .getRoomInfo ()));
6262 }
@@ -67,6 +67,7 @@ public void onMessage(String raw) {
6767 } else
6868 throw new IllegalArgumentException ("Invalid JsonObject: " +element );
6969 } catch (Exception e ) {
70+ e .printStackTrace ();
7071 eventHandler .publish (liveClient , new TikTokErrorEvent (e ));
7172 }
7273 if (isOpen ()) {
You can’t perform that action at this time.
0 commit comments