Breaking changes:

'Gift': changed from class to enum, so now you can handle
incoming gifts in switch

`Events`
- new:
     onGiftComboFinished
- Removed:
      onGiftBrodcast
- Rename:
     onGiftMessage -> onGift
     onRoomPinMessage -> onRoomPin
     onRoomMessage -> onRoom
     onLinkMessage -> onLink
     onBarrageMessage -> onBarrage
     onPollMessage -> onPoll
     onShopMessage -> onShop
     onDetectMessage -> onDetect

`GiftManager`
   added:
      registerGift
      findById
      findByName
      getGifts
   removed:
      getActiveGifts

API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java

@@ -22,11 +22,8 @@
  */
 package io.github.jwdeveloper.tiktok.annotations;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 
 public enum EventType
 {
-   Control, Message, Custom
+   Control, Message, Custom, Debug
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java

@@ -23,13 +23,16 @@
 package io.github.jwdeveloper.tiktok.events;
 
 
+import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 import lombok.Getter;
 
 /*
   Base class for all events
  */
 @Getter
-public abstract class TikTokEvent
-{
+public abstract class TikTokEvent {
 
+    public String toJson() {
+        return JsonUtil.toJson(this);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java

@@ -23,103 +23,113 @@
 package io.github.jwdeveloper.tiktok.events;
 
 import io.github.jwdeveloper.tiktok.events.messages.*;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokConnectedEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftComboFinishedEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokJoinEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokLikeEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokBarrageEvent;
-import io.github.jwdeveloper.tiktok.events.messages.poll.TikTokPollEvent;
+import io.github.jwdeveloper.tiktok.events.messages.gift.TikTokGiftComboFinishedEvent;
+import io.github.jwdeveloper.tiktok.events.messages.gift.TikTokGiftEvent;
+import io.github.jwdeveloper.tiktok.events.messages.social.TikTokFollowEvent;
+import io.github.jwdeveloper.tiktok.events.messages.social.TikTokJoinEvent;
+import io.github.jwdeveloper.tiktok.events.messages.social.TikTokLikeEvent;
+import io.github.jwdeveloper.tiktok.events.messages.social.TikTokShareEvent;
+import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketMessageEvent;
+import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketResponseEvent;
+import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketUnhandledMessageEvent;
 
 
 public interface TikTokEventBuilder<T> {
-    T onUnhandledSocial(TikTokEventConsumer<TikTokUnhandledSocialEvent> event);
-
-    T onLinkMicFanTicket(TikTokEventConsumer<TikTokLinkMicFanTicketEvent> event);
-
-    T onEnvelope(TikTokEventConsumer<TikTokEnvelopeEvent> event);
-
-    T onShop(TikTokEventConsumer<TikTokShopEvent> event);
-
-    T onDetect(TikTokEventConsumer<TikTokDetectEvent> event);
-
-    T onLinkLayer(TikTokEventConsumer<TikTokLinkLayerEvent> event);
-
-    T onConnected(TikTokEventConsumer<TikTokConnectedEvent> event);
-
-    T onCaption(TikTokEventConsumer<TikTokCaptionEvent> event);
-
-    T onQuestion(TikTokEventConsumer<TikTokQuestionEvent> event);
-
-    T onRoomPin(TikTokEventConsumer<TikTokRoomPinEvent> event);
 
     T onRoom(TikTokEventConsumer<TikTokRoomEvent> event);
 
-    T onLivePaused(TikTokEventConsumer<TikTokLivePausedEvent> event);
-
-    T onLike(TikTokEventConsumer<TikTokLikeEvent> event);
-
-    T onBarrage(TikTokEventConsumer<TikTokBarrageEvent> event);
-
-    T onGift(TikTokEventConsumer<TikTokGiftEvent> event);
-
-    T onLinkMicArmies(TikTokEventConsumer<TikTokLinkMicArmiesEvent> event);
-
-    T onEmote(TikTokEventConsumer<TikTokEmoteEvent> event);
-
-    T onUnauthorizedMember(TikTokEventConsumer<TikTokUnauthorizedMemberEvent> event);
-
-    T onInRoomBanner(TikTokEventConsumer<TikTokInRoomBannerEvent> event);
-
-    T onLinkMicMethod(TikTokEventConsumer<TikTokLinkMicMethodEvent> event);
-
-    T onSubscribe(TikTokEventConsumer<TikTokSubscribeEvent> event);
-
-    T onPoll(TikTokEventConsumer<TikTokPollEvent> event);
-
-    T onFollow(TikTokEventConsumer<TikTokFollowEvent> event);
-
-    T onRoomViewerData(TikTokEventConsumer<TikTokRoomViewerDataEvent> event);
-
-    T onGoalUpdate(TikTokEventConsumer<TikTokGoalUpdateEvent> event);
+    T onRoomUserInfo(TikTokEventConsumer<TikTokRoomUserInfoEvent> event);
 
     T onComment(TikTokEventConsumer<TikTokCommentEvent> event);
 
-    T onRankUpdate(TikTokEventConsumer<TikTokRankUpdateEvent> event);
-
-    T onIMDelete(TikTokEventConsumer<TikTokIMDeleteEvent> event);
-
-    T onLiveEnded(TikTokEventConsumer<TikTokLiveEndedEvent> event);
-
-    T onError(TikTokEventConsumer<TikTokErrorEvent> event);
-
-    T onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event);
-
-    T onJoin(TikTokEventConsumer<TikTokJoinEvent> event);
-
-    T onRankText(TikTokEventConsumer<TikTokRankTextEvent> event);
-
-    T onShare(TikTokEventConsumer<TikTokShareEvent> event);
-
-    T onUnhandledMember(TikTokEventConsumer<TikTokUnhandledMemberEvent> event);
-
-    T onSubNotify(TikTokEventConsumer<TikTokSubNotifyEvent> event);
-
-    T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
-
-    T onDisconnected(TikTokEventConsumer<TikTokDisconnectedEvent> event);
-
-    T onGiftCombo(TikTokEventConsumer<TikTokGiftComboFinishedEvent> event);
-
-    T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
-
-    T onEvent(TikTokEventConsumer<TikTokEvent> event);
 
     T onWebsocketMessage(TikTokEventConsumer<TikTokWebsocketMessageEvent> event);
 
+    T onWebsocketResponse(TikTokEventConsumer<TikTokWebsocketResponseEvent> event);
+
+    T onWebsocketUnhandledMessage(TikTokEventConsumer<TikTokWebsocketUnhandledMessageEvent> event);
+
+
+    T onGiftCombo(TikTokEventConsumer<TikTokGiftComboFinishedEvent> event);
+
+    T onGift(TikTokEventConsumer<TikTokGiftEvent> event);
+
+
+    T onSubscribe(TikTokEventConsumer<TikTokSubscribeEvent> event);
+
+    T onFollow(TikTokEventConsumer<TikTokFollowEvent> event);
+
+    T onLike(TikTokEventConsumer<TikTokLikeEvent> event);
+
+    T onEmote(TikTokEventConsumer<TikTokEmoteEvent> event);
+
+    T onJoin(TikTokEventConsumer<TikTokJoinEvent> event);
+
+    T onShare(TikTokEventConsumer<TikTokShareEvent> event);
+
+    T onUnhandledSocial(TikTokEventConsumer<TikTokUnhandledSocialEvent> event);
+
+
+    T onLivePaused(TikTokEventConsumer<TikTokLivePausedEvent> event);
+
+    T onLiveEnded(TikTokEventConsumer<TikTokLiveEndedEvent> event);
+
+    T onConnected(TikTokEventConsumer<TikTokConnectedEvent> event);
+
     T onReconnecting(TikTokEventConsumer<TikTokReconnectingEvent> event);
 
+    T onDisconnected(TikTokEventConsumer<TikTokDisconnectedEvent> event);
+
+
+    T onError(TikTokEventConsumer<TikTokErrorEvent> event);
+
+    T onEvent(TikTokEventConsumer<TikTokEvent> event);
+
+
+    // TODO implement later
+    //T onLinkMicFanTicket(TikTokEventConsumer<TikTokLinkMicFanTicketEvent> event);
+
+    //T onEnvelope(TikTokEventConsumer<TikTokEnvelopeEvent> event);
+
+    //T onShop(TikTokEventConsumer<TikTokShopEvent> event);
+
+    //T onDetect(TikTokEventConsumer<TikTokDetectEvent> event);
+
+    //T onLinkLayer(TikTokEventConsumer<TikTokLinkLayerEvent> event);
+
+    //T onCaption(TikTokEventConsumer<TikTokCaptionEvent> event);
+
+    //T onQuestion(TikTokEventConsumer<TikTokQuestionEvent> event);
+
+    //T onRoomPin(TikTokEventConsumer<TikTokRoomPinEvent> event);
+
+    //T onBarrage(TikTokEventConsumer<TikTokBarrageEvent> event);
+
+    //T onLinkMicArmies(TikTokEventConsumer<TikTokLinkMicArmiesEvent> event);
+
+    //T onUnauthorizedMember(TikTokEventConsumer<TikTokUnauthorizedMemberEvent> event);
+
+    //T onInRoomBanner(TikTokEventConsumer<TikTokInRoomBannerEvent> event);
+
+    //T onLinkMicMethod(TikTokEventConsumer<TikTokLinkMicMethodEvent> event);
+
+    //T onPoll(TikTokEventConsumer<TikTokPollEvent> event);
+
+    //T onGoalUpdate(TikTokEventConsumer<TikTokGoalUpdateEvent> event);
+
+    //T onRankUpdate(TikTokEventConsumer<TikTokRankUpdateEvent> event);
+
+    //T onIMDelete(TikTokEventConsumer<TikTokIMDeleteEvent> event);
+
+    //T onRankText(TikTokEventConsumer<TikTokRankTextEvent> event);
+
+    //T onUnhandledMember(TikTokEventConsumer<TikTokUnhandledMemberEvent> event);
+
+    //T onSubNotify(TikTokEventConsumer<TikTokSubNotifyEvent> event);
+
+    //T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
+
+    //T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
 }
 
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageEvent.java

@@ -45,10 +45,10 @@ public class TikTokBarrageEvent extends TikTokHeaderEvent {
 
     public TikTokBarrageEvent(WebcastBarrageMessage msg) {
         super(msg.getCommon());
-        icon = Picture.Map(msg.getIcon());
+        icon = Picture.map(msg.getIcon());
         eventName = msg.getEvent().getEventName();
-        backGround = Picture.Map(msg.getBackground());
-        rightIcon = Picture.Map(msg.getRightIcon());
+        backGround = Picture.map(msg.getBackground());
+        rightIcon = Picture.map(msg.getRightIcon());
         duration = msg.getDuration();
         switch (msg.getMsgType()) {
             case GRADEUSERENTRANCENOTIFICATION:

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java

@@ -38,9 +38,9 @@ public class TikTokCaptionEvent extends TikTokHeaderEvent {
     String text;
 
     public TikTokCaptionEvent(WebcastCaptionMessage msg) {
-        super(msg.getHeader());
+        super(msg.getCommon());
         captionTimeStamp = msg.getTimeStamp();
-        iSOLanguage = msg.getCaptionData().getISOLanguage();
+        iSOLanguage = msg.getCaptionData().getLanguage();
         text = msg.getCaptionData().getText();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java

@@ -26,7 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage;
 import lombok.Getter;
 
@@ -40,16 +40,18 @@ import java.util.List;
 public class TikTokCommentEvent extends TikTokHeaderEvent {
     private final User user;
     private final String text;
-    private final String language;
-    private final List<User> mentionedUsers;
+    private final String getUserLanguage;
+    private final User mentionedUser;
     private final List<Picture> pictures;
+    private final boolean visibleToSender;
 
     public TikTokCommentEvent(WebcastChatMessage msg) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
+        user = User.map(msg.getUser());
         text = msg.getContent();
-        language = msg.getContentLanguage();
-        mentionedUsers = List.of(User.mapOrEmpty(msg.getAtUser()));
-        pictures = msg.getEmotesListList().stream().map(e -> Picture.Map(e.getEmote().getImage())).toList();
+        visibleToSender = msg.getVisibleToSender();
+        getUserLanguage = msg.getContentLanguage();
+        mentionedUser = User.map(msg.getAtUser(),msg.getUserIdentity());
+        pictures = msg.getEmotesListList().stream().map(e -> Picture.map(e.getEmote().getImage())).toList();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java

@@ -26,7 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Emote;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEmoteChatMessage;
 import lombok.Value;
 
@@ -43,7 +43,7 @@ public class TikTokEmoteEvent extends TikTokHeaderEvent {
 
     public TikTokEmoteEvent(WebcastEmoteChatMessage msg) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
+        user = User.map(msg.getUser());
         emotes = msg.getEmoteListList().stream().map(Emote::map).toList();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
 import lombok.Value;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java

@@ -26,7 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGoalUpdateMessage;
 import lombok.Getter;
@@ -43,13 +43,13 @@ public class TikTokGoalUpdateEvent extends TikTokHeaderEvent {
 
     public TikTokGoalUpdateEvent(WebcastGoalUpdateMessage msg) {
         super(msg.getCommon());
-        picture = Picture.Map(msg.getContributorAvatar());
+        picture = Picture.map(msg.getContributorAvatar());
         goalId = msg.getGoal().getId();
         description = msg.getGoal().getDescription();
         users = msg.getGoal()
                 .getContributorsListList()
                 .stream()
-                .map(u -> new User(u.getUserId(), u.getDisplayId(), Picture.Map(u.getAvatar())))
+                .map(u -> new User(u.getUserId(), u.getDisplayId(), Picture.map(u.getAvatar())))
                 .toList();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java

@@ -51,7 +51,7 @@ public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
         super(msg.getCommon());
         battleId = msg.getId();
         armies = msg.getBattleItemsList().stream().map(LinkMicArmy::new).toList();
-        picture = Picture.Map(msg.getImage());
+        picture = Picture.map(msg.getImage());
         battleStatus = msg.getBattleStatus();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastQuestionNewMessage;
 import lombok.Getter;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomEvent.java

@@ -25,33 +25,37 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.UserAttribute;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLiveIntroMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSystemMessage;
 import lombok.Getter;
+import lombok.NonNull;
 
 @Getter
 @EventMeta(eventType = EventType.Message)
-public class TikTokRoomEvent extends TikTokHeaderEvent {
-    private User host;
+public class TikTokRoomEvent extends TikTokHeaderEvent
+{
+    private User hostUser;
     private String hostLanguage;
-    private final String message;
+    private final String welcomeMessage;
 
     public TikTokRoomEvent(WebcastRoomMessage msg) {
         super(msg.getCommon());
-        message = msg.getContent();
+        welcomeMessage = msg.getContent();
     }
 
     public TikTokRoomEvent(WebcastSystemMessage msg) {
         super(msg.getCommon());
-        message = msg.getMessage();
+        welcomeMessage = msg.getMessage();
     }
 
     public TikTokRoomEvent(WebcastLiveIntroMessage msg) {
         super(msg.getCommon());
-        host = User.mapOrEmpty(msg.getHost());
-        message = msg.getContent();
+        hostUser = User.map(msg.getHost());
+        hostUser.addAttribute(UserAttribute.LiveHost);
+        welcomeMessage = msg.getContent();
         hostLanguage = msg.getLanguage();
     }
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomUserInfoEvent.java

@@ -25,23 +25,31 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.TopViewer;
+import io.github.jwdeveloper.tiktok.events.objects.RankingUser;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage;
 import lombok.Getter;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+
 
 @Getter
 @EventMeta(eventType = EventType.Message)
-public class TikTokRoomViewerDataEvent extends TikTokHeaderEvent {
-    private final Integer viewerCount;
-    private final List<TopViewer> topViewers;
+public class TikTokRoomUserInfoEvent extends TikTokHeaderEvent {
+    private final int totalUsers;
 
-    public TikTokRoomViewerDataEvent(WebcastRoomUserSeqMessage msg) {
+    /**
+     * Only top 5 users in ranking has detailed data
+     * rest has only ID
+     */
+    private final List<RankingUser> usersRanking;
+    public TikTokRoomUserInfoEvent(WebcastRoomUserSeqMessage msg) {
         super(msg.getCommon());
-        //TODO sorting by rank       TopViewers = msg?.TopViewers?.Select(t => new Objects.TopViewer(t))?.OrderBy(t => t.Rank)?
-        viewerCount = (int) msg.getTotalUser();
-        topViewers = msg.getRanksListList().stream().map(TopViewer::new).toList();
+        totalUsers = msg.getTotalUser();
+        usersRanking = msg.getRanksListList().stream().map(RankingUser::new)
+                .sorted((ru1, ru2) -> Integer.compare(ru2.getScore(), ru1.getScore()))
+                .collect(Collectors.toList());
     }
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSubNotifyMessage;
 import lombok.Value;
 
@@ -36,7 +36,7 @@ public class TikTokSubNotifyEvent extends TikTokHeaderEvent {
 
     public TikTokSubNotifyEvent(WebcastSubNotifyMessage msg) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
+        user = User.map(msg.getUser());
     }
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import lombok.Getter;
 
@@ -35,14 +35,14 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Custom)
 public class TikTokSubscribeEvent extends TikTokHeaderEvent {
-  private User newSubscriber;
+  private User user;
 
   public TikTokSubscribeEvent(WebcastMemberMessage msg) {
     super(msg.getCommon());
 
     if(msg.hasUser())
     {
-      newSubscriber = new User(msg.getUser());
+      user = new User(msg.getUser());
     }
   }
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftComboFinishedEvent.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.gift;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;

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

@@ -20,14 +20,14 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.gift;
 
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Gift;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.Getter;
 
@@ -39,20 +39,20 @@ import lombok.Getter;
 @Getter
 public class TikTokGiftEvent extends TikTokHeaderEvent {
     private final Gift gift;
-    private final User sender;
+    private final User user;
     private final String purchaseId;
     private final String receipt;
-    private final Long comboCount;
+    private final int combo;
     private final boolean comboFinished;
-    private final Long comboIndex;
+    private final int comboIndex;
 
     public TikTokGiftEvent(Gift gift, WebcastGiftMessage msg) {
         super(msg.getCommon());
         this.gift = gift;
-        sender = User.mapOrEmpty(msg.getUser());
+        user = User.map(msg.getUser());
         purchaseId = msg.getOrderId();
         receipt = msg.getMonitorExtra();
-        comboCount = msg.getComboCount();
+        combo = msg.getComboCount();
         comboFinished = msg.getRepeatEnd() > 0;
         comboIndex = msg.getRepeatCount();
     }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEndEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages.poll;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.objects.PollOption;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage;
 import lombok.Getter;
 
@@ -40,7 +40,7 @@ public class TikTokPollEndEvent extends TikTokPollEvent
     public TikTokPollEndEvent(WebcastPollMessage msg) {
         super(msg);
         var end = msg.getEndContent();
-        operator = User.mapOrEmpty(end.getOperator());
+        operator = User.map(end.getOperator());
         options =  end.getOptionListList().stream().map(PollOption::map).toList();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollStartEvent.java

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.events.messages.poll;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.objects.PollOption;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage;
 import lombok.Getter;
 
@@ -44,7 +44,7 @@ public class TikTokPollStartEvent extends TikTokPollEvent {
         var startContent = msg.getStartContent();
 
         title = startContent.getTitle();
-        operator = User.mapOrEmpty(startContent.getOperator());
+        operator = User.map(startContent.getOperator());
         options = startContent.getOptionListList().stream().map(PollOption::map).toList();
     }
 }

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

@@ -20,12 +20,13 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.social;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
+import io.github.jwdeveloper.tiktok.mappers.MappingContext;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Value;
 
@@ -37,11 +38,12 @@ import lombok.Value;
 public class TikTokFollowEvent extends TikTokHeaderEvent
 {
    User user;
-   Long totalFollowers;
+   int totalFollowers;
 
   public TikTokFollowEvent(WebcastSocialMessage msg) {
     super(msg.getCommon());
-    user = User.mapOrEmpty(msg.getUser());
+    user = User.map(msg.getUser());
     totalFollowers = msg.getFollowCount();
   }
+
 }

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

@@ -20,12 +20,12 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.social;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -34,17 +34,17 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Custom)
 public class TikTokJoinEvent extends TikTokHeaderEvent {
     private final User user;
-    private final int viewersCount;
+    private final int totalUsers;
 
     public TikTokJoinEvent(WebcastSocialMessage msg, int viewersCount) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
-        this.viewersCount = viewersCount;
+        user = User.map(msg.getUser());
+        this.totalUsers = viewersCount;
     }
 
     public TikTokJoinEvent(WebcastMemberMessage msg) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
-        viewersCount = msg.getMemberCount();
+        user = User.map(msg.getUser());
+        totalUsers = msg.getMemberCount();
     }
 }

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

@@ -20,12 +20,12 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.social;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -40,21 +40,21 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
 {
     private final User user;
 
-    private final Integer count;
+    private final int likes;
 
-    private final Integer totalLikes;
+    private final int totalLikes;
 
     public TikTokLikeEvent(WebcastSocialMessage msg, int totalLikes) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
-        count = 1;
+        user = User.map(msg.getUser());
+        likes = 1;
         this.totalLikes = totalLikes;
     }
 
     public TikTokLikeEvent(WebcastLikeMessage msg) {
         super(msg.getCommon());
-        user = User.mapOrEmpty(msg.getUser());
-        count = msg.getCount();
+        user = User.map(msg.getUser());
+        likes = msg.getCount();
         totalLikes = msg.getTotal();
     }
 }

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

@@ -20,12 +20,12 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.social;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
 
@@ -36,18 +36,18 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Custom)
 public class TikTokShareEvent extends TikTokHeaderEvent {
   private final User user;
-  private final Integer amount;
+  private final int totalShares;
 
   public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
     super(msg.getCommon());
-    user = User.mapOrEmpty(msg.getUser());
-    this.amount = amount;
+    user = User.map(msg.getUser());
+    this.totalShares = amount;
   }
 
   public TikTokShareEvent(WebcastSocialMessage msg) {
     super(msg.getCommon());
-    user = User.mapOrEmpty(msg.getUser());
-    amount = 1;
+    user = User.map(msg.getUser());
+    totalShares = 1;
   }
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketMessageEvent.java

@@ -20,14 +20,13 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.websocket;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 
@@ -36,7 +35,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-@EventMeta(eventType = EventType.Custom)
+@EventMeta(eventType = EventType.Debug)
 public class TikTokWebsocketMessageEvent extends TikTokEvent
 {
     private TikTokEvent event;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketResponseEvent.java

@@ -20,35 +20,19 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.objects;
+package io.github.jwdeveloper.tiktok.events.messages.websocket;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Value;
 
-import java.util.List;
-
-@Value
-public class BarrageData {
-  String eventType;
-  String label;
-  List<BarrageUser> users;
-
-  public BarrageData(String eventType, String label, List<BarrageUser> users)
-  {
-    this.eventType = eventType;
-    this.label = label;
-    this.users = users;
-  }
-
-
-
-
-  @Value
-  public static class BarrageUser
-  {
-      User user;
-
-      String data;
-  }
+@Getter
+@AllArgsConstructor
+@EventMeta(eventType = EventType.Debug)
+public class TikTokWebsocketResponseEvent extends TikTokEvent
+{
+    private WebcastResponse response;
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketUnhandledMessageEvent.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.events.messages;
+package io.github.jwdeveloper.tiktok.events.messages.websocket;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
@@ -33,10 +33,10 @@ import lombok.Getter;
  * Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
  */
 @Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokUnhandledWebsocketMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
+@EventMeta(eventType = EventType.Debug)
+public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
 {
-    public TikTokUnhandledWebsocketMessageEvent(WebcastResponse.Message data) {
+    public TikTokWebsocketUnhandledMessageEvent(WebcastResponse.Message data) {
         super(data);
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.events.objects;
-
-import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
-import lombok.Value;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Value
-public class Badge {
-    ComboBadge comboBadges;
-    List<TextBadge> textBadges;
-    List<ImageBadge> imageBadges;
-
-    public Badge(ComboBadge comboBadges, List<TextBadge> textBadges, List<ImageBadge> imageBadges) {
-        this.comboBadges = comboBadges;
-        this.textBadges = textBadges;
-        this.imageBadges = imageBadges;
-    }
-
-    public Badge(io.github.jwdeveloper.tiktok.messages.data.BadgeStruct badge)
-    {
-        comboBadges = ComboBadge.map(badge.getCombine());
-        textBadges = TextBadge.mapAll(badge.getTextList());
-        imageBadges = ImageBadge.mapAll(badge.getImageList());
-    }
-
-    @Value
-    public static class TextBadge {
-        EnumValue type;
-        String name;
-
-        public static TextBadge map(BadgeStruct.TextBadge input) {
-            return new TextBadge(EnumValue.Map(input.getDisplayType()),input.getKey());
-        }
-        public static List<TextBadge> mapAll(List<BadgeStruct.TextBadge> list) {
-            return list.stream().map(TextBadge::map).toList();
-        }
-    }
-
-    @Value
-    public static class ImageBadge {
-        EnumValue displayType;
-        Picture image;
-
-        public static ImageBadge map(BadgeStruct.ImageBadge input) {
-            return new ImageBadge(EnumValue.Map(input.getDisplayType()), Picture.Map(input.getImage()));
-        }
-        public static List<ImageBadge> mapAll(List<BadgeStruct.ImageBadge> list) {
-            return list.stream().map(ImageBadge::map).toList();
-        }
-    }
-
-    @Value
-    public static class ComboBadge {
-        Picture image;
-        String data;
-
-        public static ComboBadge map(BadgeStruct.CombineBadge input) {
-            return new ComboBadge(Picture.Map(input.getIcon()),input.getStr());
-        }
-        public static List<ComboBadge> mapAll(List<BadgeStruct.CombineBadge> list) {
-            return list.stream().map(ComboBadge::map).toList();
-        }
-    }
-
-    public static Badge Empty() {
-        var comboBadge = new ComboBadge(Picture.Empty(), "");
-        var textBadges = new ArrayList<TextBadge>();
-        var imageBadges = new ArrayList<ImageBadge>();
-        return new Badge(comboBadge, textBadges, imageBadges);
-    }
-
-    public static List<Badge> EmptyList() {
-        return new ArrayList<Badge>();
-    }
-}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Emote.java

@@ -33,7 +33,7 @@ public class Emote {
     UUID uuid;
 
     public static Emote map(io.github.jwdeveloper.tiktok.messages.data.Emote input) {
-        return new Emote(input.getEmoteId(), Picture.Map(input.getImage()), UUID.fromString(input.getUuid()));
+        return new Emote(input.getEmoteId(), Picture.map(input.getImage()), UUID.fromString(input.getUuid()));
     }
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.events.objects;
 
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.data.LinkMicArmiesItems;
 import lombok.Value;
 
@@ -36,7 +37,7 @@ public class LinkMicArmy {
         armyId = army.getHostUserId();
         armies = army.getBattleGroupsList()
                 .stream()
-                .map(x -> new Army(x.getUsersList().stream().map(User::mapOrEmpty).toList(), x.getPoints()))
+                .map(x -> new Army(x.getUsersList().stream().map(User::map).toList(), x.getPoints()))
                 .toList();
     }
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java

@@ -23,8 +23,8 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
 
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
 import lombok.Value;
 
 import java.util.List;

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java

@@ -43,14 +43,13 @@ public class Picture {
     @Getter
     private final String link;
 
-
     private Image image;
 
     public Picture(String link) {
         this.link = link;
     }
 
-    public static Picture Map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) {
+    public static Picture map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) {
 
         var index = profilePicture.getUrlListCount() - 1;
         if (index <= 0) {

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.events.objects;
 
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.data.PollOptionInfo;
 import lombok.Value;
 
@@ -37,7 +38,7 @@ public class PollOption {
 
     public static PollOption map(PollOptionInfo pollOptionInfo) {
 
-        var users = pollOptionInfo.getVoteUserListList().stream().map(User::mapOrEmpty).toList();
+        var users = pollOptionInfo.getVoteUserListList().stream().map(User::map).toList();
         return new PollOption(
                 pollOptionInfo.getOptionIdx(),
                 pollOptionInfo.getDisplayContent(),

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/RankingUser.java

@@ -21,20 +21,19 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 package io.github.jwdeveloper.tiktok.events.objects;
+
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import lombok.Value;
 
 @Value
-public class TopViewer {
-   Integer rank;
+public class RankingUser {
+    int rank;
+    User user;
+    int score;
 
-   User user;
-
-   Integer coinsGiven;
-
-  public TopViewer(io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage.Contributor viewer)
-  {
-    rank = (int)viewer.getRank();
-    user = User.mapOrEmpty(viewer.getUser());
-    coinsGiven = (int)viewer.getScore();
-  }
+    public RankingUser(io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage.Contributor viewer) {
+        rank =  viewer.getRank();
+        user = User.map(viewer.getUser());
+        score = viewer.getScore();
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Text.java

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.events.objects;
 
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -50,11 +51,11 @@ public class Text {
     {
         return switch (input.getType())
                 {
-            case 0 -> {
-                var user = User.mapOrEmpty(input.getUserValue().getUser());
-                yield new UserTextPiece(input.getStringValue(), user);
+            case 11 -> {
+                var user = User.map(input.getUserValue().getUser());
+                yield new UserTextPiece(user);
             }
-            case 1 -> new GiftTextPiece(input.getStringValue());
+            //case 12 -> new GiftTextPiece(input.getStringValue());
             default -> throw new TikTokLiveException("Unknown text piece");
         };
     }
@@ -62,14 +63,12 @@ public class Text {
     @Getter
     @AllArgsConstructor
     public static class TextPiece {
-        String value;
+
     }
 
     public static class UserTextPiece extends TextPiece {
         User user;
-
-        public UserTextPiece(String value, User user) {
-            super(value);
+        public UserTextPiece(User user) {
             this.user = user;
         }
     }
@@ -78,7 +77,7 @@ public class Text {
         Gift gift;
 
         public GiftTextPiece(String value) {
-            super(value);
+
         }
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java

@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.events.objects;
-
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
-import lombok.Getter;
-
-import java.util.List;
-
-@Getter
-public class User {
-    private Long userId;
-    private String uniqueId;
-    private final String nickName;
-    private String description;
-    private Picture picture;
-    private long following;
-    private long followers;
-    private long followsHost;
-    private List<Badge> badges;
-
-    public User(Long userId,
-                String uniqueId,
-                String nickName,
-                String description,
-                Picture profilePicture,
-                Integer following,
-                Integer followers,
-                Integer followsHost,
-                List<Badge> badges) {
-        this.userId = userId;
-        this.uniqueId = uniqueId;
-        this.nickName = nickName;
-        this.description = description;
-        this.picture = profilePicture;
-        this.following = following;
-        this.followers = followers;
-        this.followsHost = followsHost;
-        this.badges = badges;
-    }
-
-    public User(String uniqueId,
-                String nickName) {
-        this.uniqueId = uniqueId;
-        this.nickName = nickName;
-    }
-
-    public User(Long userId,
-                String nickName,
-                Picture picture) {
-        this.userId = userId;
-        this.nickName = nickName;
-        this.picture = picture;
-    }
-
-    public User(io.github.jwdeveloper.tiktok.messages.data.User user) {
-        assert user != null;
-        userId = user.getId();
-        uniqueId = user.getSpecialId();
-        nickName = user.getNickname();
-        description = user.getBioDescription();
-        picture = Picture.Map(user.getAvatarThumb());
-        following = user.getFollowInfo().getFollowingCount();
-        followers = user.getFollowInfo().getFollowerCount();
-        followsHost = user.getFollowInfo().getFollowStatus();
-        badges = user.getBadgeListList().stream().map(Badge::new).toList();
-    }
-
-
-    public static User EMPTY = new User(0L,
-            "",
-            "",
-            "",
-            Picture.Empty(),
-            0,
-            0,
-            0,
-            Badge.EmptyList());
-
-    public static User mapOrEmpty(io.github.jwdeveloper.tiktok.messages.data.User user) {
-        if (user != null) {
-            return new User(user);
-        }
-        return EMPTY;
-    }
-
-    public static User mapOrEmpty(io.github.jwdeveloper.tiktok.messages.data.VoteUser user) {
-        return new User(user.getUserId()+"",user.getNickName());
-    }
-
-    public static User map(WebcastEnvelopeMessage.EnvelopeInfo envelopeInfo) {
-        return new User(0L,
-                envelopeInfo.getSendUserId(),
-                envelopeInfo.getSendUserName(),
-                "",
-                Picture.Map(envelopeInfo.getSendUserAvatar()),
-                0,
-                0,
-                0,
-                Badge.EmptyList());
-    }
-}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/Badge.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.badges;
+
+public class Badge {
+
+    public static Badge map(io.github.jwdeveloper.tiktok.messages.data.BadgeStruct badge) {
+        return switch (badge.getDisplayType()) {
+            case BADGEDISPLAYTYPE_TEXT -> new TextBadge(badge.getText());
+            case BADGEDISPLAYTYPE_IMAGE -> new PictureBadge(badge.getImage());
+            case BADGEDISPLAYTYPE_STRING -> new StringBadge(badge.getStr());
+            case BADGEDISPLAYTYPE_COMBINE -> new CombineBadge(badge.getCombine());
+            default -> empty();
+        };
+    }
+
+    public static Badge empty() {
+        return new Badge();
+    }
+
+
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/CombineBadge.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.badges;
+
+import io.github.jwdeveloper.tiktok.events.objects.Picture;
+import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+
+public class CombineBadge extends Badge {
+    private final Picture picture;
+    private final String text;
+    private final String subText;
+
+
+    public CombineBadge(BadgeStruct.CombineBadge combineBadge) {
+
+        picture = Picture.map(combineBadge.getIcon());
+        text = combineBadge.getText().getDefaultPattern();
+        subText = combineBadge.getStr();
+    }
+
+
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/PictureBadge.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.badges;
+
+import io.github.jwdeveloper.tiktok.events.objects.Picture;
+import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+
+public class PictureBadge extends Badge {
+
+    private final Picture picture;
+    public PictureBadge(BadgeStruct.ImageBadge imageBadge) {
+
+        picture = Picture.map(imageBadge.getImage());
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/StringBadge.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.badges;
+
+import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+
+public class StringBadge extends Badge {
+
+    public String text;
+    public StringBadge(BadgeStruct.StringBadge stringBadge) {
+
+        this.text = stringBadge.getStr();
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/TextBadge.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.badges;
+
+import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+
+public class TextBadge extends Badge
+{
+    private final String text;
+
+    public TextBadge(BadgeStruct.TextBadge textBadge)
+    {
+        this.text = textBadge.getDefaultPattern();
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/FansLevelParam.java

@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.events.objects.barrage;
 
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage;
 
 public class FansLevelParam extends BarrageParam
@@ -32,6 +32,6 @@ public class FansLevelParam extends BarrageParam
     public FansLevelParam(WebcastBarrageMessage.BarrageTypeFansLevelParam param)
     {
         this.currentGrade = param.getCurrentGrade();
-        this.user = User.mapOrEmpty(param.getUser());
+        this.user = User.map(param.getUser());
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/UserGradeParam.java

@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.events.objects.barrage;
 
-import io.github.jwdeveloper.tiktok.events.objects.User;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage;
 
 public class UserGradeParam extends BarrageParam {
@@ -30,6 +30,6 @@ public class UserGradeParam extends BarrageParam {
     User user;
     public UserGradeParam(WebcastBarrageMessage.BarrageTypeUserGradeParam param) {
         this.currentGrade = param.getCurrentGrade();
-        this.user = User.mapOrEmpty(param.getUser());
+        this.user = User.map(param.getUser());
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/User.java

@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.users;
+
+import io.github.jwdeveloper.tiktok.events.objects.badges.Badge;
+import io.github.jwdeveloper.tiktok.events.objects.Picture;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Getter
+public class User {
+    private final Long id;
+    private final String name;
+    private String displayName;
+    private String description;
+    private Picture picture;
+    private long following;
+    private long followers;
+    private List<Badge> badges;
+    @Getter(AccessLevel.NONE)
+    private Set<UserAttribute> attributes;
+
+    @Setter
+    private boolean tracked;
+
+    public List<UserAttribute> getAttributes() {
+        return attributes.stream().toList();
+    }
+    public boolean hasAttribute(UserAttribute userFlag) {
+        return attributes.contains(userFlag);
+    }
+
+    public void addAttribute(UserAttribute... flags) {
+        this.attributes.addAll(Arrays.stream(flags).toList());
+    }
+
+    public boolean isGiftGiver() {
+        return hasAttribute(UserAttribute.GiftGiver);
+    }
+
+    public boolean isSubscriber() {
+        return hasAttribute(UserAttribute.Subscriber);
+    }
+
+    public boolean isMutualFollowingWithHost() {
+        return hasAttribute(UserAttribute.MutualFollowingWithLiveHost);
+    }
+
+    public boolean isFollower() {
+        return hasAttribute(UserAttribute.Follower);
+    }
+
+    public boolean isAdmin() {
+        return hasAttribute(UserAttribute.Admin);
+    }
+
+    public boolean isMuted() {
+        return hasAttribute(UserAttribute.Muted);
+    }
+
+    public boolean isBlocked() {
+        return hasAttribute(UserAttribute.Blocked);
+    }
+
+    public boolean isModerator() {
+        return hasAttribute(UserAttribute.Moderator);
+    }
+
+    public boolean isLiveHost() {
+        return hasAttribute(UserAttribute.LiveHost);
+    }
+
+    public User(Long userId,
+                String nickName,
+                String description,
+                Picture profilePicture,
+                Integer following,
+                Integer followers,
+                List<Badge> badges) {
+        this.id = userId;
+        this.name = nickName;
+        this.description = description;
+        this.picture = profilePicture;
+        this.following = following;
+        this.followers = followers;
+        this.badges = badges;
+        this.attributes = new HashSet<>();
+    }
+
+    public User(Long userId,
+                String nickName) {
+        this.id = userId;
+        this.name = nickName;
+        this.attributes = new HashSet<>();
+    }
+
+    public User(Long userId,
+                String nickName,
+                Picture picture) {
+        this(userId, nickName);
+        this.picture = picture;
+    }
+
+    public User(io.github.jwdeveloper.tiktok.messages.data.User user) {
+        this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb()));
+        description = user.getBioDescription();
+        displayName = user.getNickname();
+        following = user.getFollowInfo().getFollowingCount();
+        followers = user.getFollowInfo().getFollowerCount();
+        badges = user.getBadgeListList().stream().map(Badge::map).toList();
+        if (user.getIsFollower()) {
+            addAttribute(UserAttribute.Follower);
+        }
+        if (user.getSubscribeInfo() != null && user.getSubscribeInfo().getIsSubscribedToAnchor()) {
+            addAttribute(UserAttribute.Subscriber);
+        }
+        if (user.getUserAttr().getIsAdmin()) {
+            addAttribute(UserAttribute.Admin);
+        }
+        if (user.getUserAttr().getIsMuted()) {
+            addAttribute(UserAttribute.Muted);
+        }
+        if (user.getIsBlock()) {
+            addAttribute(UserAttribute.Blocked);
+        }
+    }
+
+
+    public static User EMPTY = new User(0L,
+            "",
+            "",
+            Picture.Empty(),
+            0,
+            0,
+            List.of(Badge.empty()));
+
+    public static User map(io.github.jwdeveloper.tiktok.messages.data.User user) {
+        return new User(user);
+    }
+
+    public static User map(io.github.jwdeveloper.tiktok.messages.data.User user,
+                           io.github.jwdeveloper.tiktok.messages.data.UserIdentity userIdentity) {
+        var outUser = map(user);
+
+        if (userIdentity.getIsGiftGiverOfAnchor()) {
+            outUser.addAttribute(UserAttribute.GiftGiver);
+        }
+        if (userIdentity.getIsSubscriberOfAnchor()) {
+            outUser.addAttribute(UserAttribute.Subscriber);
+        }
+        if (userIdentity.getIsMutualFollowingWithAnchor()) {
+            outUser.addAttribute(UserAttribute.MutualFollowingWithLiveHost);
+        }
+        if (userIdentity.getIsFollowerOfAnchor()) {
+            outUser.addAttribute(UserAttribute.Follower);
+        }
+        if (userIdentity.getIsModeratorOfAnchor()) {
+            outUser.addAttribute(UserAttribute.Moderator);
+        }
+        if (userIdentity.getIsAnchor()) {
+            outUser.addAttribute(UserAttribute.LiveHost);
+        }
+        return outUser;
+    }
+
+    public static User map(io.github.jwdeveloper.tiktok.messages.data.VoteUser user) {
+        return new User(user.getUserId(), user.getNickName());
+    }
+
+    public static User map(WebcastEnvelopeMessage.EnvelopeInfo envelopeInfo) {
+        return new User(0L,
+                //envelopeInfo.getSendUserId(),
+                envelopeInfo.getSendUserName(),
+                "",
+                Picture.map(envelopeInfo.getSendUserAvatar()),
+                0,
+                0,
+                List.of(Badge.empty()));
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/UserAttribute.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.events.objects.users;
+
+public enum UserAttribute
+{
+    GiftGiver, Subscriber, Follower, Moderator, LiveHost, MutualFollowingWithLiveHost,Admin,Blocked,Muted
+}

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

@@ -25,6 +25,8 @@ package io.github.jwdeveloper.tiktok.live;
 import io.github.jwdeveloper.tiktok.listener.ListenersManager;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 
+import java.util.logging.Logger;
+
 public interface LiveClient {
 
     /**
@@ -43,6 +45,12 @@ public interface LiveClient {
      */
     GiftManager getGiftManager();
 
+    /**
+     *  Get user manager
+     * @return
+     */
+    UserManager getUserManager();
+
     /**
      * Gets the current room info from TikTok API including streamer info, room status and statistics.
      */
@@ -53,4 +61,10 @@ public interface LiveClient {
      * @see TikTokEventListener
      */
     ListenersManager getListenersManager();
+
+    /**
+     *  Logger
+     * @return
+     */
+    Logger getLogger();
 }

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

@@ -30,6 +30,6 @@ public interface LiveRoomInfo
      int getLikesCount();
      boolean isAgeRestricted();
      String getRoomId();
-     String getUserName();
+     String getHostName();
      ConnectionState getConnectionState();
 }

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.live;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.objects.Gift;
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
+
+import java.util.List;
+
+public interface TrackedUser
+{
+     List<TikTokEvent> getInvokedEvents();
+     List<Gift> getGifs();
+     User getUserData();
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.live;
+
+import io.github.jwdeveloper.tiktok.events.objects.users.User;
+
+import java.util.List;
+
+public interface UserManager
+{
+     TrackedUser observeUser(User user);
+
+     TrackedUser getTrackedUser(Long id);
+
+     List<TrackedUser> getTrackedUsers();
+}

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/Mapper.java

@@ -24,5 +24,5 @@ package io.github.jwdeveloper.tiktok.mappers;
 
 public interface Mapper<SOURCE,TARGET>
 {
-     TARGET mapFrom(SOURCE source);
+     TARGET map(SOURCE source);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/MappingContext.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers;
+
+public interface MappingContext<T>
+{
+    T getMessage();
+
+    Mapper getMapper();
+}

API/src/main/java/io/github/jwdeveloper/tiktok/utils/JsonUtil.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.utils;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.GsonBuilder;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+public class JsonUtil {
+    public static String toJson(Object obj) {
+        return new GsonBuilder()
+                .addSerializationExclusionStrategy(new ExclusionStrategy() {
+                    @Override
+                    public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean shouldSkipClass(Class<?> aClass) {
+                        return aClass.equals(Image.class);
+                    }
+                })
+                .disableHtmlEscaping()
+                .setPrettyPrinting()
+                .create()
+                .toJson(obj);
+    }
+
+    public static String messageToJson(Object obj) {
+
+        var ignoredFields = new ArrayList<String>();
+        ignoredFields.add("memoizedIsInitialized");
+        ignoredFields.add("memoizedSize");
+        ignoredFields.add("memoizedHashCode");
+
+        return new GsonBuilder()
+                .addSerializationExclusionStrategy(new ExclusionStrategy() {
+                    @Override
+                    public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+
+                        if (ignoredFields.contains(fieldAttributes.getName())) {
+                            return true;
+                        }
+
+                        if (fieldAttributes.getName().equals("common_")) {
+                            return true;
+                        }
+                        if (fieldAttributes.getName().equals("bytes")) {
+                            return true;
+                        }
+                        if (fieldAttributes.getName().equals("unknownFields")) {
+                            return true;
+                        }
+
+                        return false;
+                    }
+
+                    @Override
+                    public boolean shouldSkipClass(Class<?> aClass) {
+                        return false;
+                    }
+                })
+                .disableHtmlEscaping()
+                .setPrettyPrinting()
+                .create()
+                .toJson(obj);
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/SocketClient.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.websocket;
+
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+
+public interface SocketClient {
+    void start(WebcastResponse webcastResponse, LiveClient tikTokLiveClient);
+
+    void stop();
+}

API/src/main/proto/data.proto

@@ -103,46 +103,21 @@ message Text {
 // @Image
 message Image {
   repeated string urlList = 1;
-  string uri = 2;
-  int64 height = 3;
-  int64 width = 4;
-  string avgColor = 5;
-  int32 imageType = 6;
-  string openWebUrl = 7;
-  Content content = 8;
   bool isAnimated = 9;
-
-
-  // @Content
-  // proto.webcast.data.Image
-  message Content {
-    string name = 1;
-    string fontColor = 2;
-    int64 level = 3;
-  }
-
 }
 
 // @Badge
 message BadgeStruct {
   BadgeDisplayType displayType = 1; // Enum
-  BadgePriorityType priorityType = 2; // Enum
-  BadgeSceneType sceneType = 3; // Enum
-  Position position = 4; // Enum
-  DisplayStatus displayStatus = 5; // Enum
-  int64 greyedByClient = 6;
-  ExhibitionType exhibitionType = 7; // Enum
-  string openweburl = 10;
-  bool display = 11;
-  // PrivilegeLogExtra privilegeLogExtra = 12;
-  repeated ImageBadge image = 20;
-  repeated TextBadge text = 21;
-  StringBadge str = 22;
-  CombineBadge combine = 23;
-
+  oneof badgeType
+  {
+    ImageBadge image = 20;
+    TextBadge text = 21;
+    StringBadge str = 22;
+    CombineBadge combine = 23;
+  }
 
   message CombineBadge {
-    BadgeDisplayType displayType = 1; // Enum
     Image icon = 2;
     TextBadge text = 3;
     string str = 4;
@@ -180,7 +155,7 @@ message BadgeStruct {
 
   message ProfileCardPanel {
     bool useNewProfileCardStyle = 1;
-    BadgeTextPosition badgeTextPosition = 2; // Enum
+  //  BadgeTextPosition badgeTextPosition = 2; // Enum
     ProjectionConfig projectionConfig = 3;
     ProfileContent profileContent = 4;
   }
@@ -192,15 +167,11 @@ message BadgeStruct {
   }
 
   message ImageBadge {
-    BadgeDisplayType displayType = 1; // Enum
     Image image = 2;
   }
 
   message TextBadge {
-    BadgeDisplayType displayType = 1; // Enum
-    string key = 2;
     string defaultPattern = 3;
-    repeated string piecesList = 4;
   }
 
   message IconConfig {
@@ -210,7 +181,6 @@ message BadgeStruct {
 
 
   message StringBadge {
-    BadgeDisplayType displayType = 1; // Enum
     string str = 2;
   }
 
@@ -230,45 +200,8 @@ message BadgeStruct {
     BADGEDISPLAYTYPE_COMBINE = 4;
   }
 
-  enum BadgePriorityType {
-    BADGEPRIORITYTYPE_UNKNOWN = 0;
-    BADGEPRIORITYTYPE_STRONGRELATION = 10;
-    BADGEPRIORITYTYPE_PLATFORM = 20;
-    BADGEPRIORITYTYPE_RELATION = 30;
-    BADGEPRIORITYTYPE_ACTIVITY = 40;
-    BADGEPRIORITYTYPE_RANKLIST = 50;
-  }
 
-  enum BadgeSceneType {
-    BADGESCENETYPE_UNKNOWN = 0;
-    BADGESCENETYPE_ADMIN = 1;
-    BADGESCENETYPE_FIRSTRECHARGE = 2;
-    BADGESCENETYPE_FRIENDS = 3;
-    BADGESCENETYPE_SUBSCRIBER = 4;
-    BADGESCENETYPE_ACTIVITY = 5;
-    BADGESCENETYPE_RANKLIST = 6;
-    BADGESCENETYPE_NEWSUBSCRIBER = 7;
-    BADGESCENETYPE_USERGRADE = 8;
-    BADGESCENETYPE_STATECONTROLLEDMEDIA = 9;
-    BADGESCENETYPE_FANS = 10;
-    BADGESCENETYPE_LIVEPRO = 11;
-  }
 
-  enum DisplayStatus {
-    DISPLAYSTATUSNORMAL = 0;
-    DISPLAYSTATUSSHADOW = 1;
-  }
-
-  enum ExhibitionType {
-    EXHIBITIONTYPE_DEFAULT = 0;
-    EXHIBITIONTYPE_FOLD = 1;
-    EXHIBITIONTYPE_PUBLICSCREEN = 2;
-  }
-  enum BadgeTextPosition {
-    BADGETEXTPOSITIONUNKNOWN = 0;
-    BADGETEXTPOSITIONRIGHT = 1;
-    BADGETEXTPOSITIONBELOW = 2;
-  }
 
   enum Position {
     POSITIONUNKNOWN = 0;

API/src/main/proto/enums.proto

@@ -25,11 +25,7 @@ enum EmotePrivateType {
   EMOTE_PRIVATE_TYPE_SUB_WAVE = 1;
 }
 
-enum ExhibitionType {
-  EXHIBITIONTYPE_DEFAULT = 0;
-  EXHIBITIONTYPE_FOLD = 1;
-  EXHIBITIONTYPE_PUBLICSCREEN = 2;
-}
+
 enum SubscribeType {
   SUBSCRIBETYPE_ONCE = 0;
   SUBSCRIBETYPE_AUTO = 1;

API/src/main/proto/webcast.proto

@@ -64,9 +64,9 @@ message WebcastGiftMessage {
   Common common = 1;
   int64 giftId = 2;
   int64 fanTicketCount = 3;
-  int64 groupCount = 4;
-  int64 repeatCount = 5;
-  int64 comboCount = 6;
+  int32 groupCount = 4;
+  int32 repeatCount = 5;
+  int32 comboCount = 6;
   User user = 7;
   User toUser = 8;
   int32 repeatEnd = 9;
@@ -92,15 +92,6 @@ message WebcastGiftMessage {
     Image userLabel = 1;
     int64 userConsumeInRoom = 2;
   }
-
-  message UserIdentity {
-    bool isGiftGiverOfAnchor = 1;
-    bool isSubscriberOfAnchor = 2;
-    bool isMutualFollowingWithAnchor = 3;
-    bool isFollowerOfAnchor = 4;
-    bool isModeratorOfAnchor = 5;
-    bool isAnchor = 6;
-  }
 }
 
 //@WebcastRoomMessage
@@ -170,14 +161,13 @@ message WebcastBarrageMessage {
 //@WebcastCaptionMessage
 // Closed Captioning for Video
 message WebcastCaptionMessage {
-  Common header = 1;
+  Common common = 1;
   uint64 timeStamp = 2;
-  uint32 data1 = 3;
   CaptionData captionData = 4;
 
   message CaptionData {
-    string ISOLanguage = 1;
-    string Text = 2;
+    string language = 1;
+    string text = 2;
   }
 }
 
@@ -198,6 +188,8 @@ message WebcastChatMessage {
   string contentLanguage = 14;
   int32 quickChatScene = 16;
   int32 communityFlaggedStatus = 17;
+  UserIdentity UserIdentity = 18;
+  map<int32,string> CommentQualityScores = 19;
 
   // @EmoteWithIndex
   // proto.webcast.im.ChatMessage
@@ -339,16 +331,16 @@ message WebcastSocialMessage {
   int64 shareType = 3;
   int64 action = 4;
   string shareTarget = 5;
-  int64 followCount = 6;
+  int32 followCount = 6;
   int64 shareDisplayStyle = 7;
-  int64 shareCount = 8;
+  int32 shareCount = 8;
 }
 
 //@WebcastSubNotifyMessage
 message WebcastSubNotifyMessage {
   Common common = 1;
   User user = 2;
-  ExhibitionType exhibitionType = 3; // Enum
+//  ExhibitionType exhibitionType = 3; // Enum
   int64 subMonth = 4;
   SubscribeType subscribeType = 5; // Enum
   OldSubscribeStatus oldSubscribeStatus = 6; // Enum