Skip to content

Commit 5617d51

Browse files
Add Bridgebot disconnect message
1 parent b5e8571 commit 5617d51

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

server/discordbot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ def queue_message(self, name, message, charname, anim):
156156
base = self.server.config["bridgebot"]["base_url"]
157157
if "embed_emotes" in self.server.config["bridgebot"]:
158158
embed_emotes = self.server.config["bridgebot"]["embed_emotes"]
159-
if base is not None:
159+
if base is not None and charname != "":
160160
avatar_url = base + \
161161
parse.quote("characters/" + charname + "/char_icon.png")
162-
if embed_emotes:
162+
if embed_emotes and anim != "":
163163
anim_url = base + parse.quote(
164164
"characters/" + charname + "/" + anim + ".png"
165165
)

server/tsuserver.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,19 @@ def remove_client(self, client):
245245
):
246246
area.broadcast_ooc(
247247
f"[{client.id}] {client.showname} has disconnected.")
248+
# Discord Bridgebot
249+
if (
250+
"bridgebot" in self.server.config
251+
and self.server.config["bridgebot"]["enabled"]
252+
and self.client.area.area_manager.id == self.server.bridgebot.hub_id
253+
and self.client.area.id == self.server.bridgebot.area_id
254+
):
255+
webname = f"[{self.client.id}] {self.client.char_name}"
256+
if self.client.showname != "" and self.client.showname != self.client.area.area_manager.char_list[self.client.char_id]:
257+
webname = f"[{self.client.id}] {self.client.showname} ({webname})"
258+
self.server.bridgebot.queue_message(
259+
"System", f"{webname} has disconnected.", self.client.char_name, ""
260+
)
248261
area.remove_client(client)
249262
self.client_manager.remove_client(client)
250263

0 commit comments

Comments
 (0)