diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java index 72da4a7..b084be1 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java @@ -20,16 +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.data.events; 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.barrage.BarrageParam; -import io.github.jwdeveloper.tiktok.events.objects.barrage.FansLevelParam; -import io.github.jwdeveloper.tiktok.events.objects.barrage.SubscribeGiftParam; -import io.github.jwdeveloper.tiktok.events.objects.barrage.UserGradeParam; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Picture; +import io.github.jwdeveloper.tiktok.data.models.barrage.BarrageParam; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java index e407b6b..5903f57 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastCaptionMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java index 10e9701..28e57a7 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java @@ -20,13 +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.data.events; 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.users.User; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Picture; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java index 9f92b8e..cf8e1ed 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java @@ -20,10 +20,10 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; /** * Triggered when the connection is successfully established. diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java index d6a7e1b..299cbfd 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMsgDetectMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java index 182139e..4565b7f 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java @@ -20,10 +20,10 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java similarity index 88% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java index 5383398..a9e0e5e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java @@ -20,13 +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.data.events; 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.users.User; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Emote; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEmoteChatMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.java index d2021c4..57118ee 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.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.data.events; 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.users.User; +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.WebcastEnvelopeMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java index 4dcd944..c3cedf7 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java @@ -20,12 +20,11 @@ * 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.data.events; 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.events.base.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java index be7bc84..e476248 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java @@ -20,13 +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.data.events; 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.users.User; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Picture; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGoalUpdateMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java index 0366454..8d8bd50 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastImDeleteMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java index 2ff1a4e..02a90c3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastInRoomBannerMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkEvent.java index 80e25b3..dd991af 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkEvent.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.data.events; 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.users.User; +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.WebcastLinkMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.java index 973ddbf..ea350ba 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkLayerMessage; -import lombok.AllArgsConstructor; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java index 0a742a0..3345737 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java @@ -20,13 +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.data.events; 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.LinkMicArmy; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.LinkMicArmy; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicArmies; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java index 1a810af..62c28ad 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.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.data.events; 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.LinkMicBattleTeam; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.LinkMicBattleTeam; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java index d0b9b19..a4aa376 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicFanTicketMethod; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java index de3bb5c..46561b2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicMethod; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java index e1672f7..2453cfb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java @@ -20,10 +20,10 @@ * 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.data.events; 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.data.events.common.TikTokEvent; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java index 5332b42..ee0a1ff 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokEvent; @EventMeta(eventType = EventType.Custom) public class TikTokLivePausedEvent extends TikTokEvent { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java index 173cc77..3570463 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.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.data.events; 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.users.User; +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.WebcastQuestionNewMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.java index 6d34f78..6532fa0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.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.data.events; 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.Text; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Text; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRankTextMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java index 1cfd9d6..41e972b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastHourlyRankMessage; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRankUpdateMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokReconnectingEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokReconnectingEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java index ef274e0..681a3ad 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokReconnectingEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java @@ -20,11 +20,11 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.java index 551c9ed..584b8d0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.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.data.events; 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.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastOecLiveShoppingMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.java index 32efe66..29c3555 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.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.data.events; 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.users.User; +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.WebcastSubNotifyMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java index 18ad6b1..9080f43 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.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.data.events; 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.users.User; +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.WebcastMemberMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java index 608e63f..5a429fc 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java @@ -20,11 +20,11 @@ * 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.data.events; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastUnauthorizedMemberMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java index c0cd02c..bdf73c7 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java @@ -20,11 +20,11 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastControlMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java index b543d2a..a55509c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java @@ -20,11 +20,11 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java index 52a738a..3c2123a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java @@ -20,11 +20,11 @@ * 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.data.events; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java index d885f95..3e36636 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.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; +package io.github.jwdeveloper.tiktok.data.events.common; import io.github.jwdeveloper.tiktok.utils.JsonUtil; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java index 261ee2d..f2acde9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java @@ -20,9 +20,8 @@ * 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.base; +package io.github.jwdeveloper.tiktok.data.events.common; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; import io.github.jwdeveloper.tiktok.messages.data.Common; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java index 957b457..f6ee669 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java @@ -20,9 +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.base; - -import io.github.jwdeveloper.tiktok.events.TikTokEvent; +package io.github.jwdeveloper.tiktok.data.events.common; public class TikTokLiveClientEvent extends TikTokEvent { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java index be2d419..e0ad62d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java @@ -20,9 +20,8 @@ * 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.base; +package io.github.jwdeveloper.tiktok.data.events.common; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftComboFinishedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboFinishedEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftComboFinishedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboFinishedEvent.java index a962025..7c241a8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftComboFinishedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboFinishedEvent.java @@ -20,11 +20,11 @@ * 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.gift; +package io.github.jwdeveloper.tiktok.data.events.gift; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.objects.Gift; +import io.github.jwdeveloper.tiktok.data.models.Gift; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java index 7e0d38a..9397155 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/gift/TikTokGiftEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/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.gift; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEndEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEndEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.java index d932cd4..c5c5a3f 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEndEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.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.poll; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +import io.github.jwdeveloper.tiktok.data.models.PollOption; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java index 10e1efc..5794cd4 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java @@ -20,11 +20,11 @@ * 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.poll; +package io.github.jwdeveloper.tiktok.data.events.poll; 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.data.events.common.TikTokHeaderEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollStartEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollStartEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.java index ddf36ef..c44c75b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollStartEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.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.poll; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +import io.github.jwdeveloper.tiktok.data.models.PollOption; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java index c6b5673..710935e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/poll/TikTokPollUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.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.poll; +package io.github.jwdeveloper.tiktok.data.events.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.data.models.PollOption; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomEvent.java index 35edad7..1e9f67e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomEvent.java @@ -20,18 +20,18 @@ * 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.room; +package io.github.jwdeveloper.tiktok.data.events.room; 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.users.User; -import io.github.jwdeveloper.tiktok.events.objects.users.UserAttribute; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.UserAttribute; +import io.github.jwdeveloper.tiktok.messages.webcast.RoomMessage; 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) @@ -46,6 +46,11 @@ public class TikTokRoomEvent extends TikTokHeaderEvent welcomeMessage = msg.getContent(); } + public TikTokRoomEvent(RoomMessage msg) { + super(msg.getCommon()); + welcomeMessage = msg.getContent(); + } + public TikTokRoomEvent(WebcastSystemMessage msg) { super(msg.getCommon()); welcomeMessage = msg.getMessage(); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomPinEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomPinEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java index 7034408..f599853 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomPinEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.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.room; +package io.github.jwdeveloper.tiktok.data.events.room; 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.messages.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomPinMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomUserInfoEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomUserInfoEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomUserInfoEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomUserInfoEvent.java index ff1dbf0..3a86def 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/room/TikTokRoomUserInfoEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomUserInfoEvent.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.room; +package io.github.jwdeveloper.tiktok.data.events.room; 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.RankingUser; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.data.models.RankingUser; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokFollowEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokFollowEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java index bbd68c2..87bd159 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokFollowEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java @@ -20,13 +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.social; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; -import io.github.jwdeveloper.tiktok.mappers.MappingContext; +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.WebcastSocialMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokJoinEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokJoinEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java index 547871a..74ed823 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokJoinEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/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.social; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +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.WebcastMemberMessage; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokLikeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokLikeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java index 389ecb9..2596687 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokLikeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/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.social; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +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; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokShareEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokShareEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java index 331122f..7e851d2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/social/TikTokShareEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/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.social; +package io.github.jwdeveloper.tiktok.data.events.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.users.User; +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.WebcastSocialMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketMessageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java index 1fec241..814450d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketMessageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java @@ -20,11 +20,11 @@ * 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.websocket; +package io.github.jwdeveloper.tiktok.data.events.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.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketResponseEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketResponseEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java index 1bbd3d2..32db2e4 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketResponseEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java @@ -20,11 +20,11 @@ * 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.websocket; +package io.github.jwdeveloper.tiktok.data.events.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.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketUnhandledMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketUnhandledMessageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java index e88dfca..72b8715 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/websocket/TikTokWebsocketUnhandledMessageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java @@ -20,11 +20,11 @@ * 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.websocket; +package io.github.jwdeveloper.tiktok.data.events.websocket; import io.github.jwdeveloper.tiktok.annotations.EventMeta; import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Emote.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Emote.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java index ea4887d..69d1636 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Emote.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java @@ -20,12 +20,10 @@ * 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.data.models; import lombok.Value; -import java.util.UUID; - @Value public class Emote { String emoteId; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/EnumValue.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/EnumValue.java index ff3d92f..cf679c1 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/EnumValue.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.objects; +package io.github.jwdeveloper.tiktok.data.models; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Gift.java similarity index 99% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Gift.java index 481ce14..20529e5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Gift.java @@ -21,7 +21,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // This enum is generated -package io.github.jwdeveloper.tiktok.events.objects; +package io.github.jwdeveloper.tiktok.data.models; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java index 30a1199..0777172 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java @@ -20,9 +20,9 @@ * 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.data.models; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.data.LinkMicArmiesItems; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicBattleTeam.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicBattleTeam.java index 848670a..59141d8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicBattleTeam.java @@ -20,10 +20,10 @@ * 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.data.models; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java similarity index 98% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java index 98c5d4e..280da78 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.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.objects; +package io.github.jwdeveloper.tiktok.data.models; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java index 921f1bc..63c2076 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java @@ -20,9 +20,9 @@ * 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.data.models; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.data.PollOptionInfo; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/RankingUser.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/RankingUser.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java index f405a7a..b94f83b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/RankingUser.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java @@ -20,9 +20,9 @@ * 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.data.models; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import lombok.Value; @Value diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Text.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Text.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java index ea7e20e..b067dd0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Text.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java @@ -20,12 +20,10 @@ * 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.data.models; -import io.github.jwdeveloper.tiktok.events.objects.users.User; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.data.models.users.User; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/Badge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/Badge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java index 5886aad..ac429b8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/Badge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.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.objects.badges; +package io.github.jwdeveloper.tiktok.data.models.badges; public class Badge { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/CombineBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/CombineBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java index 08da50c..655efe0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/CombineBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java @@ -20,9 +20,9 @@ * 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; +package io.github.jwdeveloper.tiktok.data.models.badges; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; public class CombineBadge extends Badge { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/PictureBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/PictureBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java index 27b9792..3dbba78 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/PictureBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java @@ -20,9 +20,9 @@ * 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; +package io.github.jwdeveloper.tiktok.data.models.badges; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; public class PictureBadge extends Badge { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/StringBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/StringBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java index 75ee147..4f241b3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/StringBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.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.objects.badges; +package io.github.jwdeveloper.tiktok.data.models.badges; import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/TextBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/TextBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java index a0820b9..cf62a34 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/badges/TextBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.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.objects.badges; +package io.github.jwdeveloper.tiktok.data.models.badges; import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/BarrageParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/BarrageParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java index e5b6794..855eab2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/BarrageParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.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.objects.barrage; +package io.github.jwdeveloper.tiktok.data.models.barrage; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/FansLevelParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/FansLevelParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java index c56352d..1206ee7 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/FansLevelParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java @@ -20,9 +20,9 @@ * 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.barrage; +package io.github.jwdeveloper.tiktok.data.models.barrage; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; public class FansLevelParam extends BarrageParam diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/SubscribeGiftParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/SubscribeGiftParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java index df44554..6cb50d3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/SubscribeGiftParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.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.objects.barrage; +package io.github.jwdeveloper.tiktok.data.models.barrage; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/UserGradeParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/UserGradeParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java index 095b6ad..22d945a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/barrage/UserGradeParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java @@ -20,9 +20,9 @@ * 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.barrage; +package io.github.jwdeveloper.tiktok.data.models.barrage; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; public class UserGradeParam extends BarrageParam { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/User.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/User.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java index 93b7f24..d84815a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/User.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java @@ -20,10 +20,10 @@ * 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; +package io.github.jwdeveloper.tiktok.data.models.users; -import io.github.jwdeveloper.tiktok.events.objects.badges.Badge; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.badges.Badge; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage; import lombok.AccessLevel; import lombok.Getter; @@ -39,7 +39,6 @@ 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; @@ -99,14 +98,12 @@ public class User { public User(Long userId, String nickName, - String description, Picture profilePicture, Integer following, Integer followers, List badges) { this.id = userId; this.name = nickName; - this.description = description; this.picture = profilePicture; this.following = following; this.followers = followers; @@ -130,7 +127,6 @@ public class User { 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(); @@ -154,7 +150,6 @@ public class User { public static User EMPTY = new User(0L, - "", "", Picture.Empty(), 0, @@ -198,7 +193,6 @@ public class User { return new User(0L, //envelopeInfo.getSendUserId(), envelopeInfo.getSendUserName(), - "", Picture.map(envelopeInfo.getSendUserAvatar()), 0, 0, diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/UserAttribute.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/UserAttribute.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.java index 11f1a26..4dea4b3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/users/UserAttribute.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.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.objects.users; +package io.github.jwdeveloper.tiktok.data.models.users; public enum UserAttribute { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/handler/TikTokMessageHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/handler/TikTokMessageHandler.java index 7eade2f..0f58193 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/handler/TikTokMessageHandler.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/handler/TikTokMessageHandler.java @@ -23,8 +23,7 @@ package io.github.jwdeveloper.tiktok.handler; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; public interface TikTokMessageHandler diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftManager.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftManager.java index 299ee9f..3c32abc 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftManager.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftManager.java @@ -22,8 +22,8 @@ */ package io.github.jwdeveloper.tiktok.live; -import io.github.jwdeveloper.tiktok.events.objects.Gift; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.Picture; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/TrackedUser.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/TrackedUser.java index 3b8de28..ea5d444 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/TrackedUser.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/TrackedUser.java @@ -22,9 +22,9 @@ */ 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 io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.users.User; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/UserManager.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/UserManager.java index 7a3a699..9c1e918 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/UserManager.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/UserManager.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.live; -import io.github.jwdeveloper.tiktok.events.objects.users.User; +import io.github.jwdeveloper.tiktok.data.models.users.User; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventBuilder.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventBuilder.java index 9cab065..87d6daf 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventBuilder.java @@ -20,20 +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.events; +package io.github.jwdeveloper.tiktok.live.events; -import io.github.jwdeveloper.tiktok.events.messages.*; -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.room.TikTokRoomEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomUserInfoEvent; -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; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.*; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboFinishedEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomUserInfoEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; public interface TikTokEventBuilder { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventConsumer.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventConsumer.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventConsumer.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventConsumer.java index b96fffb..d900a13 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventConsumer.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/events/TikTokEventConsumer.java @@ -20,8 +20,9 @@ * 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; +package io.github.jwdeveloper.tiktok.live.events; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.live.LiveClient; public interface TikTokEventConsumer diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/Mapper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/Mapper.java deleted file mode 100644 index 420803a..0000000 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/Mapper.java +++ /dev/null @@ -1,28 +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.mappers; - -public interface Mapper -{ - TARGET map(SOURCE source); -} diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/models/GiftStrike.java b/API/src/main/java/io/github/jwdeveloper/tiktok/models/GiftStrike.java deleted file mode 100644 index bf4abeb..0000000 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/models/GiftStrike.java +++ /dev/null @@ -1,28 +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.models; - -public enum GiftStrike -{ - BEGIN, UPDATE, ENDED -} diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/util/ConsoleColors.java b/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.java similarity index 99% rename from TestApplication/src/main/java/io/github/jwdeveloper/tiktok/util/ConsoleColors.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.java index c4b64c8..2042625 100644 --- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/util/ConsoleColors.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.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.util; +package io.github.jwdeveloper.tiktok.utils; public class ConsoleColors { diff --git a/API/src/main/proto/webcast.proto b/API/src/main/proto/webcast.proto index 474a6e0..e86f5b7 100644 --- a/API/src/main/proto/webcast.proto +++ b/API/src/main/proto/webcast.proto @@ -94,8 +94,8 @@ message WebcastGiftMessage { } } -//@WebcastRoomMessage -message WebcastRoomMessage { +//@RoomMessage +message RoomMessage { Common common = 1; string content = 2; bool supprotLandscape = 3; @@ -105,6 +105,12 @@ message WebcastRoomMessage { bool isWelcome = 7; } +//@WebcastRoomMessage +message WebcastRoomMessage { + Common common = 1; + string content = 2; +} + //@WebcastBarrageMessage message WebcastBarrageMessage { Common common = 1; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java index f7c3f8b..33ef5ba 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java @@ -22,9 +22,9 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokReconnectingEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokReconnectingEvent; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException; import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java index 9e22191..53259bf 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java @@ -22,26 +22,26 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.TikTokEventBuilder; -import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer; -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.gift.TikTokGiftComboFinishedEvent; -import io.github.jwdeveloper.tiktok.events.messages.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomPinEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomUserInfoEvent; -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.TikTokBarrageEvent; -import io.github.jwdeveloper.tiktok.events.messages.poll.TikTokPollEvent; -import io.github.jwdeveloper.tiktok.events.messages.social.TikTokShareEvent; -import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketResponseEvent; -import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketUnhandledMessageEvent; -import io.github.jwdeveloper.tiktok.events.messages.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.live.events.TikTokEventBuilder; +import io.github.jwdeveloper.tiktok.live.events.TikTokEventConsumer; +import io.github.jwdeveloper.tiktok.data.events.*; +import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboFinishedEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomUserInfoEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokBarrageEvent; +import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager; import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver; @@ -53,16 +53,15 @@ import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory; import io.github.jwdeveloper.tiktok.listener.TikTokEventListener; import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager; import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.utils.ConsoleColors; import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient; import java.time.Duration; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; +import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.util.logging.*; public class TikTokLiveClientBuilder implements TikTokEventBuilder { protected final ClientSettings clientSettings; @@ -74,7 +73,7 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder(); } @@ -108,6 +107,21 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder buildAndRunAsync() { - var executor = Executors.newSingleThreadExecutor(); - var future = executor.submit(this::buildAndRun); - executor.shutdown(); - return future; + public CompletableFuture buildAndConnectAsync() { + return CompletableFuture.supplyAsync(this::buildAndConnect); } public TikTokLiveClientBuilder onUnhandledSocial( @@ -303,16 +314,17 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder event) { - tikTokEventHandler.subscribe(TikTokGoalUpdateEvent.class, event); - return this; - } + public TikTokLiveClientBuilder onComment(TikTokEventConsumer event) { tikTokEventHandler.subscribe(TikTokCommentEvent.class, event); return this; } + public TikTokLiveClientBuilder onGoalUpdate(TikTokEventConsumer event) { + tikTokEventHandler.subscribe(TikTokGoalUpdateEvent.class, event); + return this; + } public TikTokLiveClientBuilder onRankUpdate(TikTokEventConsumer event) { tikTokEventHandler.subscribe(TikTokRankUpdateEvent.class, event); return this; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java index 18c5f5b..41616be 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java @@ -22,8 +22,8 @@ */ package io.github.jwdeveloper.tiktok.gifts; -import io.github.jwdeveloper.tiktok.events.objects.Gift; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import io.github.jwdeveloper.tiktok.live.GiftManager; import sun.misc.Unsafe; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java index c9f931c..9bd00d4 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java @@ -22,9 +22,8 @@ */ package io.github.jwdeveloper.tiktok.handlers; -import io.github.jwdeveloper.tiktok.TikTokLiveClient; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.live.events.TikTokEventConsumer; import io.github.jwdeveloper.tiktok.live.LiveClient; import java.util.HashMap; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java index f8699f6..2259f26 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java @@ -23,12 +23,11 @@ package io.github.jwdeveloper.tiktok.handlers; -import com.google.protobuf.ByteString; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent; -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; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException; import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; import io.github.jwdeveloper.tiktok.live.LiveClient; @@ -86,16 +85,12 @@ public abstract class TikTokMessageHandler { public void handleSingleMessage(LiveClient client, WebcastResponse.Message message) throws Exception { - var methodName = message.getMethod(); - if (!methodName.contains("Webcast")) { - methodName = "Webcast" + methodName; - } - - if (!handlers.containsKey(methodName)) { + var messageClassName = message.getMethod(); + if (!handlers.containsKey(messageClassName)) { tikTokEventHandler.publish(client, new TikTokWebsocketUnhandledMessageEvent(message)); return; } - var handler = handlers.get(methodName); + var handler = handlers.get(messageClassName); var tiktokEvent = handler.handle(message.getPayload().toByteArray()); tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(tiktokEvent, message)); tikTokEventHandler.publish(client, tiktokEvent); diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java index 923e4b2..6ed80c5 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java @@ -23,25 +23,25 @@ package io.github.jwdeveloper.tiktok.handlers; import io.github.jwdeveloper.tiktok.TikTokRoomInfo; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.messages.*; -import io.github.jwdeveloper.tiktok.events.messages.TikTokBarrageEvent; -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.poll.TikTokPollEndEvent; -import io.github.jwdeveloper.tiktok.events.messages.poll.TikTokPollEvent; -import io.github.jwdeveloper.tiktok.events.messages.poll.TikTokPollStartEvent; -import io.github.jwdeveloper.tiktok.events.messages.poll.TikTokPollUpdateEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomPinEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomUserInfoEvent; -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.objects.Gift; -import io.github.jwdeveloper.tiktok.events.objects.Picture; -import io.github.jwdeveloper.tiktok.events.objects.Text; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.*; +import io.github.jwdeveloper.tiktok.data.events.TikTokBarrageEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboFinishedEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEndEvent; +import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent; +import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollStartEvent; +import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollUpdateEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomUserInfoEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.Picture; +import io.github.jwdeveloper.tiktok.data.models.Text; import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager; import io.github.jwdeveloper.tiktok.messages.webcast.*; import io.github.jwdeveloper.tiktok.models.SocialTypes; @@ -73,6 +73,7 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler { //Room status events registerMapping(WebcastLiveIntroMessage.class, TikTokRoomEvent.class); registerMapping(WebcastRoomUserSeqMessage.class, this::handleRoomUserSeqMessage); + registerMapping(RoomMessage.class, TikTokRoomEvent.class); registerMapping(WebcastRoomMessage.class, TikTokRoomEvent.class); registerMapping(WebcastCaptionMessage.class, TikTokCaptionEvent.class); diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java index 5b4a6a4..0bf9ee3 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.listener; -import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer; +import io.github.jwdeveloper.tiktok.live.events.TikTokEventConsumer; import lombok.Value; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java index bb808c0..6303633 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java @@ -24,8 +24,8 @@ package io.github.jwdeveloper.tiktok.listener; import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.live.events.TikTokEventConsumer; import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/messages/TikTokLikeEventMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/messages/TikTokLikeEventMapper.java index 6f826b1..ecfc583 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/messages/TikTokLikeEventMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/messages/TikTokLikeEventMapper.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.mappers.messages; -import io.github.jwdeveloper.tiktok.events.messages.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; import io.github.jwdeveloper.tiktok.mappers.Mapper; import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java index 57d7274..94cb453 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java @@ -68,17 +68,17 @@ public class TikTokWebSocketClient implements SocketClient { stop(); } - if (webcastResponse.getPushServer().isEmpty() || - webcastResponse.getRouteParamsMapMap().isEmpty()) { + if (webcastResponse.getPushServer().isEmpty() || webcastResponse.getRouteParamsMapMap().isEmpty()) + { throw new TikTokLiveException("Could not find Room"); } try { - var url = getWebSocketUrl(webcastResponse); if (clientSettings.isHandleExistingEvents()) { logger.info("Handling existing messages"); webResponseHandler.handle(tikTokLiveClient, webcastResponse); } + var url = getWebSocketUrl(webcastResponse); webSocketClient = startWebSocket(url, tikTokLiveClient); webSocketClient.connect(); @@ -91,26 +91,28 @@ public class TikTokWebSocketClient implements SocketClient { } } - private WebSocketClient startWebSocket(String url, LiveClient liveClient) { + private URI getWebSocketUrl(WebcastResponse webcastResponse) { + var tiktokAccessKey = webcastResponse.getRouteParamsMapMap(); + + var parameters = new TreeMap<>(clientSettings.getClientParameters()); + parameters.putAll(tiktokAccessKey); + + var url = webcastResponse.getPushServer(); + var parsed = HttpUtils.parseParametersEncode(url, parameters); + return URI.create(parsed); + } + + private WebSocketClient startWebSocket(URI url, LiveClient liveClient) { var cookie = tikTokCookieJar.parseCookies(); - var map = new HashMap(); - map.put("Cookie", cookie); - return new TikTokWebSocketListener(URI.create(url), - map, + var headers = new HashMap(); + headers.put("Cookie", cookie); + return new TikTokWebSocketListener(url, + headers, 3000, webResponseHandler, tikTokEventHandler, liveClient); } - - private String getWebSocketUrl(WebcastResponse webcastResponse) { - var clone = new TreeMap<>(clientSettings.getClientParameters()); - clone.putAll(Constants.DefaultRequestHeaders()); - clone.putAll(webcastResponse.getRouteParamsMapMap()); - var url = webcastResponse.getPushServer(); - return HttpUtils.parseParametersEncode(url, clone); - } - public void stop() { if (isConnected && webSocketClient != null) { diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java index 462fa26..2678d1e 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java @@ -23,10 +23,9 @@ package io.github.jwdeveloper.tiktok.websocket; import com.google.protobuf.ByteString; -import io.github.jwdeveloper.tiktok.TikTokLiveClient; -import io.github.jwdeveloper.tiktok.events.messages.TikTokConnectedEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; import io.github.jwdeveloper.tiktok.exceptions.TikTokProtocolBufferException; import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver; import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration; @@ -88,16 +87,12 @@ public class TikTokWebSocketListener extends WebSocketClient { @Override public void onClose(int i, String s, boolean b) { - - System.out.println("CLOSE "+i+" "+s+" "+b); tikTokEventHandler.publish(tikTokLiveClient,new TikTokDisconnectedEvent()); } @Override public void onError(Exception error) { - System.out.println("ERROR"); - error.printStackTrace(); tikTokEventHandler.publish(tikTokLiveClient,new TikTokErrorEvent(error)); if(isNotClosing()) { @@ -111,10 +106,14 @@ public class TikTokWebSocketListener extends WebSocketClient { return; } var websocketMessage = websocketMessageOptional.get(); - System.out.println("ACK ID "+websocketMessage.getLogId()+" ID "+websocketMessage.getSeqId()); - sendAckId(websocketMessage.getLogId()); - var webResponse = getWebResponseMessage(websocketMessage.getPayload()); + + if(webResponse.getNeedsAck()) + { + //For some reason while send ack id, server get disconnected + // sendAckId(webResponse.getFetchInterval()); + } + webResponseHandler.handle(tikTokLiveClient, webResponse); } @@ -143,8 +142,6 @@ public class TikTokWebSocketListener extends WebSocketClient { return !isClosed() && !isClosing(); } - - private void sendAckId(long id) { var serverInfo = WebcastWebsocketAck .newBuilder() diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketPingingTask.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketPingingTask.java index 68031c7..1a413a3 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketPingingTask.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketPingingTask.java @@ -67,7 +67,6 @@ public class TikTokWebSocketPingingTask Thread.sleep(100); continue; } - System.out.println("PING!"); webSocket.sendPing(); var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManagerTest.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManagerTest.java index 7da5f39..85c6eb3 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManagerTest.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManagerTest.java @@ -22,8 +22,8 @@ */ package io.github.jwdeveloper.tiktok.gifts; -import io.github.jwdeveloper.tiktok.events.objects.Gift; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Gift; +import io.github.jwdeveloper.tiktok.data.models.Picture; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java index e2871d4..81067fd 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java @@ -23,9 +23,9 @@ package io.github.jwdeveloper.tiktok.listener; import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.messages.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.events.messages.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver; import io.github.jwdeveloper.tiktok.live.LiveClient; diff --git a/README.md b/README.md index 6d3e303..c4a1f7f 100644 --- a/README.md +++ b/README.md @@ -138,18 +138,17 @@ public class ConfigurationExample { package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent; -import io.github.jwdeveloper.tiktok.events.messages.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokGiftMessageEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; import io.github.jwdeveloper.tiktok.listener.TikTokEventListener; import io.github.jwdeveloper.tiktok.live.LiveClient; import java.io.IOException; -public class ListenerExample -{ +public class ListenerExample { public static void main(String[] args) throws IOException { CustomListener customListener = new CustomListener(); @@ -169,36 +168,30 @@ public class ListenerExample - first parameter must be LiveClient - second must be class that extending TikTokEvent */ - public static class CustomListener implements TikTokEventListener - { + public static class CustomListener implements TikTokEventListener { @TikTokEventHandler - public void onLike(LiveClient liveClient, TikTokLikeEvent event) - { + public void onLike(LiveClient liveClient, TikTokLikeEvent event) { System.out.println(event.toString()); } @TikTokEventHandler - public void onError(LiveClient liveClient, TikTokErrorEvent event) - { + public void onError(LiveClient liveClient, TikTokErrorEvent event) { System.out.println(event.getException().getMessage()); } @TikTokEventHandler - public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event) - { + public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event) { System.out.println(event.getText()); } @TikTokEventHandler - public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event) - { + public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event) { System.out.println(event.getGift().getDescription()); } @TikTokEventHandler - public void onAnyEvent(LiveClient liveClient, TikTokEvent event) - { + public void onAnyEvent(LiveClient liveClient, TikTokEvent event) { System.out.println(event.getClass().getSimpleName()); } diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ConfigurationExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ConfigurationExample.java index 308c9cd..f2cf5a9 100644 --- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ConfigurationExample.java +++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ConfigurationExample.java @@ -48,7 +48,7 @@ public class ConfigurationExample { //Optional: clientSettings.setRoomId("XXXXXXXXXXXXXXXXX"); }) - .buildAndRun(); + .buildAndConnect(); System.in.read(); } } diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java index 45a0cd1..a7eca4c 100644 --- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java +++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java @@ -23,11 +23,11 @@ package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent; -import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.events.messages.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.events.messages.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; import io.github.jwdeveloper.tiktok.listener.TikTokEventListener; import io.github.jwdeveloper.tiktok.live.LiveClient; @@ -46,7 +46,7 @@ public class ListenerExample { // set tiktok username var client = TikTokLive.newClient(Main.TEST_TIKTOK_USER) .addListener(customListener) - .buildAndRun(); + .buildAndConnect(); System.in.read(); } diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java index 5f00396..557fbc0 100644 --- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java +++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java @@ -22,17 +22,17 @@ */ package io.github.jwdeveloper.tiktok; -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.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.events.messages.room.TikTokRoomUserInfoEvent; -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.data.events.*; +import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomUserInfoEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent; import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.util.ConsoleColors; +import io.github.jwdeveloper.tiktok.utils.ConsoleColors; import java.io.IOException; import java.time.Duration; @@ -43,8 +43,7 @@ public class Main { public static void main(String[] args) throws IOException { - - + showLogo(); LiveClient client = TikTokLive.newClient(TEST_TIKTOK_USER) .configure(clientSettings -> { @@ -71,7 +70,9 @@ public class Main { { error.getException().printStackTrace(); }) - .buildAndRun(); + .buildAndConnect(); + + System.in.read(); } @@ -126,6 +127,18 @@ public class Main { print(e.getUser().getId(), "sent", e.getEmotes().size()); } + private static void showLogo() + { + System.out.println(ConsoleColors.GREEN+""" + + _____ _ _ _____ _ _ _ \s + |_ _(_) | _|_ _|__ | | _| | (_)_ _____\s + | | | | |/ / | |/ _ \\| |/ / | | \\ \\ / / _ \\ + | | | | < | | (_) | <| |___| |\\ V / __/ + |_| |_|_|\\_\\ |_|\\___/|_|\\_\\_____|_| \\_/ \\___| + """); + + } private static void print(Object... messages) { var sb = new StringBuilder(); for (var message : messages) { diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java index 9c3462c..2a8035b 100644 --- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java +++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.util.ConsoleColors; +import io.github.jwdeveloper.tiktok.utils.ConsoleColors; import java.io.IOException; @@ -68,7 +68,7 @@ public class SimpleExample { { event.getException().printStackTrace(); }) - .buildAndRunAsync(); + .buildAndConnectAsync(); System.in.read(); } diff --git a/TestApplication/target/classes/io/github/jwdeveloper/tiktok/Main$1.class b/TestApplication/target/classes/io/github/jwdeveloper/tiktok/Main$1.class index f10b6bd..88bedf4 100644 Binary files a/TestApplication/target/classes/io/github/jwdeveloper/tiktok/Main$1.class and b/TestApplication/target/classes/io/github/jwdeveloper/tiktok/Main$1.class differ diff --git a/TestApplication/target/classes/io/github/jwdeveloper/tiktok/util/ConsoleColors.class b/TestApplication/target/classes/io/github/jwdeveloper/tiktok/util/ConsoleColors.class deleted file mode 100644 index 729edad..0000000 Binary files a/TestApplication/target/classes/io/github/jwdeveloper/tiktok/util/ConsoleColors.class and /dev/null differ diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.java index 1b36b88..3d37013 100644 --- a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.java +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.java @@ -22,122 +22,26 @@ */ package io.github.jwdeveloper.tiktok.tools.collector; -import io.github.jwdeveloper.tiktok.TikTokLive; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException; -import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase; -import io.github.jwdeveloper.tiktok.tools.collector.tables.ExceptionInfoModel; -import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel; -import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel; -import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel; +import io.github.jwdeveloper.tiktok.tools.collector.client.TikTokMessageCollectorClient; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Base64; -import java.util.List; public class RunCollector { //https://protobuf-decoder.netlify.app/ //https://streamdps.com/tiktok-widgets/gifts/ - - public static List ignoredEvents; - - public static List> filter; + //WebcastLinkMicBattleItemCard does streamer win battle? public static void main(String[] args) throws SQLException { - ignoredEvents = new ArrayList<>(); - //ignoredEvents = List.of("TikTokJoinEvent","TikTokLikeEvent"); - filter = new ArrayList<>(); - // filter.add(TikTokUnhandledSocialEvent.class); - // filter.add(TikTokFollowEvent.class); - // filter.add(TikTokLikeEvent.class); - // filter.add(TikTokShareEvent.class); - // filter.add(TikTokJoinEvent.class); - - var db = new TikTokDatabase("test"); - db.init(); - - var users = new ArrayList(); - // users.add("mia_tattoo"); - // users.add("mr_wavecheck"); - users.add("bangbetmenygy"); - // users.add("szwagierkaqueen"); - for (var user : users) { - try { - runTikTokLiveInstance(user, db); - } catch (Exception e) { - - } - } - } - - private static void runTikTokLiveInstance(String tiktokUser, TikTokDatabase tikTokDatabase) { - - TikTokLive.newClient(tiktokUser) - .onConnected((liveClient, event) -> - { - System.out.println("CONNECTED TO " + liveClient.getRoomInfo().getHostName()); - }) - .onWebsocketResponse((liveClient, event) -> - { - var response = Base64.getEncoder().encodeToString(event.getResponse().toByteArray()); - - var responseModel = new TikTokResponseModel(); - responseModel.setResponse(response); - responseModel.setHostName(liveClient.getRoomInfo().getHostName()); - - tikTokDatabase.insertResponse(responseModel); - System.out.println("Included response"); - }) - .onWebsocketMessage((liveClient, event) -> - { - var eventName = event.getEvent().getClass().getSimpleName(); - - if (filter.size() != 0 && !filter.contains(event.getEvent().getClass())) { - return; - } - - var messageBinary = Base64.getEncoder().encodeToString(event.getMessage().toByteArray()); - var model = new TikTokMessageModel(); - model.setType("messsage"); - model.setHostName(tiktokUser); - model.setEventName(eventName); - model.setMessage(messageBinary); - - // tikTokDatabase.insertMessage(model); - System.out.println("EVENT: [" + tiktokUser + "] " + eventName); - }) - .onError((liveClient, event) -> - { - event.getException().printStackTrace(); - var exception = event.getException(); - var exceptionContent = ExceptionInfoModel.getStackTraceAsString(exception); - var errorModel = new TikTokErrorModel(); - if (exception instanceof TikTokLiveMessageException ex) { - errorModel.setHostName(tiktokUser); - errorModel.setErrorName(ex.messageMethod()); - errorModel.setErrorType("error-message"); - errorModel.setExceptionContent(exceptionContent); - errorModel.setMessage(ex.messageToBase64()); - errorModel.setResponse(ex.webcastResponseToBase64()); - } else { - errorModel.setHostName(tiktokUser); - errorModel.setErrorName(exception.getClass().getSimpleName()); - errorModel.setErrorType("error-system"); - errorModel.setExceptionContent(exceptionContent); - errorModel.setMessage(""); - errorModel.setResponse(""); - } - - - tikTokDatabase.insertError(errorModel); - System.out.println("ERROR: " + errorModel.getErrorName()); - exception.printStackTrace(); - - }) - .buildAndRunAsync(); + TikTokMessageCollectorClient.create("messageCollector") + .addUser("bangbetmenygy") + .addUser("mr_cios") + .addUser("sleepstreamxxx") + .addUser("psychotropnazywo") + .addUser("accordionistka") + .buildAndRun(); } diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/MessageCollector.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/MessageCollector.java new file mode 100644 index 0000000..b80c064 --- /dev/null +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/MessageCollector.java @@ -0,0 +1,103 @@ +/* + * 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.tools.collector.client; + +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; +import io.github.jwdeveloper.tiktok.utils.FilesUtility; +import io.github.jwdeveloper.tiktok.utils.JsonUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.io.File; +import java.lang.reflect.Type; +import java.nio.file.Paths; +import java.time.LocalDateTime; +import java.util.*; +import java.util.logging.Logger; + +public class MessageCollector { + + @Getter + Map> messages; + String outputName; + + int limit = 20; + public MessageCollector(String outputName) { + this.messages = new TreeMap<>(); + this.outputName = outputName; + load(); + } + + public void addMessage(Logger logger, String host, WebcastResponse.Message message) { + var name = message.getMethod(); + var payload = message.getPayload().toByteArray(); + var base64 = Base64.getEncoder().encodeToString(payload); + + if (!messages.containsKey(name)) { + logger.info("New Message found! " + name); + messages.put(name, new LinkedList<>()); + } + + var queue = messages.get(name); + if (queue.size() > limit) { + queue.poll(); + } + + queue.add(new MessageData(base64, host, LocalDateTime.now().toString())); + save(); + } + + public String toJson() { + return JsonUtil.toJson(messages); + } + + public void load() { + var file = new File(path()); + Type type = new TypeToken>>() {}.getType(); + + if (file.exists()) { + var content = FilesUtility.loadFileContent(path()); + var gson = new GsonBuilder().create(); + messages = gson.fromJson(content,type); + } + } + + public void save() { + + FilesUtility.saveFile(path(), toJson()); + } + + public String path() { + return Paths.get("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\Tools-EventsCollector\\src\\main\\resources", outputName + ".json").toString(); + } + + @AllArgsConstructor + @Getter + public class MessageData { + String eventData; + String uniqueId; + String ts; + } +} diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokClientFactory.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokClientFactory.java new file mode 100644 index 0000000..4772684 --- /dev/null +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokClientFactory.java @@ -0,0 +1,117 @@ +/* + * 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.tools.collector.client; + +import io.github.jwdeveloper.tiktok.TikTokLive; +import io.github.jwdeveloper.tiktok.TikTokLiveClientBuilder; +import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException; +import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase; +import io.github.jwdeveloper.tiktok.tools.collector.tables.ExceptionInfoModel; +import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel; +import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel; +import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel; + +import java.util.Base64; +import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; + +public class TikTokClientFactory { + private final MessageCollector messageCollector; + private final TikTokDatabase tikTokDatabase; + + public TikTokClientFactory(MessageCollector messageCollector, TikTokDatabase tikTokDatabase) { + this.messageCollector = messageCollector; + this.tikTokDatabase = tikTokDatabase; + } + + public CompletableFuture runClientAsync(String tiktokUser, Consumer onBuilder) { + var builder = TikTokLive.newClient(tiktokUser); + onBuilder.accept(builder); + return builder.onConnected((liveClient, event) -> + { + liveClient.getLogger().info("CONNECTED TO " + liveClient.getRoomInfo().getHostName()); + }) + .onWebsocketResponse((liveClient, event) -> + { + var response = Base64.getEncoder().encodeToString(event.getResponse().toByteArray()); + + var responseModel = new TikTokResponseModel(); + responseModel.setResponse(response); + responseModel.setHostName(liveClient.getRoomInfo().getHostName()); + tikTokDatabase.insertResponse(responseModel); + liveClient.getLogger().info("Response"); + for (var message : event.getResponse().getMessagesList()) { + messageCollector.addMessage(liveClient.getLogger(), liveClient.getRoomInfo().getHostName(), message); + } + }) + .onWebsocketMessage((liveClient, event) -> + { + var eventName = event.getEvent().getClass().getSimpleName(); + + /* + if (filter.size() != 0 && !filter.contains(event.getEvent().getClass())) { + return; + }*/ + + var messageBinary = Base64.getEncoder().encodeToString(event.getMessage().toByteArray()); + var model = new TikTokMessageModel(); + model.setType("messsage"); + model.setHostName(tiktokUser); + model.setEventName(eventName); + model.setMessage(messageBinary); + + // tikTokDatabase.insertMessage(model); + liveClient.getLogger().info("EVENT: [" + tiktokUser + "] " + eventName); + }) + .onError((liveClient, event) -> + { + event.getException().printStackTrace(); + var exception = event.getException(); + var exceptionContent = ExceptionInfoModel.getStackTraceAsString(exception); + var errorModel = new TikTokErrorModel(); + if (exception instanceof TikTokLiveMessageException ex) { + errorModel.setHostName(tiktokUser); + errorModel.setErrorName(ex.messageMethod()); + errorModel.setErrorType("error-message"); + errorModel.setExceptionContent(exceptionContent); + errorModel.setMessage(ex.messageToBase64()); + errorModel.setResponse(ex.webcastResponseToBase64()); + } else { + errorModel.setHostName(tiktokUser); + errorModel.setErrorName(exception.getClass().getSimpleName()); + errorModel.setErrorType("error-system"); + errorModel.setExceptionContent(exceptionContent); + errorModel.setMessage(""); + errorModel.setResponse(""); + } + + + tikTokDatabase.insertError(errorModel); + liveClient.getLogger().info("ERROR: " + errorModel.getErrorName()); + exception.printStackTrace(); + + }) + .buildAndConnectAsync(); + } +} diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/MappingContext.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessageCollectorClient.java similarity index 72% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/MappingContext.java rename to Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessageCollectorClient.java index 72a8e2f..5ad3615 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/MappingContext.java +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessageCollectorClient.java @@ -20,11 +20,17 @@ * 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; +package io.github.jwdeveloper.tiktok.tools.collector.client; -public interface MappingContext +public class TikTokMessageCollectorClient { - T getMessage(); + public static TikTokMessagessCollectorBuilder create(String outputName) + { + return new TikTokMessagessCollectorBuilder(outputName); + } - Mapper getMapper(); + public static TikTokMessagessCollectorBuilder create(MessageCollector messageCollector, String outputName) + { + return new TikTokMessagessCollectorBuilder(outputName); + } } diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessagessCollectorBuilder.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessagessCollectorBuilder.java new file mode 100644 index 0000000..9d4f78c --- /dev/null +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessagessCollectorBuilder.java @@ -0,0 +1,98 @@ +/* + * 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.tools.collector.client; + +import io.github.jwdeveloper.tiktok.TikTokLiveClientBuilder; +import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +public class TikTokMessagessCollectorBuilder { + List users; + String outputFileName; + List> filters; + Consumer onBuilder; + List tiktokclients; + + MessageCollector messageCollector; + + public TikTokMessagessCollectorBuilder(String outputName) { + users = new ArrayList<>(); + outputFileName = outputName; + filters = new ArrayList<>(); + onBuilder = (e) -> { + }; + tiktokclients = new ArrayList<>(); + messageCollector = new MessageCollector(outputName); + } + + public TikTokMessagessCollectorBuilder(MessageCollector messageCollector, String outputFileName) { + this(outputFileName); + this.messageCollector = messageCollector; + } + + public TikTokMessagessCollectorBuilder setOutputName(String name) { + outputFileName = name; + return this; + } + + + public TikTokMessagessCollectorBuilder addOnBuilder(Consumer consumer) { + onBuilder = consumer; + return this; + } + + public TikTokMessagessCollectorBuilder addUser(String user) { + users.add(user); + return this; + } + + public TikTokMessagessCollectorBuilder addEventFilter(Class event) { + filters.add(event); + return this; + } + + public MessageCollector buildAndRun() throws SQLException { + var db = new TikTokDatabase(outputFileName); + db.init(); + var factory = new TikTokClientFactory(messageCollector, db); + for (var user : users) { + var client = factory.runClientAsync(user, onBuilder); + client.thenAccept(liveClient -> + { + tiktokclients.add(liveClient); + }); + } + return messageCollector; + } + + public void stop() { + for (var client : tiktokclients) { + client.disconnect(); + } + } +} diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.java index 5dd2f3e..2a2712b 100644 --- a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.java +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.java @@ -27,6 +27,7 @@ import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; import io.github.jwdeveloper.tiktok.mockClient.TikTokClientMock; import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase; import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel; +import io.github.jwdeveloper.tiktok.tools.util.MessageUtil; import io.github.jwdeveloper.tiktok.utils.ConsoleColors; import io.github.jwdeveloper.tiktok.utils.JsonUtil; @@ -49,54 +50,28 @@ public class RunDbTester { .addResponses(responses) .onWebsocketUnhandledMessage((liveClient, event) -> { - liveClient.getLogger().info("Unhandled Message! " + event.getData().getMethod()); + var sb = new StringBuilder(); + sb.append("Unhandled Message! " ); + sb.append(event.getData().getMethod()); + sb.append(MessageUtil.getContent(event.getData())); + + liveClient.getLogger().info(sb.toString()); }) .onWebsocketMessage((liveClient, event) -> { var sb = new StringBuilder(); sb.append(event.getEvent().getClass().getSimpleName()); sb.append(event.getEvent().toJson()); - // sb.append(ConsoleColors.YELLOW + messageContent(event.getMessage())); - - liveClient.getLogger().info(sb.toString()); + liveClient.getLogger().fine(sb.toString()); }) .build(); - updateLogger(client.getLogger()); + client.connect(); } - protected static String messageContent(WebcastResponse.Message message) { - try { - var methodName = message.getMethod(); - if (!methodName.contains("Webcast")) { - methodName = "Webcast" + methodName; - } - var inputClazz = Class.forName("io.github.jwdeveloper.tiktok.messages.webcast." + methodName); - var parseMethod = inputClazz.getDeclaredMethod("parseFrom", ByteString.class); - var deserialized = parseMethod.invoke(null, message.getPayload()); - return JsonUtil.messageToJson(deserialized); - } catch (Exception ex) { - return ""; - } - } - public static void updateLogger(Logger logger) { - for (var handler : logger.getHandlers()) { - logger.removeHandler(handler); - } - - var handler = new ConsoleHandler(); - handler.setFormatter(new Formatter() { - @Override - public String format(LogRecord record) { - return ConsoleColors.WHITE_BRIGHT + record.getLevel() + ": " + ConsoleColors.GREEN + record.getMessage() + "\n" + ConsoleColors.RESET; - } - }); - logger.setUseParentHandlers(false); - logger.addHandler(handler); - } } diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunJsonTester.java similarity index 75% rename from Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.java rename to Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunJsonTester.java index bd8ce54..4ffa762 100644 --- a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.java +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunJsonTester.java @@ -23,32 +23,37 @@ package io.github.jwdeveloper.tiktok.tools.tester; import com.google.gson.JsonParser; -import com.google.protobuf.InvalidProtocolBufferException; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicFanTicketMethod; import io.github.jwdeveloper.tiktok.mockClient.TikTokClientMock; +import io.github.jwdeveloper.tiktok.mockClient.mocks.LiveClientMock; +import io.github.jwdeveloper.tiktok.tools.util.MessageUtil; -import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.util.*; -public class RunLogTester { +public class RunJsonTester { public static void main(String[] args) throws IOException { - - - var input ="CjwKHVdlYmNhc3RMaW5rTWljRmFuVGlja2V0TWV0aG9kEIWWp7ig2O6OZRiGlviyrNjpjmUgza2G4a8xMAESZwoNCIWIouKYhLqBYhCbARCbASpTaHR0cHM6Ly9wMTYtd2ViY2FzdC50aWt0b2tjZG4uY29tL2ltZy93ZWJjYXN0LXNnL3Rpa3Rva19saW5rbWljX2NvaW5AM3gucG5nfjB4MC5wbmc="; - var bytes = Base64.getDecoder().decode(input); - var a= WebcastLinkMicFanTicketMethod.parseFrom(bytes); - - - var messages = getMessages(); - var client = TikTokClientMock.create().build(); + var client =(LiveClientMock) TikTokClientMock.create() + .onWebsocketUnhandledMessage((liveClient, event) -> + { + var sb = new StringBuilder(); + sb.append("Unhandled Message! " ); + sb.append(event.getData().getMethod()); + sb.append("\n"); + sb.append(MessageUtil.getContent(event.getData())); + + + liveClient.getLogger().info(sb.toString()); + }) + .onError((liveClient, event) -> + { + event.getException().printStackTrace(); + }) + .build(); for(var msg : messages.entrySet()) { for(var content : msg.getValue()) @@ -72,7 +77,6 @@ public class RunLogTester { var messages = jsonObject.get(key).getAsJsonArray(); for (var msg : messages) { var data = msg.getAsJsonObject().get("eventData").getAsString(); - // System.out.println("KEY: " + key + " DATA: " + data); res.computeIfAbsent(key, s -> new ArrayList<>()).add(data); } } diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/util/MessageUtil.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/util/MessageUtil.java new file mode 100644 index 0000000..adf4d09 --- /dev/null +++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/util/MessageUtil.java @@ -0,0 +1,56 @@ +/* + * 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.tools.util; + +import com.google.protobuf.ByteString; +import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; +import io.github.jwdeveloper.tiktok.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.utils.JsonUtil; + +public class MessageUtil +{ + public static String getContent(WebcastResponse.Message message) { + try { + var methodName = message.getMethod(); + var inputClazz = Class.forName("io.github.jwdeveloper.tiktok.messages.webcast." + methodName); + var parseMethod = inputClazz.getDeclaredMethod("parseFrom", ByteString.class); + var deserialized = parseMethod.invoke(null, message.getPayload()); + return JsonUtil.messageToJson(deserialized); + } catch (Exception ex) { + return ConsoleColors.RED+ "Can not find mapper for "+message.getMethod(); + } + } + + public static String getContent(String methodName, byte[] bytes) { + try { + + var inputClazz = Class.forName("io.github.jwdeveloper.tiktok.messages.webcast." + methodName); + var parseMethod = inputClazz.getDeclaredMethod("parseFrom", byte[].class); + var deserialized = parseMethod.invoke(null, bytes); + return JsonUtil.messageToJson(deserialized); + } catch (Exception ex) { + return ConsoleColors.RED+ "Can not find mapper for "+methodName; + } + } + +} diff --git a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.class b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.class index fe8ea16..8d8152e 100644 Binary files a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.class and b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.class differ diff --git a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester$1.class b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester$1.class deleted file mode 100644 index 6b664e0..0000000 Binary files a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester$1.class and /dev/null differ diff --git a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.class b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.class index cb7b944..92aa3b9 100644 Binary files a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.class and b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.class differ diff --git a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.class b/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.class deleted file mode 100644 index 113b866..0000000 Binary files a/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/tester/RunLogTester.class and /dev/null differ diff --git a/Tools-EventsWebViewer/pom.xml b/Tools-EventsWebViewer/pom.xml new file mode 100644 index 0000000..db3cb37 --- /dev/null +++ b/Tools-EventsWebViewer/pom.xml @@ -0,0 +1,36 @@ + + + + TikTokLiveJava + io.github.jwdeveloper.tiktok + 0.0.25-Release + + 4.0.0 + Tools-EventsWebViewer + 0.0.1-SNAPSHOT + Demo project for Spring Boot + + + io.javalin + javalin + 5.6.2 + + + org.slf4j + slf4j-simple + 2.0.7 + + + io.github.jwdeveloper.tiktok + Tools-EventsCollector + 0.0.25-Release + compile + + + + + + + \ No newline at end of file diff --git a/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/Main.java b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/Main.java new file mode 100644 index 0000000..ba47fb1 --- /dev/null +++ b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/Main.java @@ -0,0 +1,28 @@ +package io.github.jwdeveloper.tiktok.webviewer; + +import io.github.jwdeveloper.tiktok.webviewer.handlers.TikTokHandler; +import io.javalin.Javalin; + +public class Main { + public static void main(String[] args) { + + var manager = new TikTokManager(); + var app = Javalin.create(config -> + { + config.plugins.enableCors(corsContainer -> + { + corsContainer.add(corsPluginConfig -> + { + corsPluginConfig.allowHost("http://localhost:5500"); + }); + }); + config.staticFiles.add("/public"); + }).start(8001); + + var handler = new TikTokHandler(manager); + app.get("/tiktok/connect", handler::connect); + app.get("/tiktok/disconnect", handler::disconnect); + app.get("/tiktok/events", handler::events); + app.get("/tiktok/events/message", handler::eventMessage); + } +} diff --git a/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/TikTokManager.java b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/TikTokManager.java new file mode 100644 index 0000000..32449eb --- /dev/null +++ b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/TikTokManager.java @@ -0,0 +1,66 @@ +package io.github.jwdeveloper.tiktok.webviewer; + +import com.google.protobuf.InvalidProtocolBufferException; +import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse; +import io.github.jwdeveloper.tiktok.tools.collector.client.MessageCollector; +import io.github.jwdeveloper.tiktok.tools.collector.client.TikTokMessageCollectorClient; +import io.github.jwdeveloper.tiktok.tools.collector.client.TikTokMessagessCollectorBuilder; +import io.github.jwdeveloper.tiktok.tools.util.MessageUtil; +import lombok.Value; + +import java.sql.SQLException; +import java.util.Base64; +import java.util.List; +import java.util.Random; + +public class TikTokManager { + TikTokMessagessCollectorBuilder client; + MessageCollector msgCollector; + + public TikTokManager() { + msgCollector = new MessageCollector("web"); + } + + public void connect(String name) throws SQLException { + disconnect(); + client = TikTokMessageCollectorClient.create(msgCollector, "web").addUser(name); + client.buildAndRun(); + } + + public List getEventsNames() { + return msgCollector.getMessages().keySet().stream().toList(); + } + + public List getEventMessages(String eventName) { + return msgCollector.getMessages().get(eventName).stream().map(MessageCollector.MessageData::getEventData).toList(); + } + + + public MessageDto getMessage(String event) throws InvalidProtocolBufferException { + var eventData = msgCollector.getMessages().get(event); + var messages = eventData.stream().toList(); + var random = new Random(); + var index = random.nextInt(messages.size()-1); + var msg = messages.get(index); + + + var bytes = Base64.getDecoder().decode(msg.getEventData()); + var content = MessageUtil.getContent(event,bytes); + return new MessageDto(content, msg.getEventData(), event); + } + + @Value + public class MessageDto { + String content; + String base64; + String eventName; + } + + public void disconnect() { + if (client == null) { + return; + } + client.stop(); + } + +} diff --git a/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/handlers/TikTokHandler.java b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/handlers/TikTokHandler.java new file mode 100644 index 0000000..acf17db --- /dev/null +++ b/Tools-EventsWebViewer/src/main/java/io/github/jwdeveloper/tiktok/webviewer/handlers/TikTokHandler.java @@ -0,0 +1,48 @@ +package io.github.jwdeveloper.tiktok.webviewer.handlers; + +import com.google.gson.Gson; +import com.google.protobuf.InvalidProtocolBufferException; +import io.github.jwdeveloper.tiktok.webviewer.TikTokManager; +import io.javalin.http.Context; + +import java.sql.SQLException; + +public class TikTokHandler { + private final TikTokManager tikTokManager; + + public TikTokHandler(TikTokManager tikTokManager) { + this.tikTokManager = tikTokManager; + } + + + public void connect(Context context) throws SQLException { + String name = context.queryParam("name"); + if (name.equals(" ")) { + context.result("Name can not be empty"); + context.status(400); + return; + } + tikTokManager.connect(name); + context.status(200); + } + + public void disconnect(Context context) throws SQLException { + tikTokManager.disconnect(); + context.status(200); + } + + public void events(Context context) throws SQLException { + var events = tikTokManager.getEventsNames(); + var gson = new Gson(); + var result = gson.toJson(events); + context.result(result); + context.status(200); + } + + public void eventMessage(Context context) throws InvalidProtocolBufferException { + String name = context.queryParam("eventName"); + var result = tikTokManager.getMessage(name); + var gson = new Gson(); + context.result(gson.toJson(result)); + } +} diff --git a/Tools-EventsWebViewer/src/main/resources/public/index.html b/Tools-EventsWebViewer/src/main/resources/public/index.html new file mode 100644 index 0000000..b43cfe3 --- /dev/null +++ b/Tools-EventsWebViewer/src/main/resources/public/index.html @@ -0,0 +1,226 @@ + + + + + + + Bootstrap Styled Javalin App + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+ + + +
+ +
+ +
+
    + +
+
+
+ +
+
+
+
+ + + +
+
+
+ +
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java index 3386ce2..c997785 100644 --- a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java +++ b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java @@ -24,7 +24,7 @@ package io.github.jwdeveloper.tiktok; 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.data.events.common.TikTokEvent; import org.reflections.Reflections; import java.util.*; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/events_generator/JavaClassGenerator.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/events_generator/JavaClassGenerator.java index 434bfc6..43ef17f 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/events_generator/JavaClassGenerator.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/events_generator/JavaClassGenerator.java @@ -23,7 +23,7 @@ package io.github.jwdeveloper.tiktok.events_generator; import com.squareup.javapoet.*; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; import lombok.Getter; import javax.lang.model.element.Modifier; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GenerateGiftsEnum.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GenerateGiftsEnum.java index 7c75ab2..f51dbcc 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GenerateGiftsEnum.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GenerateGiftsEnum.java @@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.gifts; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import io.github.jwdeveloper.tiktok.events.objects.Picture; +import io.github.jwdeveloper.tiktok.data.models.Picture; import io.github.jwdeveloper.tiktok.gifts.downloader.GiftDto; import lombok.Getter; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GiftsDownloader.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GiftsDownloader.java index ccc6046..7e31482 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GiftsDownloader.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/GiftsDownloader.java @@ -22,12 +22,9 @@ */ package io.github.jwdeveloper.tiktok.gifts; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import io.github.jwdeveloper.tiktok.events.objects.Picture; import io.github.jwdeveloper.tiktok.gifts.downloader.GiftDto; import io.github.jwdeveloper.tiktok.gifts.downloader.GiftOfficialJson; import io.github.jwdeveloper.tiktok.gifts.downloader.GiftScraperJson; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftDto.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftDto.java index a1dbde3..04792bd 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftDto.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftDto.java @@ -22,8 +22,6 @@ */ package io.github.jwdeveloper.tiktok.gifts.downloader; -import io.github.jwdeveloper.tiktok.events.objects.Picture; -import io.github.jwdeveloper.tiktok.utils.JsonIgnore; import lombok.Data; @Data diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftOfficialJson.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftOfficialJson.java index 75a789a..c0cc63f 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftOfficialJson.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftOfficialJson.java @@ -26,7 +26,6 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import io.github.jwdeveloper.tiktok.Constants; -import io.github.jwdeveloper.tiktok.events.objects.Picture; import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException; import io.github.jwdeveloper.tiktok.http.TikTokCookieJar; import io.github.jwdeveloper.tiktok.http.TikTokHttpClient; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftScraperJson.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftScraperJson.java index 21d0fdd..50d913a 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftScraperJson.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/gifts/downloader/GiftScraperJson.java @@ -23,7 +23,6 @@ package io.github.jwdeveloper.tiktok.gifts.downloader; -import io.github.jwdeveloper.tiktok.events.objects.Picture; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/intefacee/EventsInterfaceGenerator.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/intefacee/EventsInterfaceGenerator.java index 0c525a2..1c002e1 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/intefacee/EventsInterfaceGenerator.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/intefacee/EventsInterfaceGenerator.java @@ -24,7 +24,7 @@ package io.github.jwdeveloper.tiktok.intefacee; import com.squareup.javapoet.*; import io.github.jwdeveloper.tiktok.TikTokLiveClientBuilder; -import io.github.jwdeveloper.tiktok.events.TikTokEvent; +import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.events_generator.EventGeneratorSettings; import org.reflections.Reflections; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.java index f508f7c..339eff5 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.java @@ -112,7 +112,7 @@ public class TikTokMockBuilder extends TikTokLiveClientBuilder { } @Override - public LiveClientMock buildAndRun() { + public LiveClientMock buildAndConnect() { var client = build(); client.connect(); return client; diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.java index caba3ff..72dfb5c 100644 --- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.java +++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.java @@ -102,7 +102,6 @@ public class WebsocketClientMock implements SocketClient { if (!messages.isEmpty()) { var messageStr = messages.pop(); try { - System.out.println("TYPE: " + messageStr.getMessageType()); messageHandler.handleSingleMessage(tikTokLiveClient, messageStr.getMessageType(), messageStr.getMessageValue()); } catch (Exception e) { logger.info("Unable to parse message for response " + messageStr.getMessageType()); diff --git a/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.class b/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.class index 7684570..eebfed2 100644 Binary files a/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.class and b/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/TikTokMockBuilder.class differ diff --git a/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.class b/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.class index a1e848f..9c51b41 100644 Binary files a/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.class and b/Tools/target/classes/io/github/jwdeveloper/tiktok/mockClient/mocks/WebsocketClientMock.class differ diff --git a/pom.xml b/pom.xml index 5cdc115..893b869 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ TestApplication Tools-EventsCollector Tools-ReadmeGenerator + Tools-EventsWebViewer