From a0c445656c35f15408567e33f197a42a13a97905 Mon Sep 17 00:00:00 2001
From: kohlerpop1 <kohlerpop1@gmail.com>
Date: Sat, 4 Oct 2025 22:38:47 -0400
Subject: [PATCH] Slight change of decoding for TikTokWebSocketEulerListener!

---
 API/src/main/proto/data.proto                 | 26 ++++++++++---------
 .../euler/TikTokWebSocketEulerListener.java   |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/API/src/main/proto/data.proto b/API/src/main/proto/data.proto
index 923fba7..8a1b8b7 100644
--- a/API/src/main/proto/data.proto
+++ b/API/src/main/proto/data.proto
@@ -62,12 +62,11 @@ message Text {
     int32 type = 1;
     TextFormat format = 2;
     string stringValue = 11;
-    oneof textPieceType
-    {
-      TextPieceUser userValue = 21;
-      TextPieceGift giftValue = 22;
-    }
+    TextPieceUser userValue = 21;
+    TextPieceGift giftValue = 22;
+    TextPieceHeart heartValue = 23;
     TextPiecePatternRef patternRefValue = 24;
+    TextPieceImage imageValue = 25;
   }
 
   message TextFormat {
@@ -83,7 +82,7 @@ message Text {
 
   message TextPieceGift {
     int32 giftId = 1;
-    PatternRef nameRef = 2;
+    TextPiecePatternRef nameRef = 2;
     ShowType showType = 3; // Enum
     int64 colorId = 4;
   }
@@ -98,16 +97,19 @@ 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
@@ -151,7 +153,7 @@ message BadgeStruct {
   bool is_customized = 24;
 
   message CombineBadge {
-    int32 badge_display_type = 1;
+    BadgeDisplayType badge_display_type = 1;
     Image icon = 2;
     TextBadge text = 3;
     string str = 4;
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java
index f7f4a8c..e87b38c 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java
+++ b/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.map(oMsg.getAsJsonObject("data").getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
+									LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
                                     liveClient.getRoomInfo().copy(data.getRoomInfo());
                                     eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
                                 }
@@ -67,6 +67,7 @@ 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()) {