Update README.md

Add signature to user class and remove no longer UUC param!

.github/workflows/maven-publish.yml

@@ -53,7 +53,7 @@ jobs:
          restore-keys: ${{runner.os}}-m2
 
     - name: 7 Create Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
          name: ${{ steps.version.outputs.version_tag }}
          path: staging

API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.0-Release</version>
+        <version>1.8.13-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.24.1</version>
+            <version>4.26.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -51,6 +51,7 @@
                         </goals>
                         <configuration>
                             <includeMavenTypes>direct</includeMavenTypes>
+                            <protocVersion>4.26.1</protocVersion>
                             <inputDirectories>
                                 <include>src/main/proto</include>
                             </inputDirectories>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -20,21 +20,21 @@
  * 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.listener;
+package io.github.jwdeveloper.tiktok.annotations;
 
-import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
+/**
+ * HIGHEST 1
+ * HIGH 2
+ * NORMAL 3
+ * LOW 4
+ * LOWEST 5
+ */
+public enum Priority {
+    LOWEST(2), LOW(1), NORMAL(0), HIGH(-1), HIGHEST(-2);
 
-import lombok.Value;
+    public final int value;
 
-import java.util.List;
-import java.util.Map;
-
-
-@Value
-public class ListenerBindingModel
-{
-
-    TikTokEventListener listener;
-
-    Map<Class<?>, List<EventConsumer<?>>> events;
+    Priority(int value) {
+        this.value = value;
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -28,5 +28,14 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TikTokEventObserver
 {
+    /**
+     * When more than one method listen for certain Event, you can specify the method priority
+     * @see Priority
+     */
+    Priority priority() default Priority.NORMAL;
 
+    /**
+     * When true, action is invoked on a thread, from the threads pool
+     */
+    boolean async() default false;
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/MessageMetaData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/ProxyData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -58,6 +58,7 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         var builder = WebcastChatMessage.newBuilder();
         builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
                 .setNickname(userName)
+                .setDisplayId(userName)
                 .build());
         builder.setContentLanguage("en");
         builder.setVisibleToSender(true);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -29,4 +29,9 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
 public class TikTokConnectedEvent extends TikTokLiveClientEvent
 {
 
+
+    public static TikTokConnectedEvent of()
+    {
+        return new TikTokConnectedEvent();
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -36,7 +36,8 @@ public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
 		this.reason = reason.isBlank() ? "None" : reason;
 	}
 
-	public TikTokDisconnectedEvent() {
-		this("None");
+	public static TikTokDisconnectedEvent of(String reason)
+	{
+		return new TikTokDisconnectedEvent(reason);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -25,13 +25,18 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Control)
-public class TikTokErrorEvent extends TikTokLiveClientEvent
-{
+public class TikTokErrorEvent extends TikTokLiveClientEvent {
     private final Throwable exception;
+
+
+    public static TikTokErrorEvent of(String message) {
+        return new TikTokErrorEvent(new TikTokLiveException(message));
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -25,11 +25,12 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.battles.*;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.messages.enums.LinkMicBattleStatus;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.*;
+import lombok.Getter;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * Triggered every time a battle starts & ends
@@ -43,28 +44,23 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
      true if battle is finished otherwise false
      */
     private final boolean finished;
-    @Getter(AccessLevel.NONE)
-    private final boolean oneVsOne;
-    private final List<Team> teams;
+    private final Team team1, team2;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         super(msg.getCommon());
         battleId = msg.getId();
         finished = msg.getBattleStatus() == LinkMicBattleStatus.BATTLE_FINISHED;
-        teams = new ArrayList<>();
         if (msg.getHostTeamCount() == 2) { // 1v1 battle
-            teams.add(new Team1v1(msg.getHostTeam(0), msg));
-            teams.add(new Team1v1(msg.getHostTeam(1), msg));
-            oneVsOne = true;
+            team1 = new Team1v1(msg.getHostTeam(0), msg);
+            team2 = new Team1v1(msg.getHostTeam(1), msg);
         } else { // 2v2 battle
             if (isFinished()) {
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg));
+                team1 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg);
+                team2 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg);
             } else {
-                teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
-                teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
+                team1 = new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg);
+                team2 = new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg);
             }
-            oneVsOne = false;
         }
 
         // Info:
@@ -73,11 +69,69 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
         // - msg.getHostTeamCount() always is 2 for 1v1 or 4 for 2v2
     }
 
+    /**
+     * @param battleHostName name of host to search
+     * @return Team1v1 instance containing name of host or null if no team found */
+    public Team1v1 get1v1Team(String battleHostName) {
+        if (!is1v1())
+            throw new TikTokLiveException("Teams are not instance of 1v1 battle!");
+        List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list.get(0).getAs1v1Team();
+    }
+
+    public Team2v2 get2v2Team(String battleHostName) {
+        if (!is2v2())
+            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
+        List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list.get(0).getAs2v2Team();
+    }
+
+    /**
+     * @param battleHostName name of host to search
+     * @return Team1v1 instance not containing name of host */
+    public Team1v1 get1v1OpponentTeam(String battleHostName) {
+        if (!is1v1())
+            throw new TikTokLiveException("Teams are not instance of 1v1 battle!");
+		List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list.get(1).getAs1v1Team();
+    }
+
+    public Team2v2 get2x2OpponentTeam(String battleHostName) {
+        if (!is2v2())
+            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
+		List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list.get(1).getAs2v2Team();
+    }
+
+    /**
+     * @param battleHostName name of host to search
+     * @return {@link List<Team>} with host team first, then opponent team
+     * <p> Empty if host is in neither otherwise always 2 in length;
+     */
+    public List<Team> getTeams(String battleHostName) {
+        if (is1v1()) {
+            if (team1.getAs1v1Team().getHost().getName().equals(battleHostName))
+                return List.of(team1, team2);
+            if (team2.getAs1v1Team().getHost().getName().equals(battleHostName))
+                return List.of(team2, team1);
+        } else {
+            if (team1.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+                return List.of(team1, team2);
+            if (team2.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+                return List.of(team2, team1);
+        }
+        return List.of();
+    }
+
     public boolean is1v1() {
-        return oneVsOne;
+        return team1.is1v1Team() || team2.is1v1Team();
     }
 
     public boolean is2v2() {
-        return !oneVsOne;
+        return team1.is2v2Team() || team2.is2v2Team();
+    }
+
+    public boolean isTie() {
+        return isFinished() && team1.getTotalPoints() == team2.getTotalPoints();
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -24,9 +24,14 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent;
 
 
 @EventMeta(eventType = EventType.Message)
 public class TikTokLiveEndedEvent extends TikTokEvent {
+
+
+    public static TikTokLiveEndedEvent of() {
+        return new TikTokLiveEndedEvent();
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -53,6 +53,7 @@ public class TikTokSubscribeEvent extends TikTokHeaderEvent {
     public static TikTokSubscribeEvent of(String userName) {
         return new TikTokSubscribeEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEmptyEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokConnectingEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -31,7 +31,9 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
  * Triggered when client is connecting to live is successfully established.
  */
 @EventMeta(eventType = EventType.Control)
-public class TikTokConnectingEvent extends TikTokLiveClientEvent
-{
+public class TikTokConnectingEvent extends TikTokLiveClientEvent {
 
+    public static TikTokConnectingEvent of() {
+        return new TikTokConnectingEvent();
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokPreConnectionEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/envelop/TikTokChestEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkAcceptNoticeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkApplyEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCancelEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCloseEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCohostListChangeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCreateEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEnterEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkInviteEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkKickOutEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLeaveEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLinkedListChangeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkListChangeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMediaChangeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMicIdxUpdateEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMuteEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkRandomMatchEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkReplyEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkSysKickOutEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserSettingEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUserToastEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkWaitListChangeEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -32,8 +32,7 @@ import lombok.Value;
 
 @Value
 @EventMeta(eventType = EventType.Message)
-public class TikTokFollowEvent extends TikTokHeaderEvent
-{
+public class TikTokFollowEvent extends TikTokHeaderEvent {
     User user;
     int totalFollowers;
 
@@ -43,10 +42,10 @@ public class TikTokFollowEvent extends TikTokHeaderEvent
         totalFollowers = msg.getFollowCount();
     }
 
-    public static TikTokFollowEvent of(String userName)
-    {
+    public static TikTokFollowEvent of(String userName) {
         return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -26,7 +26,6 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -53,6 +52,7 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
     {
         return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -62,6 +62,7 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
                 .setCount(likes)
                 .setTotal(likes)
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -26,6 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
 
@@ -47,4 +48,13 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
         user = User.map(msg.getUser());
         totalShares = 1;
     }
+
+    public static TikTokShareEvent of(String userName, int shaders) {
+        return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
+                        .setNickname(userName)
+                        .build())
+                .build(), shaders);
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -28,8 +28,6 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.Getter;
 
-
-
 @Getter
 @EventMeta(eventType = EventType.Debug)
 public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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
@@ -30,6 +30,7 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 public class Picture {
@@ -85,8 +86,7 @@ public class Picture {
             throw new TikTokLiveException("Unable map downloaded image", e);
         }
 
-        var bais = new ByteArrayInputStream(baos.toByteArray());
-        try {
+        try (var bais = new ByteArrayInputStream(baos.toByteArray())) {
             return ImageIO.read(bais);
         } catch (IOException e) {
             throw new TikTokLiveException("Unable map downloaded image bytes to Image", e);
@@ -97,8 +97,25 @@ public class Picture {
         return new Picture("");
     }
 
+    public Picture asUnsigned() {
+        if (link == null || link.isEmpty())
+            return this;
+        // p16-sign-va.tiktokcdn.com -> p16-va.tiktokcdn.com || p16-sign.tiktokcdn.com -> p16.tiktokcdn.com
+        return new Picture(link.replace("-sign-", "-").replace("-sign.", "."));
+    }
+
     @Override
     public String toString() {
         return "Picture{link='" + link + "', image=" + image + "}";
     }
+
+    @Override
+    public final boolean equals(Object o) {
+        return o == this || o instanceof Picture picture && picture.link != null && picture.link.equals(link);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(link);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ * Copyright (c) 2023-2024 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