Add toUser to TikTokGiftEvent to determine the correct user receiving a gift!

Made grammar fix to collaboration.md and README.md!
This commit is contained in:
kohlerpop1
2023-12-18 16:52:40 -05:00
parent 15550ed703
commit c4f0d63b43
3 changed files with 11 additions and 21 deletions

View File

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

View File

@@ -1,7 +1,6 @@
<div align="center" > <div align="center" >
<a target="blank" > <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 src="https://raw.githubusercontent.com/jwdeveloper/TikTokLiveJava/develop-1_0_0/Tools-ReadmeGenerator/src/main/resources/logo.svg" width="15%" >
</img>
</a> </a>
</div> </div>
<div align="center" > <div align="center" >
@@ -12,18 +11,15 @@
<div align="center" > <div align="center" >
<a href="https://jitpack.io/#jwdeveloper/TikTok-Live-Java" target="blank" > <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 src="https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg" width="20%" >
</img>
</a> </a>
<a href="https://discord.gg/e2XwPNTBBr" target="blank" > <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 src="https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white" >
</img>
</a> </a>
<a target="blank" > <a target="blank" >
<img src="https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=openjdk&logoColor=white" > <img src="https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=openjdk&logoColor=white" >
</img>
</a> </a>
</div> </div>
</div> </div>
@@ -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. 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. 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) [Library documentation for contributors](https://github.com/jwdeveloper/TikTokLiveJava/wiki)
<div align="center"> <div align="center">
@@ -58,7 +54,7 @@ Do you prefer other programming languages?
## Getting started ## Getting started
1. Install the package 1. Install the package
Maven Maven
```xml ```xml
@@ -438,9 +434,9 @@ Triggered every time gift is sent
<p>>Combo: 1 -> comboState = GiftSendType.Begin</p> <p>>Combo: 1 -> comboState = GiftSendType.Begin</p>
<p>Combo: 4 -> comboState = GiftSendType.Active</p> <p>Combo: 4 -> comboState = GiftSendType.Active</p>
<p>Combo: 8 -> 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 ```java
@@ -697,4 +693,4 @@ public static class CustomListener implements TikTokEventListener {
## Contributing ## Contributing
Your improvements are welcome! Feel free to open an <a href="https://github.com/jwdeveloper/TikTok-Live-Java/issues">issue</a> or <a href="https://github.com/jwdeveloper/TikTok-Live-Java/pulls">pull request</a>. Your improvements are welcome! Feel free to open an <a href="https://github.com/jwdeveloper/TikTok-Live-Java/issues">issue</a> or <a href="https://github.com/jwdeveloper/TikTok-Live-Java/pulls">pull request</a>.

View File

@@ -27,7 +27,7 @@ Are you willing to help or improve TikTokLiveJava?
- Connecting to TikTok websocket (PushServer) - Connecting to TikTok websocket (PushServer)
After successful connection to TikTok, `pushServer` starts to send `ProtocolBuffer` 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 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 those files. so then we can easily map incoming bytes to classes, for examples
`WebcastGiftMessage message = WebcastGiftMessage.parseFrom(incomingBytesArray)` `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! 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)