diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java index 2f0b46f..9acafa1 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java @@ -25,6 +25,7 @@ package io.github.jwdeveloper.tiktok.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; @@ -55,4 +56,20 @@ public class TikTokGiftEvent extends TikTokHeaderEvent { } combo = msg.getComboCount(); } + + public TikTokGiftEvent(Gift gift) { + this.gift = gift; + user = new User(0L, "sender", new Picture("")); + toUser = new User(0L, "receiver", new Picture("")); + combo = 1; + } + + + public static TikTokGiftEvent of(Gift gift) { + return new TikTokGiftEvent(gift); + } + + public static TikTokGiftEvent of(String name, int id, int diamonds) { + return null; + } } \ No newline at end of file diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java index af8e992..3020eea 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java @@ -38,7 +38,7 @@ public class LiveClientSettings { * Determines if gifts data is downloaded before TikTokLive starts, * when `false` then client.giftManager() does not contain initial gifts */ - private boolean fetchGifts; + private boolean fetchGifts = true; /** * ISO-Language for Client diff --git a/Examples/pom.xml b/Examples/pom.xml index add2230..231f9a8 100644 --- a/Examples/pom.xml +++ b/Examples/pom.xml @@ -78,6 +78,12 @@ 1.3.0-Release compile + + io.github.jwdeveloper.worker + extension-tester + 1.3.0-Release + compile + diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/GiftTestingExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/GiftTestingExample.java new file mode 100644 index 0000000..1345208 --- /dev/null +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/GiftTestingExample.java @@ -0,0 +1,45 @@ +package io.github.jwdeveloper.tiktok; + +import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; +import io.github.jwdeveloper.tiktok.live.LiveClient; + +public class GiftTestingExample { + + + public static void main(String[] args) throws Exception { + LiveClient client = TikTokLive.newClient(SimpleExample.TIKTOK_HOSTNAME) + .configure(liveClientSettings -> + { + // liveClientSettings.setOffline(true); + }) + .onConnected((liveClient, event) -> + { + liveClient.getLogger().info("Connected"); + }) + .onGiftCombo((liveClient, event) -> + { + + }) + .onGift((liveClient, event) -> + { + liveClient.getLogger().info("New fakeGift: " + event.getGift()); + }) + .buildAndConnect(); + + var gifts = TikTokLive.gifts(); + var fakeGift = TikTokGiftEvent.of(gifts.getByName("Rose")); + var fakeGift2 = TikTokGiftEvent.of("Rose", 1, 23); + client.publishEvent(fakeGift); + client.publishEvent(fakeGift2); + } + + + public void GetTesterBuilder() { + + } + + + public void GetBuilder() { + + } +} diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/testerExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/TestingGiftsExample.java similarity index 53% rename from Examples/src/main/java/io/github/jwdeveloper/tiktok/testerExample.java rename to Examples/src/main/java/io/github/jwdeveloper/tiktok/TestingGiftsExample.java index 5da54c3..cce9c63 100644 --- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/testerExample.java +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/TestingGiftsExample.java @@ -1,4 +1,4 @@ package io.github.jwdeveloper.tiktok; -public class testerExample { +public class TestingGiftsExample { } diff --git a/extension-tester/pom.xml b/extension-tester/pom.xml deleted file mode 100644 index 7235026..0000000 --- a/extension-tester/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - io.github.jwdeveloper.tiktok - TikTokLiveJava - 1.3.0-Release - - - io.github.jwdeveloper.worker - extension-tester - - - 16 - 16 - UTF-8 - - - - io.github.jwdeveloper.tiktok - Client - 1.3.0-Release - compile - - - - \ No newline at end of file diff --git a/extension-tester/src/main/java/io/github/jwdeveloper/tiktok/extension/tester/TikTokLiveTester.java b/extension-tester/src/main/java/io/github/jwdeveloper/tiktok/extension/tester/TikTokLiveTester.java deleted file mode 100644 index 5a26ae2..0000000 --- a/extension-tester/src/main/java/io/github/jwdeveloper/tiktok/extension/tester/TikTokLiveTester.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.jwdeveloper.tiktok.extension.tester; - -import io.github.jwdeveloper.tiktok.live.LiveClient; - -public class TikTokLiveTester { - public static LiveClient createFakeClient() { - throw new RuntimeException("Not implemented"); - } -}