diff --git a/API/pom.xml b/API/pom.xml index ec633c32..86f36b9a 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -52,6 +52,7 @@ direct 4.26.1 + ${project.build.directory}/generated-sources/protobuf/src/java src/main/proto @@ -59,6 +60,27 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.1 + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/protobuf/src/java + + + + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventMeta.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventMeta.java index f5d734f9..4aaa0d52 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventMeta.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.annotations; +package io.github.jwdeveloper.tiktok.api.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventType.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventType.java index 167fba2a..ef7f483a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/EventType.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.annotations; +package io.github.jwdeveloper.tiktok.api.annotations; public enum EventType diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/Priority.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/Priority.java index 8559a538..02c8bd25 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/Priority.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.annotations; +package io.github.jwdeveloper.tiktok.api.annotations; /** ORDER - diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventObserver.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/TikTokEventObserver.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventObserver.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/TikTokEventObserver.java index 0f5e21cf..4368917b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventObserver.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/annotations/TikTokEventObserver.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.annotations; +package io.github.jwdeveloper.tiktok.api.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/MessageMetaData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/MessageMetaData.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/MessageMetaData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/MessageMetaData.java index ded2f66c..ece8d94c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/MessageMetaData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/MessageMetaData.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.data.dto; +package io.github.jwdeveloper.tiktok.api.data.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/ProxyData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/ProxyData.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/ProxyData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/ProxyData.java index a1e5a29c..ff73f946 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/ProxyData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/dto/ProxyData.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.data.dto; +package io.github.jwdeveloper.tiktok.api.data.dto; import lombok.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokBarrageEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokBarrageEvent.java index 3acac221..b20c775b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokBarrageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokBarrageEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.barrage.BarrageParam; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.barrage.BarrageParam; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCaptionEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCaptionEvent.java index 7afaab7f..22f5dd8a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCaptionEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCaptionEvent.java @@ -20,11 +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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastCaptionMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastCaptionMessage; import lombok.Value; import java.util.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCommentEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCommentEvent.java index db21a9cd..47f54dc9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokCommentEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastChatMessage; import lombok.Getter; import java.util.List; @@ -56,7 +56,7 @@ public TikTokCommentEvent(WebcastChatMessage msg) { public static TikTokCommentEvent of(String userName, String message) { var builder = WebcastChatMessage.newBuilder(); - builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + builder.setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setNickname(userName) .setUsername(userName) .build()); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokConnectedEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokConnectedEvent.java index 5b049ab9..03f57347 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; +package io.github.jwdeveloper.tiktok.api.data.events; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; @EventMeta(eventType = EventType.Control) public class TikTokConnectedEvent extends TikTokLiveClientEvent diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokDetectEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokDetectEvent.java index b95a254d..2fb378bb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDetectEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokDetectEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMsgDetectMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMsgDetectMessage; import lombok.Getter; @Getter @EventMeta(eventType = EventType.Message) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokDisconnectedEvent.java similarity index 86% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokDisconnectedEvent.java index 715ca046..8a5f3d85 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; +package io.github.jwdeveloper.tiktok.api.data.events; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEmoteEvent.java similarity index 77% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEmoteEvent.java index c4f78aba..6ff0dfe8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEmoteEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Emote; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEmoteChatMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Emote; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEmoteChatMessage; import lombok.Value; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEnvelopeEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEnvelopeEvent.java index 489b0acd..5ba3f6bb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEnvelopeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokEnvelopeEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEnvelopeMessage; import lombok.Value; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokErrorEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokErrorEvent.java index 14a11b32..3caa1a24 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokErrorEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokGoalUpdateEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokGoalUpdateEvent.java index 5335d8c0..099edd98 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokGoalUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokGoalUpdateEvent.java @@ -20,15 +20,15 @@ * 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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGoalUpdateMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGoalUpdateMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokIMDeleteEvent.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokIMDeleteEvent.java index 1b570a78..46ef2bd3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokIMDeleteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokIMDeleteEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastImDeleteMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastImDeleteMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokInRoomBannerEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokInRoomBannerEvent.java index a60a7fb1..897e9fc5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokInRoomBannerEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokInRoomBannerEvent.java @@ -20,11 +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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastInRoomBannerMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastInRoomBannerMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkLayerEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkLayerEvent.java index 8e10cacd..18e02260 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkLayerEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkLayerEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkLayerMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkLayerMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicArmiesEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicArmiesEvent.java index de3238cd..334af398 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicArmiesEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicArmiesEvent.java @@ -20,13 +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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.*; -import io.github.jwdeveloper.tiktok.messages.enums.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicArmies; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.LinkMicArmy; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.*; +import io.github.jwdeveloper.tiktok.api.messages.enums.BattleType; +import io.github.jwdeveloper.tiktok.api.messages.enums.TriggerReason; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicArmies; import lombok.Getter; import java.util.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleEvent.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleEvent.java index 8524dbcc..c99c26d0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleEvent.java @@ -20,15 +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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.battles.Team; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.data.*; -import io.github.jwdeveloper.tiktok.messages.enums.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.battles.Team; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleTeamUser; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleTeamUserArmies; +import io.github.jwdeveloper.tiktok.api.messages.enums.BattleAction; +import io.github.jwdeveloper.tiktok.api.messages.enums.BattleType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattle; import lombok.Getter; import java.util.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleItemCard.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleItemCard.java new file mode 100644 index 00000000..231f8964 --- /dev/null +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicBattleItemCard.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023-2024 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "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.api.data.events; + +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattleItemCard; +import lombok.Getter; + +@Getter +@EventMeta(eventType = EventType.Message) +public class TikTokLinkMicBattleItemCard extends TikTokHeaderEvent { + + public TikTokLinkMicBattleItemCard(WebcastLinkMicBattleItemCard msg) { + super(msg.getCommon()); + } +} \ No newline at end of file diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicFanTicketEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicFanTicketEvent.java index c37b76c9..6bc069c5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicFanTicketEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicFanTicketEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicFanTicketMethod; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicFanTicketMethod; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicMethodEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicMethodEvent.java index 36e1ad4e..c3ef52b9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicMethodEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLinkMicMethodEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicMethod; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicMethod; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveEndedEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveEndedEvent.java index d8f069c7..7a9e7e0b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveEndedEvent.java @@ -20,11 +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.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent; +package io.github.jwdeveloper.tiktok.api.data.events; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; @EventMeta(eventType = EventType.Message) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLivePausedEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLivePausedEvent.java index 96717e0a..c92ad5cd 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; @EventMeta(eventType = EventType.Message) public class TikTokLivePausedEvent extends TikTokEvent { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveUnpausedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveUnpausedEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveUnpausedEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveUnpausedEvent.java index f9b150c5..c6532f42 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveUnpausedEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokLiveUnpausedEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; @EventMeta(eventType = EventType.Message) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokQuestionEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokQuestionEvent.java index ac13de10..3f61e583 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokQuestionEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastQuestionNewMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastQuestionNewMessage; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankTextEvent.java similarity index 79% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankTextEvent.java index 953f65dc..b3c2d89c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankTextEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankTextEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Text; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRankTextMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Text; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRankTextMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankUpdateEvent.java similarity index 77% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankUpdateEvent.java index 5c4cd383..5ddc86dc 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokRankUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokRankUpdateEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastHourlyRankMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRankUpdateMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastHourlyRankMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRankUpdateMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokReconnectingEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokReconnectingEvent.java index aa6729db..a1d40651 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokShopEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokShopEvent.java index 3135de0a..49860c9e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokShopEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokShopEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastOecLiveShoppingMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastOecLiveShoppingMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubNotifyEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubNotifyEvent.java index d84def55..b15664b0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubNotifyEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubNotifyEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSubNotifyMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSubNotifyMessage; import lombok.Value; @Value diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubscribeEvent.java similarity index 75% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubscribeEvent.java index 16ef5c95..8fb41504 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokSubscribeEvent.java @@ -20,15 +20,15 @@ * 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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.data.models.users.UserAttribute; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSubNotifyMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.models.users.UserAttribute; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMemberMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSubNotifyMessage; import lombok.Getter; @@ -52,7 +52,7 @@ public TikTokSubscribeEvent(WebcastSubNotifyMessage msg) { public static TikTokSubscribeEvent of(String userName) { return new TikTokSubscribeEvent(WebcastMemberMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(userName) .setNickname(userName) .build()) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnauthorizedMemberEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnauthorizedMemberEvent.java index 4363a18a..04c6ff8d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnauthorizedMemberEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnauthorizedMemberEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastUnauthorizedMemberMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastUnauthorizedMemberMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledControlEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledControlEvent.java index 9dc583a6..e770b79e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledControlEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledControlEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastControlMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastControlMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledMemberEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledMemberEvent.java index 75edc83e..1dbd8c58 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledMemberEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMemberMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledSocialEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledSocialEvent.java index 2c62e51d..62fa98bf 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledSocialEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/TikTokUnhandledSocialEvent.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.data.events; +package io.github.jwdeveloper.tiktok.api.data.events; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEmptyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEmptyEvent.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEmptyEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEmptyEvent.java index e7aa6f72..726eff04 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEmptyEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEmptyEvent.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.data.events.common; +package io.github.jwdeveloper.tiktok.api.data.events.common; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEvent.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEvent.java index 11c55243..a511a40f 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokEvent.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.data.events.common; +package io.github.jwdeveloper.tiktok.api.data.events.common; -import io.github.jwdeveloper.tiktok.utils.JsonUtil; +import io.github.jwdeveloper.tiktok.api.utils.JsonUtil; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokHeaderEvent.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokHeaderEvent.java index 23c5b1c2..f2edc0f9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokHeaderEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokHeaderEvent.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.data.events.common; +package io.github.jwdeveloper.tiktok.api.data.events.common; -import io.github.jwdeveloper.tiktok.messages.data.*; +import io.github.jwdeveloper.tiktok.api.messages.data.CommonMessageData; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokLiveClientEvent.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokLiveClientEvent.java index f33bc52e..35b66e08 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokLiveClientEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokLiveClientEvent.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.data.events.common; +package io.github.jwdeveloper.tiktok.api.data.events.common; public class TikTokLiveClientEvent extends TikTokEvent { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokUnhandledEvent.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokUnhandledEvent.java index c11bb56e..063c1e3c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokUnhandledEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/common/TikTokUnhandledEvent.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.data.events.common; +package io.github.jwdeveloper.tiktok.api.data.events.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokConnectingEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokConnectingEvent.java similarity index 84% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokConnectingEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokConnectingEvent.java index e98c040a..54d49e03 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokConnectingEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokConnectingEvent.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.data.events.control; +package io.github.jwdeveloper.tiktok.api.data.events.control; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokPreConnectionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokPreConnectionEvent.java similarity index 79% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokPreConnectionEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokPreConnectionEvent.java index 3d37607f..2bbf6009 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokPreConnectionEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/control/TikTokPreConnectionEvent.java @@ -20,11 +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.data.events.control; +package io.github.jwdeveloper.tiktok.api.data.events.control; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent; -import io.github.jwdeveloper.tiktok.data.requests.*; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.data.requests.*; import lombok.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/envelop/TikTokChestEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/envelop/TikTokChestEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/envelop/TikTokChestEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/envelop/TikTokChestEvent.java index 203ad5b3..d1ab3bf2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/envelop/TikTokChestEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/envelop/TikTokChestEvent.java @@ -20,16 +20,16 @@ * 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.data.events.envelop; +package io.github.jwdeveloper.tiktok.api.data.events.envelop; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Text; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Text; -import io.github.jwdeveloper.tiktok.data.models.chest.Chest; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage; +import io.github.jwdeveloper.tiktok.api.data.models.chest.Chest; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEnvelopeMessage; import lombok.Value; import java.util.Date; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftComboEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftComboEvent.java index acf54bcb..59ea2998 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftComboEvent.java @@ -20,13 +20,16 @@ * 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.data.events.gift; +package io.github.jwdeveloper.tiktok.api.data.events.gift; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.gifts.*; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.GiftComboStateType; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.*; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGiftMessage; import lombok.Getter; @EventMeta(eventType = EventType.Message) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftEvent.java index ce71f903..440334be 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/gift/TikTokGiftEvent.java @@ -20,14 +20,16 @@ * 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.data.events.gift; +package io.github.jwdeveloper.tiktok.api.data.events.gift; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.gifts.*; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.*; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGiftMessage; import lombok.Getter; @EventMeta(eventType = EventType.Message) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/http/TikTokHttpResponseEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/http/TikTokHttpResponseEvent.java index 73763099..0633990d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/http/TikTokHttpResponseEvent.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.data.events.http; +package io.github.jwdeveloper.tiktok.api.data.events.http; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.models.http.HttpData; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.models.http.HttpData; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkAcceptNoticeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkAcceptNoticeEvent.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkAcceptNoticeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkAcceptNoticeEvent.java index 2a822406..b83e33da 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkAcceptNoticeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkAcceptNoticeEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkApplyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkApplyEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkApplyEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkApplyEvent.java index f064a5bb..ecf5d08d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkApplyEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkApplyEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCancelEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCancelEvent.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCancelEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCancelEvent.java index acdaef1a..323d1a06 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCancelEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCancelEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCloseEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCloseEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCloseEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCloseEvent.java index e3f39e4c..2576c3bb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCloseEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCloseEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCohostListChangeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCohostListChangeEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCohostListChangeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCohostListChangeEvent.java index 3ba48c9f..05784442 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCohostListChangeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCohostListChangeEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCreateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCreateEvent.java similarity index 86% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCreateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCreateEvent.java index ab8343bd..8c1570b2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkCreateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkCreateEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEnterEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEnterEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEnterEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEnterEvent.java index 6c8150ba..2cf56db5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEnterEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEnterEvent.java @@ -20,12 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.users.ListUser; -import io.github.jwdeveloper.tiktok.messages.enums.LinkmicMultiLiveEnum; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.users.ListUser; +import io.github.jwdeveloper.tiktok.api.messages.enums.LinkmicMultiLiveEnum; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEvent.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEvent.java index de69976b..8e32e08e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkInviteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkInviteEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkInviteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkInviteEvent.java index d6025f20..d5386fa0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkInviteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkInviteEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkKickOutEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkKickOutEvent.java similarity index 88% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkKickOutEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkKickOutEvent.java index 7c738758..c68a431a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkKickOutEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkKickOutEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLeaveEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLeaveEvent.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLeaveEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLeaveEvent.java index 2279eda1..9c600a12 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLeaveEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLeaveEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLinkedListChangeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLinkedListChangeEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLinkedListChangeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLinkedListChangeEvent.java index c5d1fb57..42c5c99d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkLinkedListChangeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkLinkedListChangeEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkListChangeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkListChangeEvent.java similarity index 83% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkListChangeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkListChangeEvent.java index 577d2e2b..d81b42a4 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkListChangeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkListChangeEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.users.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.users.ListUser; +import io.github.jwdeveloper.tiktok.api.data.models.users.*; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMediaChangeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMediaChangeEvent.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMediaChangeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMediaChangeEvent.java index be1a7a67..728a589e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMediaChangeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMediaChangeEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.enums.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.enums.GuestMicCameraChangeScene; +import io.github.jwdeveloper.tiktok.api.messages.enums.GuestMicCameraManageOp; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMicIdxUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMicIdxUpdateEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMicIdxUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMicIdxUpdateEvent.java index 9212e991..aeeb05dc 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMicIdxUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMicIdxUpdateEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMuteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMuteEvent.java similarity index 84% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMuteEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMuteEvent.java index 5e1f617e..ca63230e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkMuteEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkMuteEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.enums.MuteStatus; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.enums.MuteStatus; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkRandomMatchEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkRandomMatchEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkRandomMatchEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkRandomMatchEvent.java index 51237d3b..5e2260ed 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkRandomMatchEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkRandomMatchEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkReplyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkReplyEvent.java similarity index 84% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkReplyEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkReplyEvent.java index 970a985a..f249c646 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkReplyEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkReplyEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkSysKickOutEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkSysKickOutEvent.java similarity index 86% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkSysKickOutEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkSysKickOutEvent.java index 45a95b5d..bab13025 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkSysKickOutEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkSysKickOutEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserEvent.java similarity index 86% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserEvent.java index 655edc9c..118be76c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserSettingEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserSettingEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserSettingEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserSettingEvent.java index 22b7e4b7..c7cff5af 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUpdateUserSettingEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUpdateUserSettingEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUserToastEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUserToastEvent.java similarity index 84% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUserToastEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUserToastEvent.java index 3326f798..f7bafbd6 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkUserToastEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkUserToastEvent.java @@ -20,11 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.models.Text; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.Text; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkWaitListChangeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkWaitListChangeEvent.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkWaitListChangeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkWaitListChangeEvent.java index 38db8e20..38105363 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkWaitListChangeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/link/TikTokLinkWaitListChangeEvent.java @@ -20,10 +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.data.events.link; +package io.github.jwdeveloper.tiktok.api.data.events.link; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEndEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEndEvent.java index 0a2793d4..f1c16f51 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEndEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEndEvent.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.data.events.poll; +package io.github.jwdeveloper.tiktok.api.data.events.poll; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -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 io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.PollOption; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEvent.java similarity index 80% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEvent.java index 749ee630..b2f16cb8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollEvent.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.data.events.poll; +package io.github.jwdeveloper.tiktok.api.data.events.poll; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollStartEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollStartEvent.java index 05e2bf0e..2c4fdfb3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollStartEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollStartEvent.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.data.events.poll; +package io.github.jwdeveloper.tiktok.api.data.events.poll; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -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 io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.PollOption; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollUpdateEvent.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollUpdateEvent.java index d3d74a83..fcd057e8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/poll/TikTokPollUpdateEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/poll/TikTokPollUpdateEvent.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.data.events.poll; +package io.github.jwdeveloper.tiktok.api.data.events.poll; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.models.PollOption; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPollMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.models.PollOption; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; import lombok.Getter; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomInfoEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomInfoEvent.java index b832dd7e..89d4b06b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomInfoEvent.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.data.events.room; +package io.github.jwdeveloper.tiktok.api.data.events.room; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomPinEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomPinEvent.java index d80a4cc9..606b98a9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomPinEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/room/TikTokRoomPinEvent.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.data.events.room; +package io.github.jwdeveloper.tiktok.api.data.events.room; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomPinMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomPinMessage; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokFollowEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokFollowEvent.java index c7cf7ae1..9115aab3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokFollowEvent.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.data.events.social; +package io.github.jwdeveloper.tiktok.api.data.events.social; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; import lombok.Value; @@ -44,7 +44,7 @@ public TikTokFollowEvent(WebcastSocialMessage msg) { public static TikTokFollowEvent of(String userName) { return new TikTokFollowEvent(WebcastSocialMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(userName) .setNickname(userName) .build()) @@ -53,7 +53,7 @@ public static TikTokFollowEvent of(String userName) { public static TikTokFollowEvent of(User user) { return new TikTokFollowEvent(WebcastSocialMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(user.getName()) .setNickname(user.getProfileName() != null ? user.getProfileName() : user.getName()) .setId(user.getId()) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokJoinEvent.java similarity index 77% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokJoinEvent.java index 44181a4f..715a00e3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokJoinEvent.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.data.events.social; +package io.github.jwdeveloper.tiktok.api.data.events.social; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMemberMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; import lombok.Getter; @Getter @@ -50,7 +50,7 @@ public TikTokJoinEvent(WebcastMemberMessage msg) { public static TikTokJoinEvent of(String userName) { return new TikTokJoinEvent(WebcastMemberMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(userName) .setNickname(userName) .build()) @@ -59,7 +59,7 @@ public static TikTokJoinEvent of(String userName) { public static TikTokJoinEvent of(User user) { return new TikTokJoinEvent(WebcastMemberMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(user.getName()) .setNickname(user.getProfileName()) .setId(user.getId()) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokLikeEvent.java similarity index 78% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokLikeEvent.java index 564f20aa..cf26a912 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokLikeEvent.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.data.events.social; +package io.github.jwdeveloper.tiktok.api.data.events.social; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLikeMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; import lombok.Getter; @@ -60,7 +60,7 @@ public static TikTokLikeEvent of(String userName, int likes) { return new TikTokLikeEvent(WebcastLikeMessage.newBuilder() .setCount(likes) .setTotal(likes) - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(userName) .setNickname(userName) .build()) @@ -71,7 +71,7 @@ public static TikTokLikeEvent of(User user, int likes) { return new TikTokLikeEvent(WebcastLikeMessage.newBuilder() .setCount(likes) .setTotal(likes) - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(user.getName()) .setNickname(user.getProfileName()) .build()) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokShareEvent.java similarity index 79% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokShareEvent.java index b6a54b33..90d55767 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/social/TikTokShareEvent.java @@ -20,12 +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.data.events.social; +package io.github.jwdeveloper.tiktok.api.data.events.social; -import io.github.jwdeveloper.tiktok.annotations.*; -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 io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; import lombok.Getter; @@ -49,7 +50,7 @@ public TikTokShareEvent(WebcastSocialMessage msg) { public static TikTokShareEvent of(String userName, int shaders) { return new TikTokShareEvent(WebcastSocialMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(userName) .setNickname(userName) .build()) @@ -58,7 +59,7 @@ public static TikTokShareEvent of(String userName, int shaders) { public static TikTokShareEvent of(User user, int shaders) { return new TikTokShareEvent(WebcastSocialMessage.newBuilder() - .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder() + .setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder() .setUsername(user.getName()) .setNickname(user.getProfileName()) .build()) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketMessageEvent.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketMessageEvent.java index 653ca85d..9ba8bc93 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketMessageEvent.java @@ -20,12 +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.data.events.websocket; +package io.github.jwdeveloper.tiktok.api.data.events.websocket; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.dto.MessageMetaData; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import lombok.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketResponseEvent.java similarity index 79% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketResponseEvent.java index 559415ea..0fc90308 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketResponseEvent.java @@ -20,11 +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.data.events.websocket; +package io.github.jwdeveloper.tiktok.api.data.events.websocket; -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import lombok.*; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java similarity index 81% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java index 4663320b..7eff0c8a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.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.data.events.websocket; +package io.github.jwdeveloper.tiktok.api.data.events.websocket; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokUnhandledEvent; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Emote.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Emote.java index 27eda4f5..bcc97dc2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Emote.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Emote.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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; import lombok.Value; @@ -29,7 +29,7 @@ public class Emote { String emoteId; Picture picture; - public static Emote map(io.github.jwdeveloper.tiktok.messages.data.Emote input) { + public static Emote map(io.github.jwdeveloper.tiktok.api.messages.data.Emote input) { return new Emote(input.getEmoteId(), Picture.map(input.getImage())); } diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/LinkMicArmy.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/LinkMicArmy.java index 0e0c63d1..ccfe6a55 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicArmy.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/LinkMicArmy.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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.data.BattleUserArmies; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleUserArmies; import lombok.Value; import java.util.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Picture.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Picture.java index 2988f108..0fd195bb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Picture.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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; import lombok.Getter; import javax.imageio.ImageIO; @@ -44,7 +44,7 @@ public Picture(String link) { this.link = link; } - public static Picture map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) { + public static Picture map(io.github.jwdeveloper.tiktok.api.messages.data.Image profilePicture) { var index = profilePicture.getUrlCount() - 1; if (index < 0) { return new Picture(""); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/PollOption.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/PollOption.java index 0ad0da0e..f0f658f0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/PollOption.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/PollOption.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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.data.PollOptionInfo; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.data.PollOptionInfo; import lombok.Value; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/RankingUser.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/RankingUser.java index 1368e738..58100fe0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/RankingUser.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; -import io.github.jwdeveloper.tiktok.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; import lombok.Value; @Value @@ -31,7 +31,7 @@ public class RankingUser { User user; int score; - public RankingUser(io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage.Contributor viewer) { + public RankingUser(io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomUserSeqMessage.Contributor viewer) { rank = viewer.getRank(); user = User.map(viewer.getUser()); score = viewer.getScore(); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Text.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Text.java index ed36c91a..39ba75b3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Text.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/Text.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.data.models; +package io.github.jwdeveloper.tiktok.api.data.models; -import io.github.jwdeveloper.tiktok.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Value; @@ -52,13 +52,13 @@ public Optional getTextPiece(Class type) return textPieces.stream().filter(e -> e.getClass().equals(type)).findFirst(); } - public static Text map(io.github.jwdeveloper.tiktok.messages.data.Text input) { + public static Text map(io.github.jwdeveloper.tiktok.api.messages.data.Text input) { var pieces = input.getPiecesListList().stream().map(Text::mapTextPiece).toList(); return new Text(input.getKey(), input.getDefaultPattern(), pieces); } - public static TextPiece mapTextPiece(io.github.jwdeveloper.tiktok.messages.data.Text.TextPiece input) { + public static TextPiece mapTextPiece(io.github.jwdeveloper.tiktok.api.messages.data.Text.TextPiece input) { return switch (input.getType()) { case 11 -> { var user = User.map(input.getUserValue().getUser()); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/Badge.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/Badge.java index 496cb586..41f3c04b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/Badge.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.data.models.badges; +package io.github.jwdeveloper.tiktok.api.data.models.badges; public class Badge { - public static Badge map(io.github.jwdeveloper.tiktok.messages.data.BadgeStruct badge) { + public static Badge map(io.github.jwdeveloper.tiktok.api.messages.data.BadgeStruct badge) { return switch (badge.getBadgeDisplayType()) { case BADGEDISPLAYTYPE_TEXT -> new TextBadge(badge.getText()); case BADGEDISPLAYTYPE_IMAGE -> new PictureBadge(badge.getImage()); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/CombineBadge.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/CombineBadge.java index 087ebf69..4a0d3452 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/CombineBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/CombineBadge.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.data.models.badges; +package io.github.jwdeveloper.tiktok.api.data.models.badges; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.messages.data.BadgeStruct; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/PictureBadge.java similarity index 88% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/PictureBadge.java index 9e1abae4..388d3ef8 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/PictureBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/PictureBadge.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.data.models.badges; +package io.github.jwdeveloper.tiktok.api.data.models.badges; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.messages.data.BadgeStruct; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/StringBadge.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/StringBadge.java index ae2766db..81401f97 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/StringBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/StringBadge.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.data.models.badges; +package io.github.jwdeveloper.tiktok.api.data.models.badges; -import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; +import io.github.jwdeveloper.tiktok.api.messages.data.BadgeStruct; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/TextBadge.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/TextBadge.java index da53472e..d2091bbb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/TextBadge.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/badges/TextBadge.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.data.models.badges; +package io.github.jwdeveloper.tiktok.api.data.models.badges; -import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct; +import io.github.jwdeveloper.tiktok.api.messages.data.BadgeStruct; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/BarrageParam.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/BarrageParam.java index c853f237..bc47c9dc 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/BarrageParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/BarrageParam.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.data.models.barrage; +package io.github.jwdeveloper.tiktok.api.data.models.barrage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; public class BarrageParam { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/FansLevelParam.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/FansLevelParam.java index 29fb411a..ea4f6cbe 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/FansLevelParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/FansLevelParam.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.data.models.barrage; +package io.github.jwdeveloper.tiktok.api.data.models.barrage; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; public class FansLevelParam extends BarrageParam { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/SubscribeGiftParam.java similarity index 90% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/SubscribeGiftParam.java index c4e9766e..3233171a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/SubscribeGiftParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/SubscribeGiftParam.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.data.models.barrage; +package io.github.jwdeveloper.tiktok.api.data.models.barrage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; public class SubscribeGiftParam extends BarrageParam { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/UserGradeParam.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/UserGradeParam.java index ec1320d4..3ed2a184 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/barrage/UserGradeParam.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/barrage/UserGradeParam.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.data.models.barrage; +package io.github.jwdeveloper.tiktok.api.data.models.barrage; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; public class UserGradeParam extends BarrageParam { int currentGrade; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/battles/Team.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/battles/Team.java index 35fa9b90..7d9875a2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/battles/Team.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/battles/Team.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.data.models.battles; +package io.github.jwdeveloper.tiktok.api.data.models.battles; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.messages.data.BattleUserInfo; -import io.github.jwdeveloper.tiktok.messages.enums.BattleType; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleUserInfo; +import io.github.jwdeveloper.tiktok.api.messages.enums.BattleType; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattle; import lombok.Data; import java.util.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/chest/Chest.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/chest/Chest.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/chest/Chest.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/chest/Chest.java index 968cc7fc..ca921356 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/chest/Chest.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/chest/Chest.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.data.models.chest; +package io.github.jwdeveloper.tiktok.api.data.models.chest; import lombok.AllArgsConstructor; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/Gift.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/Gift.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/Gift.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/Gift.java index 7cfd999d..a49cd04d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/Gift.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/Gift.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.data.models.gifts; +package io.github.jwdeveloper.tiktok.api.data.models.gifts; import com.google.gson.JsonObject; -import io.github.jwdeveloper.tiktok.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; import lombok.Data; @Data diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/GiftComboStateType.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/GiftComboStateType.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/GiftComboStateType.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/GiftComboStateType.java index bc81cadc..0f44dc5b 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/gifts/GiftComboStateType.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/gifts/GiftComboStateType.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.data.models.gifts; +package io.github.jwdeveloper.tiktok.api.data.models.gifts; public enum GiftComboStateType { Begin, diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/http/HttpData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/http/HttpData.java similarity index 98% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/http/HttpData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/http/HttpData.java index e9a5799b..2525a314 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/http/HttpData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/http/HttpData.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.data.models.http; +package io.github.jwdeveloper.tiktok.api.data.models.http; import lombok.Data; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/ListUser.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/ListUser.java similarity index 82% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/ListUser.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/ListUser.java index 2e19eaa8..3453af65 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/ListUser.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/ListUser.java @@ -20,9 +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.data.models.users; +package io.github.jwdeveloper.tiktok.api.data.models.users; -import io.github.jwdeveloper.tiktok.messages.enums.*; +import io.github.jwdeveloper.tiktok.api.messages.enums.LinkRoleType; +import io.github.jwdeveloper.tiktok.api.messages.enums.LinkSilenceStatus; +import io.github.jwdeveloper.tiktok.api.messages.enums.LinkType; +import io.github.jwdeveloper.tiktok.api.messages.enums.LinkmicRoleType; import lombok.Getter; @Getter @@ -38,7 +41,7 @@ public class ListUser private final LinkSilenceStatus silenceStatus; private final LinkRoleType roleType; - public ListUser(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) { + public ListUser(io.github.jwdeveloper.tiktok.api.messages.data.ListUser listUser) { this.user = User.map(listUser.getUser()); this.linkMicId = listUser.getLinkmicId(); this.linkStatus = listUser.getLinkStatus(); @@ -50,7 +53,7 @@ public ListUser(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) { this.roleType = listUser.getRoleType(); } - public static ListUser map(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) { + public static ListUser map(io.github.jwdeveloper.tiktok.api.messages.data.ListUser listUser) { return new ListUser(listUser); } diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/User.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/User.java index 7dd2346a..5d8987e4 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/User.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/User.java @@ -20,12 +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.data.models.users; +package io.github.jwdeveloper.tiktok.api.data.models.users; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.badges.Badge; -import io.github.jwdeveloper.tiktok.messages.data.*; -import io.github.jwdeveloper.tiktok.messages.webcast.*; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.badges.Badge; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleUserArmy; +import io.github.jwdeveloper.tiktok.api.messages.data.BattleUserInfo; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEnvelopeMessage; import lombok.*; import java.util.*; @@ -148,7 +149,7 @@ public User(BattleUserArmy topViewer) { this(topViewer.getUserId(), topViewer.getNickname(), Picture.map(topViewer.getAvatarThumb())); } - public User(io.github.jwdeveloper.tiktok.messages.data.User user) { + public User(io.github.jwdeveloper.tiktok.api.messages.data.User user) { this(user.getId(), user.getUsername(), Picture.map(user.getAvatarThumb())); signature = user.getBioDescription(); profileName = user.getNickname(); @@ -179,12 +180,12 @@ public User(io.github.jwdeveloper.tiktok.messages.data.User user) { 0, List.of(Badge.empty())); - public static User map(io.github.jwdeveloper.tiktok.messages.data.User user) { + public static User map(io.github.jwdeveloper.tiktok.api.messages.data.User user) { return new User(user); } - public static User map(io.github.jwdeveloper.tiktok.messages.data.User user, - io.github.jwdeveloper.tiktok.messages.data.UserIdentity userIdentity) { + public static User map(io.github.jwdeveloper.tiktok.api.messages.data.User user, + io.github.jwdeveloper.tiktok.api.messages.data.UserIdentity userIdentity) { var outUser = map(user); if (userIdentity.getIsGiftGiverOfAnchor()) { @@ -208,7 +209,7 @@ public static User map(io.github.jwdeveloper.tiktok.messages.data.User user, return outUser; } - public static User map(io.github.jwdeveloper.tiktok.messages.data.VoteUser user) { + public static User map(io.github.jwdeveloper.tiktok.api.messages.data.VoteUser user) { return new User(user.getUserId(), user.getNickName()); } diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/UserAttribute.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/models/users/UserAttribute.java index 0b23e12f..a3535dd1 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/UserAttribute.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.data.models.users; +package io.github.jwdeveloper.tiktok.api.data.models.users; public enum UserAttribute { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/GiftsData.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/GiftsData.java index 35f367dd..ff10d490 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/GiftsData.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.data.requests; +package io.github.jwdeveloper.tiktok.api.data.requests; -import io.github.jwdeveloper.tiktok.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; import lombok.*; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveConnectionData.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveConnectionData.java index 48acd58b..dd8f8fa1 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveConnectionData.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.data.requests; +package io.github.jwdeveloper.tiktok.api.data.requests; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import lombok.*; import java.net.URI; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveData.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveData.java index 4acfe4f2..8d9d3400 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveData.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.data.requests; +package io.github.jwdeveloper.tiktok.api.data.requests; -import io.github.jwdeveloper.tiktok.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveUserData.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveUserData.java index 1da30452..030b752d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/requests/LiveUserData.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.data.requests; +package io.github.jwdeveloper.tiktok.api.data.requests; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; import lombok.*; public class LiveUserData { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/HttpClientSettings.java similarity index 98% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/HttpClientSettings.java index 8af3eebd..2cca91e7 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/HttpClientSettings.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/HttpClientSettings.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.data.settings; +package io.github.jwdeveloper.tiktok.api.data.settings; import lombok.Getter; import lombok.Setter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/LiveClientSettings.java similarity index 99% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/LiveClientSettings.java index 94e58c9b..1e0f6f12 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/LiveClientSettings.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.data.settings; +package io.github.jwdeveloper.tiktok.api.data.settings; import lombok.Data; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/ProxyClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/ProxyClientSettings.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/ProxyClientSettings.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/ProxyClientSettings.java index 71e198cc..b56dc804 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/ProxyClientSettings.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/data/settings/ProxyClientSettings.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.data.settings; +package io.github.jwdeveloper.tiktok.api.data.settings; -import io.github.jwdeveloper.tiktok.data.dto.ProxyData; +import io.github.jwdeveloper.tiktok.api.data.dto.ProxyData; import lombok.*; import java.net.*; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokEventListenerMethodException.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokEventListenerMethodException.java index 046a6513..8b250783 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokEventListenerMethodException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; public class TikTokEventListenerMethodException extends TikTokLiveException { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveException.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveException.java index fdcf88ee..430d938d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; public class TikTokLiveException extends RuntimeException { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveMessageException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveMessageException.java similarity index 94% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveMessageException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveMessageException.java index a4f7aab7..1bfc23eb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveMessageException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveMessageException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import lombok.Getter; import java.util.Base64; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveOfflineHostException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveOfflineHostException.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveOfflineHostException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveOfflineHostException.java index 4085170d..e5943a82 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveOfflineHostException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveOfflineHostException.java @@ -20,9 +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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; -import io.github.jwdeveloper.tiktok.data.requests.*; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLivePreConnectionException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLivePreConnectionException.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLivePreConnectionException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLivePreConnectionException.java index 1a04e1d4..360f43e5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLivePreConnectionException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLivePreConnectionException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveRequestException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveRequestException.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveRequestException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveRequestException.java index c2c0db00..1aa77d9e 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveRequestException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveRequestException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveUnknownHostException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveUnknownHostException.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveUnknownHostException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveUnknownHostException.java index 9ad30b57..5890cea3 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveUnknownHostException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokLiveUnknownHostException.java @@ -20,9 +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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; -import io.github.jwdeveloper.tiktok.data.requests.*; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; import lombok.Getter; @Getter diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokMessageMappingException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokMessageMappingException.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokMessageMappingException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokMessageMappingException.java index fc5ce32a..68a15de4 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokMessageMappingException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokMessageMappingException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; /** diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProtocolBufferException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProtocolBufferException.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProtocolBufferException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProtocolBufferException.java index 497ad0b1..fce74913 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProtocolBufferException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProtocolBufferException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProxyRequestException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProxyRequestException.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProxyRequestException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProxyRequestException.java index 9a614d71..634390e9 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokProxyRequestException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokProxyRequestException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; /* diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokSignServerException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokSignServerException.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokSignServerException.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokSignServerException.java index 671d70ab..9ac936c0 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokSignServerException.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/exceptions/TikTokSignServerException.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.exceptions; +package io.github.jwdeveloper.tiktok.api.exceptions; public class TikTokSignServerException extends TikTokLiveRequestException { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/http/LiveHttpClient.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/http/LiveHttpClient.java index 21cee11f..09a6730f 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/http/LiveHttpClient.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.http; +package io.github.jwdeveloper.tiktok.api.http; -import io.github.jwdeveloper.tiktok.data.requests.GiftsData; -import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; -import io.github.jwdeveloper.tiktok.data.requests.LiveData; -import io.github.jwdeveloper.tiktok.data.requests.LiveUserData; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.data.requests.GiftsData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; public interface LiveHttpClient { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/ListenersManager.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/ListenersManager.java index e8e9a902..a415744c 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/ListenersManager.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.listener; +package io.github.jwdeveloper.tiktok.api.listener; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListenerBase.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/TikTokEventListenerBase.java similarity index 54% rename from API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListenerBase.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/TikTokEventListenerBase.java index ed59959c..47ed722a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListenerBase.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/listener/TikTokEventListenerBase.java @@ -20,20 +20,78 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.jwdeveloper.tiktok.listener; - -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent; -import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.*; -import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent; -import io.github.jwdeveloper.tiktok.data.events.link.*; -import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent; -import io.github.jwdeveloper.tiktok.data.events.room.*; -import io.github.jwdeveloper.tiktok.data.events.social.*; -import io.github.jwdeveloper.tiktok.data.events.websocket.*; -import io.github.jwdeveloper.tiktok.live.LiveClient; +package io.github.jwdeveloper.tiktok.api.listener; + +import io.github.jwdeveloper.tiktok.api.data.events.TikTokBarrageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCaptionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDetectEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokEmoteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokEnvelopeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokGoalUpdateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokIMDeleteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokInRoomBannerEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkLayerEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicArmiesEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicBattleEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicFanTicketEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicMethodEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveEndedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLivePausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveUnpausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokQuestionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokRankTextEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokRankUpdateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokReconnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokShopEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubNotifyEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubscribeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnauthorizedMemberEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledControlEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledMemberEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledSocialEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftComboEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkAcceptNoticeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCancelEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCloseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCohostListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCreateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkEnterEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkInviteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkKickOutEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkLeaveEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkLinkedListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMediaChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMicIdxUpdateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMuteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkRandomMatchEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkReplyEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkSysKickOutEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUpdateUserEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUpdateUserSettingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUserToastEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkWaitListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomPinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.envelop.TikTokChestEvent; +import io.github.jwdeveloper.tiktok.api.data.events.http.TikTokHttpResponseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.poll.TikTokPollEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; public abstract class TikTokEventListenerBase { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftsManager.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/GiftsManager.java similarity index 95% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftsManager.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/GiftsManager.java index 166d69a2..c1dc7c47 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/GiftsManager.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/GiftsManager.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.live; +package io.github.jwdeveloper.tiktok.api.live; -import io.github.jwdeveloper.tiktok.data.models.gifts.*; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; import java.util.List; import java.util.Map; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveClient.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveClient.java index 18f9fa9b..8e6f93e6 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveClient.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.live; +package io.github.jwdeveloper.tiktok.api.live; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.listener.ListenersManager; -import io.github.jwdeveloper.tiktok.websocket.LiveClientStopType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.listener.ListenersManager; +import io.github.jwdeveloper.tiktok.api.websocket.LiveClientStopType; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveEventsHandler.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveEventsHandler.java index be9af421..c74ec5ce 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveEventsHandler.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveEventsHandler.java @@ -20,13 +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.live; +package io.github.jwdeveloper.tiktok.api.live; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.builder.EventConsumer; - -import java.util.HashSet; -import java.util.Optional; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.builder.EventConsumer; public interface LiveEventsHandler { void publish(LiveClient tikTokLiveClient, TikTokEvent tikTokEvent); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveMessagesHandler.java similarity index 91% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveMessagesHandler.java index 8b2004bc..4ea8f485 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveMessagesHandler.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.live; +package io.github.jwdeveloper.tiktok.api.live; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; public interface LiveMessagesHandler { void handle(LiveClient client, ProtoMessageFetchResult webcastResponse); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveRoomInfo.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveRoomInfo.java similarity index 88% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveRoomInfo.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveRoomInfo.java index a3911fcf..5d9522bb 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveRoomInfo.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/LiveRoomInfo.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.live; +package io.github.jwdeveloper.tiktok.api.live; -import io.github.jwdeveloper.tiktok.data.models.RankingUser; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.models.ConnectionState; +import io.github.jwdeveloper.tiktok.api.data.models.RankingUser; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.models.ConnectionState; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventConsumer.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventConsumer.java similarity index 88% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventConsumer.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventConsumer.java index 01a53738..aecc00fd 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventConsumer.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventConsumer.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.live.builder; +package io.github.jwdeveloper.tiktok.api.live.builder; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; @FunctionalInterface public interface EventConsumer diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventsBuilder.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventsBuilder.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventsBuilder.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventsBuilder.java index e401bc1c..5ef3e7d5 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventsBuilder.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/EventsBuilder.java @@ -20,24 +20,34 @@ * 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.live.builder; - -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -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; -import io.github.jwdeveloper.tiktok.data.models.gifts.GiftComboStateType; +package io.github.jwdeveloper.tiktok.api.live.builder; + +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokEmoteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveEndedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLivePausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveUnpausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokQuestionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokReconnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubscribeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokConnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftComboEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.events.http.TikTokHttpResponseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.GiftComboStateType; public interface EventsBuilder { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/LiveClientBuilder.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/LiveClientBuilder.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/LiveClientBuilder.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/LiveClientBuilder.java index 9692330e..44ff6989 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/LiveClientBuilder.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/live/builder/LiveClientBuilder.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.live.builder; +package io.github.jwdeveloper.tiktok.api.live.builder; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.mappers.LiveMapper; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapper; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapper.java similarity index 89% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapper.java index 51b59a64..00cf68a6 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapper.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.mappers; +package io.github.jwdeveloper.tiktok.api.mappers; import com.google.protobuf.GeneratedMessage; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.mappers.data.MappingAction; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingAction; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; import java.util.List; import java.util.function.Function; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapperHelper.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapperHelper.java index 0c92c967..5ddde29a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/LiveMapperHelper.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.mappers; +package io.github.jwdeveloper.tiktok.api.mappers; import com.google.protobuf.GeneratedMessage; -import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; -import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokMessageMappingException; +import io.github.jwdeveloper.tiktok.api.utils.ProtoBufferObject; public interface LiveMapperHelper { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/TikTokMapperModel.java similarity index 85% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/TikTokMapperModel.java index d46b389d..3fba0ffa 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/TikTokMapperModel.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.mappers; +package io.github.jwdeveloper.tiktok.api.mappers; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.mappers.data.AfterMappingAction; -import io.github.jwdeveloper.tiktok.mappers.data.MappingAction; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.mappers.data.AfterMappingAction; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingAction; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; import java.util.List; import java.util.function.Function; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/AfterMappingAction.java similarity index 92% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/AfterMappingAction.java index 3571f34a..be6ce9ad 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/AfterMappingAction.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.mappers.data; +package io.github.jwdeveloper.tiktok.api.mappers.data; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; import java.util.List; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingAction.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingAction.java index be016d6d..4378ba17 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingAction.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.mappers.data; +package io.github.jwdeveloper.tiktok.api.mappers.data; -import io.github.jwdeveloper.tiktok.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; @FunctionalInterface public interface MappingAction { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingResult.java similarity index 93% rename from API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingResult.java index 8fc34d86..9af0b985 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/mappers/data/MappingResult.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.mappers.data; +package io.github.jwdeveloper.tiktok.api.mappers.data; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/models/ConnectionState.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/models/ConnectionState.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/models/ConnectionState.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/models/ConnectionState.java index db3f03e9..b3dc3e5a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/models/ConnectionState.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/models/ConnectionState.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.models; +package io.github.jwdeveloper.tiktok.api.models; public enum ConnectionState { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/models/SocialTypes.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/models/SocialTypes.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/models/SocialTypes.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/models/SocialTypes.java index 0ee89870..a3794e25 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/models/SocialTypes.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/models/SocialTypes.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.models; +package io.github.jwdeveloper.tiktok.api.models; public class SocialTypes { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ConsoleColors.java similarity index 99% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ConsoleColors.java index 14fc6083..249674a2 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ConsoleColors.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/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.utils; +package io.github.jwdeveloper.tiktok.api.utils; public class ConsoleColors { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/JsonUtil.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/JsonUtil.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/JsonUtil.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/JsonUtil.java index a2848549..7b0748b6 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/JsonUtil.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/JsonUtil.java @@ -20,15 +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.utils; +package io.github.jwdeveloper.tiktok.api.utils; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.GsonBuilder; -import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData; +import io.github.jwdeveloper.tiktok.api.data.dto.MessageMetaData; import java.awt.*; -import java.time.Duration; import java.util.ArrayList; public class JsonUtil { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferFileGenerator.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferFileGenerator.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferFileGenerator.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferFileGenerator.java index 4617ac32..cd74f77f 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferFileGenerator.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferFileGenerator.java @@ -20,10 +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.utils; +package io.github.jwdeveloper.tiktok.api.utils; -import java.nio.file.Path; -import java.util.Map; import java.util.TreeMap; public class ProtoBufferFileGenerator { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferJsonGenerator.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferJsonGenerator.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferJsonGenerator.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferJsonGenerator.java index 7a0feb4f..ef2870aa 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferJsonGenerator.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferJsonGenerator.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.utils; +package io.github.jwdeveloper.tiktok.api.utils; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferObject.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferObject.java similarity index 98% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferObject.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferObject.java index caba252f..4f66d610 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtoBufferObject.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtoBufferObject.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.utils; +package io.github.jwdeveloper.tiktok.api.utils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtocolUtils.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtocolUtils.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtocolUtils.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtocolUtils.java index d01f6700..8e2a7626 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtocolUtils.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/ProtocolUtils.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.utils; +package io.github.jwdeveloper.tiktok.api.utils; import com.google.protobuf.*; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import java.util.Base64; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/Stopwatch.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/Stopwatch.java similarity index 96% rename from API/src/main/java/io/github/jwdeveloper/tiktok/utils/Stopwatch.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/Stopwatch.java index bbb87762..7a650bac 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/utils/Stopwatch.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/utils/Stopwatch.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.utils; +package io.github.jwdeveloper.tiktok.api.utils; public class Stopwatch { private long startTime; diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveClientStopType.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveClientStopType.java similarity index 97% rename from API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveClientStopType.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveClientStopType.java index 0cb78b9e..e1b3883d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveClientStopType.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveClientStopType.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.websocket; +package io.github.jwdeveloper.tiktok.api.websocket; public enum LiveClientStopType { diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java b/API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveSocketClient.java similarity index 87% rename from API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java rename to API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveSocketClient.java index 9f09edfb..8c7ac29a 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/api/websocket/LiveSocketClient.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.websocket; +package io.github.jwdeveloper.tiktok.api.websocket; -import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; public interface LiveSocketClient { void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient); diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleItemCard.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleItemCard.java deleted file mode 100644 index a8258a67..00000000 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleItemCard.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.github.jwdeveloper.tiktok.data.events; - -import io.github.jwdeveloper.tiktok.annotations.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattleItemCard; -import lombok.Getter; - -@Getter -@EventMeta(eventType = EventType.Message) -public class TikTokLinkMicBattleItemCard extends TikTokHeaderEvent { - - public TikTokLinkMicBattleItemCard(WebcastLinkMicBattleItemCard msg) { - super(msg.getCommon()); - } -} \ No newline at end of file diff --git a/API/src/main/proto/data.proto b/API/src/main/proto/data.proto index 8a1b8b77..6bd17424 100644 --- a/API/src/main/proto/data.proto +++ b/API/src/main/proto/data.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package TikTok; -option java_package = "io.github.jwdeveloper.tiktok.messages.data"; +option java_package = "io.github.jwdeveloper.tiktok.api.messages.data"; option java_multiple_files = true; import "enums.proto"; diff --git a/API/src/main/proto/enums.proto b/API/src/main/proto/enums.proto index 51341e66..d2148be7 100644 --- a/API/src/main/proto/enums.proto +++ b/API/src/main/proto/enums.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package TikTok; -option java_package = "io.github.jwdeveloper.tiktok.messages.enums"; +option java_package = "io.github.jwdeveloper.tiktok.api.messages.enums"; option java_multiple_files = true; enum AuditStatus { diff --git a/API/src/main/proto/webcast.proto b/API/src/main/proto/webcast.proto index aa8f7f66..3238c9bb 100644 --- a/API/src/main/proto/webcast.proto +++ b/API/src/main/proto/webcast.proto @@ -7,7 +7,7 @@ package TikTok; import "data.proto"; import "enums.proto"; -option java_package = "io.github.jwdeveloper.tiktok.messages.webcast"; +option java_package = "io.github.jwdeveloper.tiktok.api.messages.webcast"; option java_multiple_files = true; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLive.java similarity index 93% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLive.java index e8490f64..008de701 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLive.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; +package io.github.jwdeveloper.tiktok.client; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.http.LiveHttpClient; -import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.http.LiveHttpClient; +import io.github.jwdeveloper.tiktok.api.live.builder.LiveClientBuilder; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClient.java similarity index 82% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClient.java index ac6acca3..9df38683 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClient.java @@ -20,23 +20,35 @@ * 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; +package io.github.jwdeveloper.tiktok.client; import com.google.protobuf.ByteString; -import io.github.jwdeveloper.tiktok.common.AsyncHandler; -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.control.*; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -import io.github.jwdeveloper.tiktok.data.requests.*; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.exceptions.*; -import io.github.jwdeveloper.tiktok.http.LiveHttpClient; -import io.github.jwdeveloper.tiktok.listener.ListenersManager; -import io.github.jwdeveloper.tiktok.live.*; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; -import io.github.jwdeveloper.tiktok.models.ConnectionState; -import io.github.jwdeveloper.tiktok.websocket.*; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokReconnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokConnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveOfflineHostException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLivePreConnectionException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveUnknownHostException; +import io.github.jwdeveloper.tiktok.api.live.GiftsManager; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.websocket.LiveClientStopType; +import io.github.jwdeveloper.tiktok.api.websocket.LiveSocketClient; +import io.github.jwdeveloper.tiktok.client.common.AsyncHandler; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.http.LiveHttpClient; +import io.github.jwdeveloper.tiktok.api.listener.ListenersManager; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.models.ConnectionState; import lombok.Getter; import java.util.Base64; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientBuilder.java similarity index 77% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientBuilder.java index 66aa9428..4c998e82 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientBuilder.java @@ -20,29 +20,41 @@ * 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; +package io.github.jwdeveloper.tiktok.client; import io.github.jwdeveloper.dependance.Dependance; import io.github.jwdeveloper.dependance.api.DependanceContainer; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; -import io.github.jwdeveloper.tiktok.mappers.MessagesMapperFactory; -import io.github.jwdeveloper.tiktok.common.LoggerFactory; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; -import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager; -import io.github.jwdeveloper.tiktok.http.HttpClientFactory; -import io.github.jwdeveloper.tiktok.http.LiveHttpClient; -import io.github.jwdeveloper.tiktok.listener.*; -import io.github.jwdeveloper.tiktok.live.*; -import io.github.jwdeveloper.tiktok.live.builder.*; -import io.github.jwdeveloper.tiktok.mappers.*; -import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokCommonEventHandler; -import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler; -import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler; -import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokSocialMediaEventHandler; -import io.github.jwdeveloper.tiktok.websocket.*; -import io.github.jwdeveloper.tiktok.websocket.euler.TikTokWebSocketEulerClient; +import io.github.jwdeveloper.tiktok.api.listener.ListenersManager; +import io.github.jwdeveloper.tiktok.api.live.GiftsManager; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.live.builder.EventConsumer; +import io.github.jwdeveloper.tiktok.api.live.builder.LiveClientBuilder; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapper; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.websocket.LiveSocketClient; +import io.github.jwdeveloper.tiktok.client.listener.TikTokListenersManager; +import io.github.jwdeveloper.tiktok.client.mappers.MessagesMapperFactory; +import io.github.jwdeveloper.tiktok.client.common.LoggerFactory; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.client.gifts.TikTokGiftsManager; +import io.github.jwdeveloper.tiktok.client.http.HttpClientFactory; +import io.github.jwdeveloper.tiktok.api.http.LiveHttpClient; +import io.github.jwdeveloper.tiktok.client.mappers.TikTokGenericEventMapper; +import io.github.jwdeveloper.tiktok.client.mappers.TikTokLiveMapperHelper; +import io.github.jwdeveloper.tiktok.client.websocket.TikTokWebSocketClient; +import io.github.jwdeveloper.tiktok.client.websocket.TikTokWebSocketOfflineClient; +import io.github.jwdeveloper.tiktok.client.websocket.WebSocketHeartbeatTask; +import io.github.jwdeveloper.tiktok.api.listener.*; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokCommonEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokGiftEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokRoomInfoEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokSocialMediaEventHandler; +import io.github.jwdeveloper.tiktok.client.websocket.euler.TikTokWebSocketEulerClient; import java.util.*; import java.util.concurrent.CompletableFuture; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveEventHandler.java similarity index 88% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveEventHandler.java index 3649d43d..2bbf5657 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveEventHandler.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; +package io.github.jwdeveloper.tiktok.client; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; -import io.github.jwdeveloper.tiktok.live.builder.EventConsumer; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.builder.EventConsumer; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; import java.util.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpClient.java similarity index 89% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpClient.java index a85c0bc1..a874b52e 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpClient.java @@ -20,19 +20,29 @@ * 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; +package io.github.jwdeveloper.tiktok.client; import com.google.gson.JsonObject; import com.google.protobuf.InvalidProtocolBufferException; import io.github.jwdeveloper.dependance.injector.api.annotations.Inject; -import io.github.jwdeveloper.tiktok.common.*; -import io.github.jwdeveloper.tiktok.data.requests.*; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.exceptions.*; -import io.github.jwdeveloper.tiktok.http.*; -import io.github.jwdeveloper.tiktok.http.mappers.*; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.data.requests.GiftsData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokProxyRequestException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokSignServerException; +import io.github.jwdeveloper.tiktok.api.http.LiveHttpClient; +import io.github.jwdeveloper.tiktok.client.common.ActionResult; +import io.github.jwdeveloper.tiktok.client.common.LoggerFactory; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.client.http.HttpClientBuilder; +import io.github.jwdeveloper.tiktok.client.http.HttpClientFactory; +import io.github.jwdeveloper.tiktok.client.http.mappers.GiftsDataMapper; +import io.github.jwdeveloper.tiktok.client.http.mappers.LiveDataMapper; +import io.github.jwdeveloper.tiktok.client.http.mappers.LiveUserDataMapper; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import java.net.http.*; import java.util.function.Consumer; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpOfflineClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpOfflineClient.java similarity index 78% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpOfflineClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpOfflineClient.java index 03594eb1..2cc53a03 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpOfflineClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveHttpOfflineClient.java @@ -20,14 +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; +package io.github.jwdeveloper.tiktok.client; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.data.requests.*; -import io.github.jwdeveloper.tiktok.http.LiveHttpClient; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.requests.GiftsData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.http.LiveHttpClient; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; import java.net.URI; import java.util.List; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveMessageHandler.java similarity index 76% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveMessageHandler.java index 3a012a43..ff8c26af 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveMessageHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokLiveMessageHandler.java @@ -20,17 +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; +package io.github.jwdeveloper.tiktok.client; -import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData; -import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.data.events.websocket.*; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException; -import io.github.jwdeveloper.tiktok.live.*; -import io.github.jwdeveloper.tiktok.mappers.LiveMapper; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; -import io.github.jwdeveloper.tiktok.utils.Stopwatch; +import io.github.jwdeveloper.tiktok.api.data.dto.MessageMetaData; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketMessageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketUnhandledMessageEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveMessageException; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapper; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.utils.Stopwatch; import java.time.Duration; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokRoomInfo.java similarity index 89% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokRoomInfo.java index 2472cdaf..d81efaea 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/TikTokRoomInfo.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; +package io.github.jwdeveloper.tiktok.client; -import io.github.jwdeveloper.tiktok.data.models.RankingUser; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.live.LiveRoomInfo; -import io.github.jwdeveloper.tiktok.models.ConnectionState; +import io.github.jwdeveloper.tiktok.api.data.models.RankingUser; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.live.LiveRoomInfo; +import io.github.jwdeveloper.tiktok.api.models.ConnectionState; import lombok.Data; import java.util.LinkedList; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResult.java similarity index 94% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResult.java index 0ce0fae0..d66c877a 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResult.java @@ -20,10 +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.common; +package io.github.jwdeveloper.tiktok.client.common; import com.google.gson.*; -import io.github.jwdeveloper.tiktok.http.mappers.*; +import io.github.jwdeveloper.tiktok.client.http.mappers.HttpRequestJsonMapper; +import io.github.jwdeveloper.tiktok.client.http.mappers.HttpResponseJsonMapper; import lombok.Data; import lombok.experimental.Accessors; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResultBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResultBuilder.java similarity index 97% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResultBuilder.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResultBuilder.java index b8f28a74..022d2320 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResultBuilder.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/ActionResultBuilder.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.common; +package io.github.jwdeveloper.tiktok.client.common; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/AsyncHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/AsyncHandler.java new file mode 100644 index 00000000..55ba40b4 --- /dev/null +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/AsyncHandler.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2023-2024 jwdeveloper jacekwoln@gmail.com + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "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.client.common; + +import lombok.Getter; + +import java.util.concurrent.*; + +public class AsyncHandler +{ + @Getter + private static final ScheduledExecutorService heartBeatScheduler = Executors.newScheduledThreadPool(1, r -> { + Thread t = new Thread(r, "heartbeat-pool"); + t.setDaemon(true); + return t; + }); + + @Getter + private static final ScheduledExecutorService reconnectScheduler = Executors.newScheduledThreadPool(0, r -> { + Thread t = new Thread(r, "reconnect-pool"); + t.setDaemon(true); + return t; + }); +} \ No newline at end of file diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/LoggerFactory.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/LoggerFactory.java similarity index 91% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/common/LoggerFactory.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/LoggerFactory.java index 73c9b162..fb05b311 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/LoggerFactory.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/common/LoggerFactory.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.common; +package io.github.jwdeveloper.tiktok.client.common; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.utils.ConsoleColors; import java.util.logging.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftsManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/gifts/TikTokGiftsManager.java similarity index 93% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftsManager.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/gifts/TikTokGiftsManager.java index 2d71557b..6d7aef33 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftsManager.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/gifts/TikTokGiftsManager.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.gifts; +package io.github.jwdeveloper.tiktok.client.gifts; -import io.github.jwdeveloper.tiktok.data.models.gifts.Gift; -import io.github.jwdeveloper.tiktok.live.GiftsManager; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.live.GiftsManager; import java.util.*; import java.util.function.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClient.java similarity index 95% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClient.java index 5ef4a755..54cdb25d 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClient.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.http; +package io.github.jwdeveloper.tiktok.client.http; -import io.github.jwdeveloper.tiktok.common.ActionResult; -import io.github.jwdeveloper.tiktok.data.settings.HttpClientSettings; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.client.common.ActionResult; +import io.github.jwdeveloper.tiktok.api.data.settings.HttpClientSettings; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveRequestException; import lombok.AllArgsConstructor; import java.net.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientBuilder.java similarity index 96% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientBuilder.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientBuilder.java index d00f1680..3086537d 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientBuilder.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientBuilder.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.http; +package io.github.jwdeveloper.tiktok.client.http; -import io.github.jwdeveloper.tiktok.data.settings.HttpClientSettings; +import io.github.jwdeveloper.tiktok.api.data.settings.HttpClientSettings; import java.net.http.HttpRequest; import java.util.Map; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientFactory.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientFactory.java similarity index 92% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientFactory.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientFactory.java index c2316bdd..f0a79398 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientFactory.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpClientFactory.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.http; +package io.github.jwdeveloper.tiktok.client.http; -import io.github.jwdeveloper.tiktok.data.settings.*; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; import lombok.Getter; @Getter diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpProxyClient.java similarity index 94% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpProxyClient.java index cd93831f..4356e36a 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/HttpProxyClient.java @@ -20,11 +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.http; +package io.github.jwdeveloper.tiktok.client.http; -import io.github.jwdeveloper.tiktok.common.ActionResult; -import io.github.jwdeveloper.tiktok.data.settings.*; -import io.github.jwdeveloper.tiktok.exceptions.*; +import io.github.jwdeveloper.tiktok.api.data.settings.HttpClientSettings; +import io.github.jwdeveloper.tiktok.api.data.settings.ProxyClientSettings; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokProxyRequestException; +import io.github.jwdeveloper.tiktok.client.common.ActionResult; import javax.net.ssl.*; import java.io.IOException; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/GiftsDataMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/GiftsDataMapper.java similarity index 93% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/GiftsDataMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/GiftsDataMapper.java index e4d6b98f..2f670ac9 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/GiftsDataMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/GiftsDataMapper.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.http.mappers; +package io.github.jwdeveloper.tiktok.client.http.mappers; import com.google.gson.*; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.gifts.Gift; -import io.github.jwdeveloper.tiktok.data.requests.GiftsData; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.requests.GiftsData; import java.util.ArrayList; import java.util.List; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpRequestJsonMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpRequestJsonMapper.java similarity index 96% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpRequestJsonMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpRequestJsonMapper.java index b8d92ac5..beab6ce9 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpRequestJsonMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpRequestJsonMapper.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.http.mappers; +package io.github.jwdeveloper.tiktok.client.http.mappers; import com.google.gson.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpResponseJsonMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpResponseJsonMapper.java similarity index 96% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpResponseJsonMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpResponseJsonMapper.java index ac023580..6dd373cd 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpResponseJsonMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/HttpResponseJsonMapper.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.http.mappers; +package io.github.jwdeveloper.tiktok.client.http.mappers; import com.google.gson.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveDataMapper.java similarity index 92% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveDataMapper.java index f2ac0b3a..117e3039 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveDataMapper.java @@ -20,16 +20,16 @@ * 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.http.mappers; +package io.github.jwdeveloper.tiktok.client.http.mappers; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import io.github.jwdeveloper.tiktok.TikTokLiveHttpClient; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.data.models.users.UserAttribute; -import io.github.jwdeveloper.tiktok.data.requests.LiveData; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.client.TikTokLiveHttpClient; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.models.users.UserAttribute; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveData; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveRequestException; import java.util.ArrayList; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveUserDataMapper.java similarity index 93% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveUserDataMapper.java index e5de1997..530f078f 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/http/mappers/LiveUserDataMapper.java @@ -20,15 +20,16 @@ * 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.http.mappers; +package io.github.jwdeveloper.tiktok.client.http.mappers; import com.google.gson.*; -import io.github.jwdeveloper.tiktok.*; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.data.requests.LiveUserData; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveRequestException; +import io.github.jwdeveloper.tiktok.client.TikTokLiveHttpClient; +import io.github.jwdeveloper.tiktok.client.TikTokRoomInfo; import java.util.*; import java.util.logging.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerMethodInfo.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/ListenerMethodInfo.java similarity index 88% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerMethodInfo.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/ListenerMethodInfo.java index dde72348..0b4fc281 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerMethodInfo.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/ListenerMethodInfo.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.listener; +package io.github.jwdeveloper.tiktok.client.listener; -import io.github.jwdeveloper.tiktok.annotations.Priority; +import io.github.jwdeveloper.tiktok.api.annotations.Priority; -import io.github.jwdeveloper.tiktok.live.builder.EventConsumer; +import io.github.jwdeveloper.tiktok.api.live.builder.EventConsumer; import lombok.Data; import java.lang.reflect.Method; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManager.java similarity index 90% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManager.java index 9c6bbb56..1cf38f8b 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManager.java @@ -20,17 +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.listener; +package io.github.jwdeveloper.tiktok.client.listener; import io.github.jwdeveloper.dependance.api.DependanceContainer; -import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver; -import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; -import io.github.jwdeveloper.tiktok.live.builder.EventConsumer; +import io.github.jwdeveloper.tiktok.api.annotations.TikTokEventObserver; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokEventListenerMethodException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.listener.ListenersManager; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.builder.EventConsumer; import java.lang.reflect.Method; import java.util.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/MessagesMapperFactory.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/MessagesMapperFactory.java similarity index 66% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/MessagesMapperFactory.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/MessagesMapperFactory.java index 633c8d43..464cc222 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/MessagesMapperFactory.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/MessagesMapperFactory.java @@ -20,16 +20,67 @@ * 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.client.mappers; import io.github.jwdeveloper.dependance.api.DependanceContainer; -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.link.*; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; -import io.github.jwdeveloper.tiktok.mappers.handlers.*; -import io.github.jwdeveloper.tiktok.messages.webcast.*; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokBarrageEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCaptionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokEmoteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicArmiesEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicBattleEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLinkMicBattleItemCard; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokQuestionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubscribeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkAcceptNoticeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCancelEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCloseEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCohostListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkCreateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkEnterEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkInviteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkKickOutEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkLeaveEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkLinkedListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkListChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMediaChangeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMicIdxUpdateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkMuteEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkRandomMatchEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkSysKickOutEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUpdateUserEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUpdateUserSettingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkUserToastEvent; +import io.github.jwdeveloper.tiktok.api.data.events.link.TikTokLinkWaitListChangeEvent; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastCaptionMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastChatMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastControlMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEmoteChatMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGiftMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLikeMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicArmies; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattle; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattleItemCard; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLiveIntroMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMemberMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastQuestionNewMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomPinMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomUserSeqMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSubNotifyMessage; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokCommonEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokGiftEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokRoomInfoEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokSocialMediaEventHandler; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.*; -import static io.github.jwdeveloper.tiktok.messages.enums.LinkMessageType.*; +import static io.github.jwdeveloper.tiktok.api.messages.enums.LinkMessageType.*; public class MessagesMapperFactory { public static TikTokLiveMapper create(DependanceContainer container) { diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokGenericEventMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokGenericEventMapper.java similarity index 95% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokGenericEventMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokGenericEventMapper.java index bbe0ac6d..b1b4a34a 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokGenericEventMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokGenericEventMapper.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.mappers; +package io.github.jwdeveloper.tiktok.client.mappers; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokMessageMappingException; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapper.java similarity index 90% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapper.java index a36b036a..e17eee8e 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapper.java @@ -20,11 +20,15 @@ * 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.client.mappers; import com.google.protobuf.GeneratedMessage; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.mappers.data.*; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapper; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.mappers.TikTokMapperModel; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingAction; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; import java.util.*; import java.util.function.Function; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperHelper.java similarity index 88% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperHelper.java index 7dc7e710..10967daa 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperHelper.java @@ -20,13 +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.mappers; +package io.github.jwdeveloper.tiktok.client.mappers; import com.google.protobuf.GeneratedMessage; -import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException; -import io.github.jwdeveloper.tiktok.utils.JsonUtil; -import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject; -import io.github.jwdeveloper.tiktok.utils.ProtocolUtils; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokMessageMappingException; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.utils.JsonUtil; +import io.github.jwdeveloper.tiktok.api.utils.ProtoBufferObject; +import io.github.jwdeveloper.tiktok.api.utils.ProtocolUtils; public class TikTokLiveMapperHelper implements LiveMapperHelper { diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperModel.java similarity index 89% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperModel.java index 1e8a9f6d..b15b0950 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperModel.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/TikTokLiveMapperModel.java @@ -20,11 +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.mappers; +package io.github.jwdeveloper.tiktok.client.mappers; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.mappers.data.MappingAction; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.mappers.TikTokMapperModel; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingAction; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; import lombok.Getter; import lombok.Setter; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokCommonEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokCommonEventHandler.java similarity index 67% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokCommonEventHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokCommonEventHandler.java index 29146bfe..bd7bf802 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokCommonEventHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokCommonEventHandler.java @@ -20,16 +20,28 @@ * 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.handlers; +package io.github.jwdeveloper.tiktok.client.mappers.handlers; -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent; -import io.github.jwdeveloper.tiktok.data.events.poll.*; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent; -import io.github.jwdeveloper.tiktok.data.models.chest.Chest; -import io.github.jwdeveloper.tiktok.messages.enums.EnvelopeDisplay; -import io.github.jwdeveloper.tiktok.messages.webcast.*; +import static io.github.jwdeveloper.tiktok.api.messages.enums.ControlAction.STREAM_PAUSED; + +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveEndedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLivePausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveUnpausedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledControlEvent; +import io.github.jwdeveloper.tiktok.api.data.events.poll.TikTokPollEndEvent; +import io.github.jwdeveloper.tiktok.api.data.events.poll.TikTokPollEvent; +import io.github.jwdeveloper.tiktok.api.data.events.poll.TikTokPollStartEvent; +import io.github.jwdeveloper.tiktok.api.data.events.poll.TikTokPollUpdateEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.envelop.TikTokChestEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomPinEvent; +import io.github.jwdeveloper.tiktok.api.data.models.chest.Chest; +import io.github.jwdeveloper.tiktok.api.messages.enums.EnvelopeDisplay; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastControlMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEnvelopeMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPollMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomPinMessage; import lombok.SneakyThrows; import java.util.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokGiftEventHandler.java similarity index 90% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokGiftEventHandler.java index 1d22dae6..0a3f24a7 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokGiftEventHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokGiftEventHandler.java @@ -20,18 +20,20 @@ * 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.handlers; +package io.github.jwdeveloper.tiktok.client.mappers.handlers; import io.github.jwdeveloper.dependance.injector.api.annotations.Inject; -import io.github.jwdeveloper.tiktok.TikTokRoomInfo; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.*; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.gifts.*; -import io.github.jwdeveloper.tiktok.live.GiftsManager; -import io.github.jwdeveloper.tiktok.mappers.LiveMapperHelper; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; +import io.github.jwdeveloper.tiktok.client.TikTokRoomInfo; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftComboEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.GiftComboStateType; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.live.GiftsManager; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGiftMessage; import lombok.SneakyThrows; import java.util.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokRoomInfoEventHandler.java similarity index 77% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokRoomInfoEventHandler.java index 7d948c31..db63c3ec 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokRoomInfoEventHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokRoomInfoEventHandler.java @@ -20,23 +20,23 @@ * 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.handlers; +package io.github.jwdeveloper.tiktok.client.mappers.handlers; -import io.github.jwdeveloper.tiktok.TikTokRoomInfo; -import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokUnhandledMemberEvent; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent; -import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent; -import io.github.jwdeveloper.tiktok.data.models.RankingUser; -import io.github.jwdeveloper.tiktok.data.models.users.User; -import io.github.jwdeveloper.tiktok.mappers.LiveMapperHelper; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLiveIntroMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage; +import io.github.jwdeveloper.tiktok.client.TikTokRoomInfo; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubscribeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledMemberEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.data.models.RankingUser; +import io.github.jwdeveloper.tiktok.api.data.models.users.User; +import io.github.jwdeveloper.tiktok.api.mappers.LiveMapperHelper; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLikeMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLiveIntroMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMemberMessage; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastRoomUserSeqMessage; import lombok.SneakyThrows; import java.util.List; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokSocialMediaEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokSocialMediaEventHandler.java similarity index 75% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokSocialMediaEventHandler.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokSocialMediaEventHandler.java index dd8d77c3..818eebaa 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokSocialMediaEventHandler.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/mappers/handlers/TikTokSocialMediaEventHandler.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.mappers.handlers; +package io.github.jwdeveloper.tiktok.client.mappers.handlers; -import io.github.jwdeveloper.tiktok.TikTokRoomInfo; -import io.github.jwdeveloper.tiktok.data.events.TikTokUnhandledSocialEvent; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -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.Text; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage; -import io.github.jwdeveloper.tiktok.models.SocialTypes; +import io.github.jwdeveloper.tiktok.client.TikTokRoomInfo; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokUnhandledSocialEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokShareEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Text; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastSocialMessage; +import io.github.jwdeveloper.tiktok.api.models.SocialTypes; import lombok.SneakyThrows; import java.util.regex.Pattern; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketClient.java similarity index 87% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketClient.java index 61d336d0..f7970366 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketClient.java @@ -20,13 +20,19 @@ * 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.websocket; +package io.github.jwdeveloper.tiktok.client.websocket; -import io.github.jwdeveloper.tiktok.data.dto.ProxyData; -import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; -import io.github.jwdeveloper.tiktok.data.settings.*; -import io.github.jwdeveloper.tiktok.exceptions.*; -import io.github.jwdeveloper.tiktok.live.*; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.data.settings.ProxyClientSettings; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokProxyRequestException; +import io.github.jwdeveloper.tiktok.api.data.dto.ProxyData; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.websocket.LiveClientStopType; +import io.github.jwdeveloper.tiktok.api.websocket.LiveSocketClient; import org.java_websocket.client.WebSocketClient; import org.java_websocket.framing.CloseFrame; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketListener.java similarity index 87% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketListener.java index 1f124e2a..19679132 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketListener.java @@ -20,15 +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.websocket; +package io.github.jwdeveloper.tiktok.client.websocket; import com.google.protobuf.ByteString; -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.exceptions.TikTokProtocolBufferException; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; -import io.github.jwdeveloper.tiktok.live.LiveMessagesHandler; -import io.github.jwdeveloper.tiktok.messages.webcast.*; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokProtocolBufferException; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastPushFrame; import org.java_websocket.client.WebSocketClient; import org.java_websocket.drafts.Draft_6455; import org.java_websocket.handshake.ServerHandshake; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketOfflineClient.java similarity index 77% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketOfflineClient.java index 3a737608..48ba9a9f 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/TikTokWebSocketOfflineClient.java @@ -20,13 +20,15 @@ * 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.websocket; +package io.github.jwdeveloper.tiktok.client.websocket; -import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent; -import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.websocket.LiveClientStopType; +import io.github.jwdeveloper.tiktok.api.websocket.LiveSocketClient; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; public class TikTokWebSocketOfflineClient implements LiveSocketClient { diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/WebSocketHeartbeatTask.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/WebSocketHeartbeatTask.java similarity index 95% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/WebSocketHeartbeatTask.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/WebSocketHeartbeatTask.java index 375dba7a..e7875936 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/WebSocketHeartbeatTask.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/WebSocketHeartbeatTask.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.websocket; +package io.github.jwdeveloper.tiktok.client.websocket; -import io.github.jwdeveloper.tiktok.common.AsyncHandler; +import io.github.jwdeveloper.tiktok.client.common.AsyncHandler; import org.java_websocket.WebSocket; import java.util.*; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerClient.java similarity index 85% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerClient.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerClient.java index fa734f35..d5844005 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerClient.java @@ -20,13 +20,16 @@ * 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.websocket.euler; +package io.github.jwdeveloper.tiktok.client.websocket.euler; -import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; -import io.github.jwdeveloper.tiktok.live.*; -import io.github.jwdeveloper.tiktok.websocket.*; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveConnectionData; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.api.websocket.LiveClientStopType; +import io.github.jwdeveloper.tiktok.api.websocket.LiveSocketClient; import org.java_websocket.client.WebSocketClient; import org.java_websocket.framing.CloseFrame; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerListener.java similarity index 84% rename from Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java rename to Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerListener.java index 2882c6c2..bd46cec1 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/client/websocket/euler/TikTokWebSocketEulerListener.java @@ -20,15 +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.websocket.euler; +package io.github.jwdeveloper.tiktok.client.websocket.euler; import com.google.gson.*; -import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -import io.github.jwdeveloper.tiktok.data.requests.LiveUserData; -import io.github.jwdeveloper.tiktok.http.mappers.LiveUserDataMapper; -import io.github.jwdeveloper.tiktok.live.*; -import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketListener; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.requests.LiveUserData; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.client.http.mappers.LiveUserDataMapper; +import io.github.jwdeveloper.tiktok.client.websocket.TikTokWebSocketListener; import java.net.URI; import java.util.Map; diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/AsyncHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/common/AsyncHandler.java deleted file mode 100644 index 172845ed..00000000 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/AsyncHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.github.jwdeveloper.tiktok.common; - -import lombok.Getter; - -import java.util.concurrent.*; - -public class AsyncHandler -{ - @Getter - private static final ScheduledExecutorService heartBeatScheduler = Executors.newScheduledThreadPool(1, r -> { - Thread t = new Thread(r, "heartbeat-pool"); - t.setDaemon(true); - return t; - }); - - @Getter - private static final ScheduledExecutorService reconnectScheduler = Executors.newScheduledThreadPool(0, r -> { - Thread t = new Thread(r, "reconnect-pool"); - t.setDaemon(true); - return t; - }); -} \ No newline at end of file diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientTests.java similarity index 76% rename from Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java rename to Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientTests.java index d5bddbf1..2f348bb2 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokLiveClientTests.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; +package io.github.jwdeveloper.tiktok.client; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; -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.data.events.control.TikTokConnectingEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException; -import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder; -import io.github.jwdeveloper.tiktok.models.ConnectionState; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokConnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.live.builder.LiveClientBuilder; +import io.github.jwdeveloper.tiktok.api.models.ConnectionState; import org.junit.Assert; import org.junit.Test; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokTestBase.java similarity index 87% rename from Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java rename to Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokTestBase.java index 6d2e837d..08485fb1 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokTestBase.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/TikTokTestBase.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; +package io.github.jwdeveloper.tiktok.client; import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; -import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder; -import io.github.jwdeveloper.tiktok.mocks.EventsHandlerMock; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.api.live.builder.LiveClientBuilder; +import io.github.jwdeveloper.tiktok.client.mocks.EventsHandlerMock; import lombok.Getter; import lombok.experimental.Accessors; import org.junit.Before; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokGiftEventHandlerTest.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/handlers/events/TikTokGiftEventHandlerTest.java similarity index 88% rename from Client/src/test/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokGiftEventHandlerTest.java rename to Client/src/test/java/io/github/jwdeveloper/tiktok/client/handlers/events/TikTokGiftEventHandlerTest.java index 2f661a94..8dc24f11 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokGiftEventHandlerTest.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/handlers/events/TikTokGiftEventHandlerTest.java @@ -20,19 +20,20 @@ * 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.handlers.events; - -import io.github.jwdeveloper.tiktok.TikTokRoomInfo; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.data.models.Picture; -import io.github.jwdeveloper.tiktok.data.models.gifts.Gift; -import io.github.jwdeveloper.tiktok.data.models.gifts.GiftComboStateType; -import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager; -import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler; -import io.github.jwdeveloper.tiktok.messages.data.Image; -import io.github.jwdeveloper.tiktok.messages.data.User; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; +package io.github.jwdeveloper.tiktok.client.handlers.events; + +import io.github.jwdeveloper.tiktok.client.TikTokRoomInfo; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftComboEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.models.Picture; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.GiftComboStateType; +import io.github.jwdeveloper.tiktok.client.gifts.TikTokGiftsManager; +import io.github.jwdeveloper.tiktok.client.mappers.handlers.TikTokGiftEventHandler; +import io.github.jwdeveloper.tiktok.api.messages.data.Image; +import io.github.jwdeveloper.tiktok.api.messages.data.User; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGiftMessage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,7 +55,7 @@ class TikTokGiftEventHandlerTest { public void before() { var manager = new TikTokGiftsManager(List.of()); var info = new TikTokRoomInfo(); - info.setHost(new io.github.jwdeveloper.tiktok.data.models.users.User(123L, "test", new Picture(""))); + info.setHost(new io.github.jwdeveloper.tiktok.api.data.models.users.User(123L, "test", new Picture(""))); manager.attachGift(new Gift(123, "example", 123, "image.webp")); clock = new AtomicLong(1_000L); handler = new TikTokGiftEventHandler(manager, info, COMBO_TIMEOUT_MS, clock::get); @@ -180,7 +181,7 @@ void shouldCloseStreakThatNeverReceivedFinishFrame() { Assertions.assertEquals(2, countGiftEvents(result)); } - private GiftComboStateType comboStateOf(List events) { + private GiftComboStateType comboStateOf(List events) { return events.stream() .filter(TikTokGiftComboEvent.class::isInstance) .map(TikTokGiftComboEvent.class::cast) @@ -189,7 +190,7 @@ private GiftComboStateType comboStateOf(List events) { + private long countGiftEvents(List events) { return events.stream().filter(e -> !(e instanceof TikTokGiftComboEvent)).count(); } @@ -210,7 +211,7 @@ public WebcastGiftMessage getGiftMessage(String giftName, boolean streakable, long groupId) { var builder = WebcastGiftMessage.newBuilder(); - var giftBuilder = io.github.jwdeveloper.tiktok.messages.data.Gift.newBuilder(); + var giftBuilder = io.github.jwdeveloper.tiktok.api.messages.data.Gift.newBuilder(); var userBuilder = User.newBuilder(); diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManagerTest.java similarity index 88% rename from Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java rename to Client/src/test/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManagerTest.java index 71aaa71d..518c0500 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/listener/TikTokListenersManagerTest.java @@ -20,23 +20,23 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.jwdeveloper.tiktok.listener; +package io.github.jwdeveloper.tiktok.client.listener; import io.github.jwdeveloper.dependance.Dependance; import io.github.jwdeveloper.dependance.api.DependanceContainer; -import io.github.jwdeveloper.tiktok.TikTokLiveEventHandler; -import io.github.jwdeveloper.tiktok.annotations.Priority; -import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver; -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.live.LiveClient; +import io.github.jwdeveloper.tiktok.client.TikTokLiveEventHandler; +import io.github.jwdeveloper.tiktok.api.annotations.Priority; +import io.github.jwdeveloper.tiktok.api.annotations.TikTokEventObserver; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.client.listener.TikTokListenersManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import java.util.ArrayList; import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/mocks/EventsHandlerMock.java similarity index 90% rename from Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java rename to Client/src/test/java/io/github/jwdeveloper/tiktok/client/mocks/EventsHandlerMock.java index 16e4a949..1f12d7f6 100644 --- a/Client/src/test/java/io/github/jwdeveloper/tiktok/mocks/EventsHandlerMock.java +++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/client/mocks/EventsHandlerMock.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.mocks; +package io.github.jwdeveloper.tiktok.client.mocks; -import io.github.jwdeveloper.tiktok.TikTokLiveEventHandler; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.client.TikTokLiveEventHandler; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; import java.util.ArrayList; import java.util.List; diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java index a5ed27ae..2ec5ad41 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java @@ -23,6 +23,7 @@ package io.github.jwdeveloper.tiktok; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector; import java.io.File; diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/ConnectionExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/ConnectionExample.java index 60512973..8e67eec9 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/ConnectionExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/ConnectionExample.java @@ -22,11 +22,12 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.data.events.TikTokSubNotifyEvent; -import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubNotifyEvent; +import io.github.jwdeveloper.tiktok.api.data.events.envelop.TikTokChestEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import java.io.IOException; import java.time.Duration; import java.util.logging.Level; diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomEventExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomEventExample.java index 7642b812..fdc24ba9 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomEventExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomEventExample.java @@ -22,8 +22,9 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.models.gifts.*; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.Gift; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import lombok.AllArgsConstructor; public class CustomEventExample { diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java index 3ed51cf9..8bc3841a 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java @@ -22,9 +22,10 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.mappers.data.MappingResult; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.mappers.data.MappingResult; +import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastChatMessage; +import io.github.jwdeveloper.tiktok.client.TikTokLive; public class CustomMappingExample { diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java index 689053cd..63b24ab8 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/CustomizationExample.java @@ -22,9 +22,12 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.live.*; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveEventsHandler; +import io.github.jwdeveloper.tiktok.client.TikTokLive; +import io.github.jwdeveloper.tiktok.client.TikTokLiveEventHandler; /** * When the default implementation does not meet your needs, diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/Events_And_Gifts_Testing_Example.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/Events_And_Gifts_Testing_Example.java index 4a1f46aa..c71e6857 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/Events_And_Gifts_Testing_Example.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/Events_And_Gifts_Testing_Example.java @@ -22,15 +22,16 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -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.models.gifts.GiftComboStateType; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokSubscribeEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftComboEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokFollowEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokJoinEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.data.models.gifts.GiftComboStateType; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.client.TikTokLive; public class Events_And_Gifts_Testing_Example { diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java index 58f3787b..39f762f1 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java @@ -22,15 +22,16 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver; -import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; -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.TikTokLikeEvent; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.api.annotations.TikTokEventObserver; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokCommentEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.api.data.events.social.TikTokLikeEvent; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.utils.ConsoleColors; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import java.io.IOException; public class ListenerExample { diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java index b35a8525..a6977aeb 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java @@ -22,6 +22,7 @@ */ package io.github.jwdeveloper.tiktok; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import java.net.Proxy; public class ProxyExample { diff --git a/examples/src/main/java/io/github/jwdeveloper/tiktok/RecorderExample.java b/examples/src/main/java/io/github/jwdeveloper/tiktok/RecorderExample.java index 72c96c94..485d6e3a 100644 --- a/examples/src/main/java/io/github/jwdeveloper/tiktok/RecorderExample.java +++ b/examples/src/main/java/io/github/jwdeveloper/tiktok/RecorderExample.java @@ -23,6 +23,7 @@ package io.github.jwdeveloper.tiktok; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import io.github.jwdeveloper.tiktok.extension.recorder.TikTokLiveRecorder; import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.TikTokLiveRecorderStartedEvent; diff --git a/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/CollectorEvent.java b/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/CollectorEvent.java index 614ae5d8..0cd8343a 100644 --- a/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/CollectorEvent.java +++ b/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/CollectorEvent.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.extension.collector.api; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; import org.bson.Document; public interface CollectorEvent { diff --git a/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java b/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java index f06604a1..b7e9f0a9 100644 --- a/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java +++ b/extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java @@ -22,18 +22,18 @@ */ package io.github.jwdeveloper.tiktok.extension.collector.impl; -import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver; -import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent; -import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent; -import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException; +import io.github.jwdeveloper.tiktok.api.annotations.TikTokEventObserver; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokErrorEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokConnectingEvent; +import io.github.jwdeveloper.tiktok.api.data.events.room.TikTokRoomInfoEvent; +import io.github.jwdeveloper.tiktok.api.data.events.websocket.TikTokWebsocketResponseEvent; +import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveMessageException; import io.github.jwdeveloper.tiktok.extension.collector.api.*; import io.github.jwdeveloper.tiktok.extension.collector.api.settings.CollectorListenerSettings; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult; -import io.github.jwdeveloper.tiktok.utils.JsonUtil; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.messages.webcast.ProtoMessageFetchResult; +import io.github.jwdeveloper.tiktok.api.utils.JsonUtil; import org.bson.Document; import java.io.*; diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/TikTokLiveRecorder.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/TikTokLiveRecorder.java index 2bf08987..f85da9aa 100644 --- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/TikTokLiveRecorder.java +++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/TikTokLiveRecorder.java @@ -25,7 +25,7 @@ import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder; import io.github.jwdeveloper.tiktok.extension.recorder.impl.RecorderListener; import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.RecorderSettings; -import io.github.jwdeveloper.tiktok.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; import java.util.function.*; diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java index b19d0151..1929170e 100644 --- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java +++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java @@ -23,16 +23,18 @@ package io.github.jwdeveloper.tiktok.extension.recorder.impl; import com.google.gson.*; -import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver; -import io.github.jwdeveloper.tiktok.data.events.*; -import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent; -import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings; +import io.github.jwdeveloper.tiktok.api.annotations.TikTokEventObserver; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokConnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokDisconnectedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.TikTokLiveEndedEvent; +import io.github.jwdeveloper.tiktok.api.data.events.control.TikTokPreConnectionEvent; +import io.github.jwdeveloper.tiktok.api.data.settings.LiveClientSettings; import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder; import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.*; import io.github.jwdeveloper.tiktok.extension.recorder.impl.enums.LiveQuality; import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.*; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.models.ConnectionState; +import io.github.jwdeveloper.tiktok.api.live.LiveClient; +import io.github.jwdeveloper.tiktok.api.models.ConnectionState; import java.io.*; import java.net.URI; diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderEndedEvent.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderEndedEvent.java index c6aa4187..54bd6e19 100644 --- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderEndedEvent.java +++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderEndedEvent.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.extension.recorder.impl.event; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.*; import lombok.*; diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderStartedEvent.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderStartedEvent.java index 7ae720f2..601d5448 100644 --- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderStartedEvent.java +++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/event/TikTokLiveRecorderStartedEvent.java @@ -22,7 +22,7 @@ */ package io.github.jwdeveloper.tiktok.extension.recorder.impl.event; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pom.xml b/pom.xml index 8c5b3fc2..cb52324c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ TikTokLiveJava pom 1.11.18-Release + API Client @@ -22,6 +23,7 @@ 16 16 UTF-8 + 1.18.32 @@ -38,6 +40,13 @@ 16 16 + + + org.projectlombok + lombok + ${lombok.version} + + @@ -91,7 +100,7 @@ org.projectlombok lombok - 1.18.32 + ${lombok.version} provided diff --git a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/CodeExample.java b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/CodeExample.java index 57e4e1e9..80cd8c30 100644 --- a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/CodeExample.java +++ b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/CodeExample.java @@ -22,6 +22,7 @@ */ package io.github.jwdeveloper.tiktok; +import io.github.jwdeveloper.tiktok.client.TikTokLive; import java.time.Duration; import java.util.logging.Level; diff --git a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/EventsInfoGenerator.java b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/EventsInfoGenerator.java index 70a39bdb..c29923cc 100644 --- a/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/EventsInfoGenerator.java +++ b/tools-readme/src/main/java/io/github/jwdeveloper/tiktok/EventsInfoGenerator.java @@ -22,11 +22,10 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.annotations.EventMeta; -import io.github.jwdeveloper.tiktok.annotations.EventType; -import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent; -import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.live.builder.EventsBuilder; +import io.github.jwdeveloper.tiktok.api.annotations.EventMeta; +import io.github.jwdeveloper.tiktok.api.annotations.EventType; +import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokEvent; +import io.github.jwdeveloper.tiktok.api.live.builder.EventsBuilder; import lombok.AllArgsConstructor; import lombok.Getter;