From 5cc7e0cb2cbb9954edbae94b24abff23a5a25a74 Mon Sep 17 00:00:00 2001 From: minster586 <43217359+minster586@users.noreply.github.com> Date: Wed, 6 Aug 2025 01:48:28 -0400 Subject: [PATCH] change --- .../websocket/StreamerBotWebSocketClient.java | 17 +++++++++++++---- src/main/resources/config.yml | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minster586/tiktokstream/websocket/StreamerBotWebSocketClient.java b/src/main/java/com/minster586/tiktokstream/websocket/StreamerBotWebSocketClient.java index c731b50..227fcef 100644 --- a/src/main/java/com/minster586/tiktokstream/websocket/StreamerBotWebSocketClient.java +++ b/src/main/java/com/minster586/tiktokstream/websocket/StreamerBotWebSocketClient.java @@ -1,6 +1,5 @@ package com.minster586.tiktokstream.websocket; - import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; import java.net.URI; @@ -9,7 +8,12 @@ import org.bukkit.entity.Player; import com.minster586.tiktokstream.TikTokStreamPlugin; import com.minster586.tiktokstream.config.ConfigManager; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + public class StreamerBotWebSocketClient extends WebSocketClient { + private final Gson gson = new Gson(); private int retryCount = 0; private final ConfigManager configManager; private final int maxRetries; @@ -20,8 +24,12 @@ public class StreamerBotWebSocketClient extends WebSocketClient { super(serverUri); this.configManager = TikTokStreamPlugin.getInstance().getConfigManager(); this.maxRetries = configManager != null ? configManager.getIntOrDefault("config.websocket.retry-count", 3) : 3; - this.notifyPermission = configManager != null ? configManager.getStringOrDefault("config.websocket.notify-permission", "tiktok.live") : "tiktok.live"; - this.notifyMessage = configManager != null ? configManager.getStringOrDefault("config.websocket.notify-message", "§c[StreamerBot] Could not connect after %retries% attempts. Check your config or Streamer.bot status.") : "§c[StreamerBot] Could not connect after %retries% attempts. Check your config or Streamer.bot status."; + this.notifyPermission = configManager != null + ? configManager.getStringOrDefault("config.websocket.notify-permission", "tiktok.live") + : "tiktok.live"; + this.notifyMessage = configManager != null ? configManager.getStringOrDefault("config.websocket.notify-message", + "§c[StreamerBot] Could not connect after %retries% attempts. Check your config or Streamer.bot status.") + : "§c[StreamerBot] Could not connect after %retries% attempts. Check your config or Streamer.bot status."; } @Override @@ -40,7 +48,8 @@ public class StreamerBotWebSocketClient extends WebSocketClient { retryCount++; try { Thread.sleep(2000L * retryCount); // Exponential backoff - } catch (InterruptedException ignored) {} + } catch (InterruptedException ignored) { + } this.reconnect(); } else { String msg = notifyMessage.replace("%retries%", String.valueOf(maxRetries)); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index ce6cfb4..f5429bd 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,7 +1,6 @@ config: prefix: [TikTok] tiktok_username: Change-me #this is the username of your tiktok account with out the "@" symbol - giftMappingUrl: "https://yourdomain.com/gift-mapping.yaml" #you can change if need but might want to make sure it follows same scheam websocket: url: "ws://localhost:8080" # change IP if need