Only fetch gifts if no exceptions are thrown to prevent spam to TikTok

This commit is contained in:
kohlerpop1
2024-07-02 22:08:02 -04:00
parent 1054453451
commit f986efd2d5

View File

@@ -131,9 +131,6 @@ public class TikTokLiveClient implements LiveClient
roomInfo.setStartTime(userData.getStartTime()); roomInfo.setStartTime(userData.getStartTime());
roomInfo.setRoomId(userData.getRoomId()); roomInfo.setRoomId(userData.getRoomId());
if (clientSettings.isFetchGifts())
giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
if (userData.getUserStatus() == LiveUserData.UserStatus.Offline) if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName()); throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName());
@@ -165,6 +162,9 @@ public class TikTokLiveClient implements LiveClient
if (preconnectEvent.isCancelConnection()) if (preconnectEvent.isCancelConnection())
throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!"); throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!");
if (clientSettings.isFetchGifts())
giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
var liveConnectionRequest = new LiveConnectionData.Request(userData.getRoomId()); var liveConnectionRequest = new LiveConnectionData.Request(userData.getRoomId());
var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest); var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest);
webSocketClient.start(liveConnectionData, this); webSocketClient.start(liveConnectionData, this);