Merge branch 'master' into develop-1-0-10

API/pom.xml

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

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

@@ -33,7 +33,7 @@ import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.Getter;
 
 
-/*
+/**
  * Triggered when user sends gifts that has
  *  no combo (most of expensive gifts)
  *  or if combo has finished
@@ -43,11 +43,13 @@ import lombok.Getter;
 public class TikTokGiftEvent extends TikTokHeaderEvent {
     private final Gift gift;
     private final User user;
+    private final User toUser;
     private final int combo;
     public TikTokGiftEvent(Gift gift, WebcastGiftMessage msg) {
         super(msg.getCommon());
         this.gift = gift;
         user = User.map(msg.getUser(), msg.getUserIdentity());
+        toUser = User.map(msg.getToUser());
         combo = msg.getComboCount();
     }
 }

Client/pom.xml

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

Examples/pom.xml

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

README.md

@@ -1,7 +1,6 @@
 <div align="center" >
 <a target="blank" >
 <img src="https://raw.githubusercontent.com/jwdeveloper/TikTokLiveJava/develop-1_0_0/Tools-ReadmeGenerator/src/main/resources/logo.svg" width="15%" >
-</img>
 </a>
 </div>
 <div align="center" >
@@ -12,18 +11,15 @@
 <div align="center" >
 <a href="https://jitpack.io/#jwdeveloper/TikTok-Live-Java" target="blank" >
 <img src="https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg" width="20%" >
-</img>
 </a>
 
 
 <a href="https://discord.gg/e2XwPNTBBr" target="blank" >
 <img src="https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white" >
-</img>
 </a>
 
 <a target="blank" >
 <img src="https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=openjdk&logoColor=white" >
-</img>
 </a>
 </div>
 </div>
@@ -73,7 +69,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.0.7-Release</version>
+             <version>1.0.8-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>
@@ -90,7 +86,7 @@ dependencyResolutionManagement {
 	}
 
 dependencies {
-	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.0.7-Release'
+	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.0.8-Release'
 	}
 ```
 
@@ -438,9 +434,9 @@ Triggered every time gift is sent
   <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
   <p>Combo: 4 -> comboState = GiftSendType.Active</p>
   <p>Combo: 8 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
+  <p>Combo: 12 -> comboState = GiftSendType.Finished</p>
 
-Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
+Remember if comboState is Finished both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
 
 
 ```java

Tools-EventsCollector/pom.xml

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

Tools-EventsWebViewer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.0.7-Release</version>
+        <version>1.0.9-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>Tools-EventsWebViewer</artifactId>

Tools-ReadmeGenerator/pom.xml

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

Tools/pom.xml

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

collaboration.md

@@ -27,7 +27,7 @@ Are you willing to help or improve TikTokLiveJava?
    - Connecting to TikTok websocket (PushServer)
      
         After successful connection to TikTok, `pushServer` starts to send `ProtocolBuffer`
-        messages in binary format. This is very important to understand `ProtocolBuffer. Don't worry it is not complicated :).
+        messages in binary format. This is very important to understand `ProtocolBuffer`. Don't worry it is not complicated :).
         All the proto files are included under `API/src/main/proto` After using `Maven compile` command on project, java classes are generated from 
         those files. so then we can easily map incoming bytes to classes, for examples
         `WebcastGiftMessage message = WebcastGiftMessage.parseFrom(incomingBytesArray)`
@@ -201,11 +201,3 @@ need to also include it to interface `EventsBuilder`
 Finally we are good to go, our event has been included!
 
 ![image](https://github.com/jwdeveloper/TikTokLiveJava/assets/79764581/36ad6f1f-b38c-4cf7-93bd-b4cc0638cba0)
-
-
-
-
-
-
-
-   

pom.xml

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