From c7d84218f244304fdb40fef28db0cf4b81ea007a Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 12 Dec 2023 18:49:13 +0000 Subject: [PATCH 1/4] Update version in pom.xml --- API/pom.xml | 2 +- Client/pom.xml | 2 +- Examples/pom.xml | 2 +- Tools-EventsCollector/pom.xml | 2 +- Tools-EventsWebViewer/pom.xml | 2 +- Tools-ReadmeGenerator/pom.xml | 2 +- Tools/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index bf666f7..bcb255e 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 API diff --git a/Client/pom.xml b/Client/pom.xml index e59a2e9..e07a7ce 100644 --- a/Client/pom.xml +++ b/Client/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 diff --git a/Examples/pom.xml b/Examples/pom.xml index 86bd6dc..d9cd76a 100644 --- a/Examples/pom.xml +++ b/Examples/pom.xml @@ -41,7 +41,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 diff --git a/Tools-EventsCollector/pom.xml b/Tools-EventsCollector/pom.xml index f5726f4..8e873fa 100644 --- a/Tools-EventsCollector/pom.xml +++ b/Tools-EventsCollector/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 diff --git a/Tools-EventsWebViewer/pom.xml b/Tools-EventsWebViewer/pom.xml index 3f1ab55..7a0dd24 100644 --- a/Tools-EventsWebViewer/pom.xml +++ b/Tools-EventsWebViewer/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 Tools-EventsWebViewer diff --git a/Tools-ReadmeGenerator/pom.xml b/Tools-ReadmeGenerator/pom.xml index f9e02e7..670e64b 100644 --- a/Tools-ReadmeGenerator/pom.xml +++ b/Tools-ReadmeGenerator/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 diff --git a/Tools/pom.xml b/Tools/pom.xml index d9fa4cb..a856ff8 100644 --- a/Tools/pom.xml +++ b/Tools/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.7-Release + 1.0.8-Release 4.0.0 diff --git a/pom.xml b/pom.xml index 5bbd99a..ad9c9d6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.github.jwdeveloper.tiktok TikTokLiveJava pom - 1.0.7-Release + 1.0.8-Release API Client From 15550ed703af2e0d156b5531934a27089a0622f0 Mon Sep 17 00:00:00 2001 From: Jacek W Date: Tue, 12 Dec 2023 19:49:52 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca97c15..008d323 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Maven com.github.jwdeveloper.TikTok-Live-Java Client - 1.0.7-Release + 1.0.8-Release compile @@ -90,7 +90,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' } ``` From c4f0d63b437ba962315283c7b0d21812063e356f Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Mon, 18 Dec 2023 16:52:40 -0500 Subject: [PATCH 3/4] Add toUser to TikTokGiftEvent to determine the correct user receiving a gift! Made grammar fix to collaboration.md and README.md! --- .../tiktok/data/events/gift/TikTokGiftEvent.java | 6 ++++-- README.md | 14 +++++--------- collaboration.md | 12 ++---------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java index d3a2ff8..dd09bdb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java +++ b/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(); } -} +} \ No newline at end of file diff --git a/README.md b/README.md index 008d323..77706b7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@
-
@@ -12,18 +11,15 @@
@@ -33,7 +29,7 @@ A Java library inspired by [TikTokLive](https://github.com/isaackogan/TikTokLive The library includes a wrapper that connects to the WebCast service using just the username (`uniqueId`). This allows you to connect to your own live chat as well as the live chat of other streamers. No credentials are required. Events such as [Members Joining](#member), [Gifts](#gift), [Subscriptions](#subscribe), [Viewers](#roomuser), [Follows](#social), [Shares](#social), [Questions](#questionnew), [Likes](#like) and [Battles](#linkmicbattle) can be tracked. -# Contributors +# Contributors [Library documentation for contributors](https://github.com/jwdeveloper/TikTokLiveJava/wiki)
@@ -58,7 +54,7 @@ Do you prefer other programming languages? ## Getting started -1. Install the package +1. Install the package Maven ```xml @@ -438,9 +434,9 @@ Triggered every time gift is sent

>Combo: 1 -> comboState = GiftSendType.Begin

Combo: 4 -> comboState = GiftSendType.Active

Combo: 8 -> comboState = GiftSendType.Active

-

Combo: 12 -> comboState = GiftSendType.Finsihed

+

Combo: 12 -> comboState = GiftSendType.Finished

-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 @@ -697,4 +693,4 @@ public static class CustomListener implements TikTokEventListener { ## Contributing -Your improvements are welcome! Feel free to open an issue or pull request. +Your improvements are welcome! Feel free to open an issue or pull request. \ No newline at end of file diff --git a/collaboration.md b/collaboration.md index 984a079..551fc17 100644 --- a/collaboration.md +++ b/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)` @@ -200,12 +200,4 @@ 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) - - - - - - - - +![image](https://github.com/jwdeveloper/TikTokLiveJava/assets/79764581/36ad6f1f-b38c-4cf7-93bd-b4cc0638cba0) \ No newline at end of file From 385560de3ab4112ad64fd4b359d87eaa458c6faf Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 18 Dec 2023 21:58:15 +0000 Subject: [PATCH 4/4] Update version in pom.xml --- API/pom.xml | 2 +- Client/pom.xml | 2 +- Examples/pom.xml | 2 +- Tools-EventsCollector/pom.xml | 2 +- Tools-EventsWebViewer/pom.xml | 2 +- Tools-ReadmeGenerator/pom.xml | 2 +- Tools/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/API/pom.xml b/API/pom.xml index bcb255e..41f21e9 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 API diff --git a/Client/pom.xml b/Client/pom.xml index e07a7ce..3ee2c4c 100644 --- a/Client/pom.xml +++ b/Client/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 diff --git a/Examples/pom.xml b/Examples/pom.xml index d9cd76a..9292fed 100644 --- a/Examples/pom.xml +++ b/Examples/pom.xml @@ -41,7 +41,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 diff --git a/Tools-EventsCollector/pom.xml b/Tools-EventsCollector/pom.xml index 8e873fa..7bc966f 100644 --- a/Tools-EventsCollector/pom.xml +++ b/Tools-EventsCollector/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 diff --git a/Tools-EventsWebViewer/pom.xml b/Tools-EventsWebViewer/pom.xml index 7a0dd24..17cfec2 100644 --- a/Tools-EventsWebViewer/pom.xml +++ b/Tools-EventsWebViewer/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 Tools-EventsWebViewer diff --git a/Tools-ReadmeGenerator/pom.xml b/Tools-ReadmeGenerator/pom.xml index 670e64b..31a33b5 100644 --- a/Tools-ReadmeGenerator/pom.xml +++ b/Tools-ReadmeGenerator/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 diff --git a/Tools/pom.xml b/Tools/pom.xml index a856ff8..20b1fc1 100644 --- a/Tools/pom.xml +++ b/Tools/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.8-Release + 1.0.9-Release 4.0.0 diff --git a/pom.xml b/pom.xml index ad9c9d6..5817a7a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.github.jwdeveloper.tiktok TikTokLiveJava pom - 1.0.8-Release + 1.0.9-Release API Client