Actually don't do the half-measure of just disconnect messages - transmit all OOC messages in addition to IC messages via the broadcast

Also transfer OOC messages via bridgebot, client ID included

Author: Crystalwarrior

server/area.py

@@ -1005,6 +1005,16 @@ def broadcast_ooc(self, msg):
         self.send_owner_command(
             "CT", f"[{self.id}]" + self.server.config["hostname"], msg, "1"
         )
+        # Discord Bridgebot
+        if (
+            "bridgebot" in self.server.config
+            and self.server.config["bridgebot"]["enabled"]
+            and self.area_manager.id == self.server.bridgebot.hub_id
+            and self.id == self.server.bridgebot.area_id
+        ):
+            self.server.bridgebot.queue_message(
+                self.server.config["hostname"], msg
+            )
 
     def broadcast_action(self, client, msg):
         """

server/network/aoprotocol.py

@@ -1729,6 +1729,17 @@ def net_cmd_ct(self, args):
         self.client.area.send_owner_command(
             "CT", f"[{self.client.area.id}]{name}", args[1]
         )
+        webname = f"[{self.client.id}] {name}"
+        # Discord Bridgebot
+        if (
+            "bridgebot" in self.server.config
+            and self.server.config["bridgebot"]["enabled"]
+            and self.client.area.area_manager.id == self.server.bridgebot.hub_id
+            and self.client.area.id == self.server.bridgebot.area_id
+        ):
+            self.server.bridgebot.queue_message(
+                webname, args[1]
+            )
 
     def net_cmd_mc(self, args):
         """Play music.

server/tsuserver.py

@@ -245,20 +245,6 @@ def remove_client(self, client):
             ):
                 area.broadcast_ooc(
                     f"[{client.id}] {client.showname} has disconnected.")
-                # Discord Bridgebot
-                if (
-                    "bridgebot" in self.config
-                    and self.config["bridgebot"]["enabled"]
-                    and client.area.area_manager.id == self.bridgebot.hub_id
-                    and client.area.id == self.bridgebot.area_id
-                ):
-                    webname = client.char_name
-                    if client.showname != "" and client.showname != client.area.area_manager.char_list[client.char_id]:
-                        webname = f"{client.showname} ({webname})"
-                    webname = f"[{client.id}] {webname}"
-                    self.bridgebot.queue_message(
-                        "System", f"{webname} has disconnected.", client.char_name, ""
-                    )
             area.remove_client(client)
         self.client_manager.remove_client(client)