From f986efd2d521267705bf095033a6f5044ebc8359 Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Tue, 2 Jul 2024 22:08:02 -0400 Subject: [PATCH] Only fetch gifts if no exceptions are thrown to prevent spam to TikTok --- .../java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java index 1ce47d6..511fd89 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java @@ -131,9 +131,6 @@ public class TikTokLiveClient implements LiveClient roomInfo.setStartTime(userData.getStartTime()); roomInfo.setRoomId(userData.getRoomId()); - if (clientSettings.isFetchGifts()) - giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts()); - if (userData.getUserStatus() == LiveUserData.UserStatus.Offline) throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName()); @@ -165,6 +162,9 @@ public class TikTokLiveClient implements LiveClient if (preconnectEvent.isCancelConnection()) throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!"); + if (clientSettings.isFetchGifts()) + giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts()); + var liveConnectionRequest = new LiveConnectionData.Request(userData.getRoomId()); var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest); webSocketClient.start(liveConnectionData, this);