From 5d228bca06fd18fb91ec559aa10e26aa92f66144 Mon Sep 17 00:00:00 2001
From: Rainnny7 <braydonrainnny@gmail.com>
Date: Tue, 10 Sep 2024 16:09:31 -0400
Subject: [PATCH] Dispatch user status upon listen

---
 .../tether/service/websocket/WebSocket.java   | 22 +++++++++----------
 use-tether/src/hook/websocket.ts              |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/API/src/main/java/me/braydon/tether/service/websocket/WebSocket.java b/API/src/main/java/me/braydon/tether/service/websocket/WebSocket.java
index ab0d8fb..1c0c2d2 100644
--- a/API/src/main/java/me/braydon/tether/service/websocket/WebSocket.java
+++ b/API/src/main/java/me/braydon/tether/service/websocket/WebSocket.java
@@ -57,7 +57,6 @@ public class WebSocket extends TextWebSocketHandler {
                 }
                 for (WebSocketClient client : activeSessions.values()) {
                     String sessionId = client.getSession().getId();
-                    System.out.println("client.getSession().getId() = " + sessionId);
 
                     // Disconnect users that have not been active for 30 seconds
                     if (client.getListeningTo() == null && ((System.currentTimeMillis() - client.getConnected()) >= TimeUnit.SECONDS.toMillis(30L))) {
@@ -66,20 +65,12 @@ public class WebSocket extends TextWebSocketHandler {
                         continue;
                     }
                     if (client.getListeningTo() == null) {
-                        System.err.println("NOT LISTENING!!!");
                         continue;
                     }
                     // Notify the listening client of the user's status if it has changed
                     try {
-                        DiscordUser user = discordService.getUserBySnowflake(client.getListeningTo()).getUser();
-                        System.out.println("user = " + user);
-                        if (!user.equals(client.getLastUser())) {
-                            client.setLastUser(user);
-                            dispatch(client.getSession(), new UserStatusPacket(user));
-                        }
+                        dispatchUserStatus(client);
                     } catch (BadRequestException | ServiceUnavailableException | ResourceNotFoundException ex) {
-                        System.err.println(ex.getLocalizedMessage());
-                        System.err.println("STOPPED LISTENING TO USER!!!!!!!!!!!!!!");
                         client.setListeningTo(null);
                         dispatch(client.getSession(), new ErrorMessagePacket(ex.getLocalizedMessage()));
                     }
@@ -129,8 +120,9 @@ public class WebSocket extends TextWebSocketHandler {
 
             // Handle the packet
             if (packet instanceof ListenToUserPacket listenToUserPacket) {
-                client.setListeningTo(listenToUserPacket.getSnowflake());
                 log.info("Session {} is listening to user updates for {}", sessionId, client.getListeningTo());
+                client.setListeningTo(listenToUserPacket.getSnowflake());
+                dispatchUserStatus(client); // Dispatch user status upon listen
             }
         } catch (JsonSyntaxException ex) { // The syntax provided is invalid, close the session
             session.close(CloseStatus.NOT_ACCEPTABLE.withReason("Invalid payload"));
@@ -151,6 +143,14 @@ public class WebSocket extends TextWebSocketHandler {
         log.info("Session closed ({}): {}", status, sessionId);
     }
 
+    private void dispatchUserStatus(@NonNull WebSocketClient client) {
+        DiscordUser user = discordService.getUserBySnowflake(client.getListeningTo()).getUser();
+        if (!user.equals(client.getLastUser())) {
+            client.setLastUser(user);
+            dispatch(client.getSession(), new UserStatusPacket(user));
+        }
+    }
+
     /**
      * Send a packet to the given session.
      *
diff --git a/use-tether/src/hook/websocket.ts b/use-tether/src/hook/websocket.ts
index 3718e41..4c61067 100644
--- a/use-tether/src/hook/websocket.ts
+++ b/use-tether/src/hook/websocket.ts
@@ -17,6 +17,7 @@ export const useTetherWS = (
     config: TetherConfig = {
         endpoint: "usetether.rest",
         secure: true,
+        debug: false,
     }
 ): DiscordUser | undefined => {
     const { endpoint, secure, debug } = config;