From 8049701c430edc0988e63bc14e25101b5b0fd82e Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Sat, 10 Nov 2018 02:27:37 -0500 Subject: [PATCH] Only alter tab list content when formatting a message to send --- webhook-bridge.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webhook-bridge.py b/webhook-bridge.py index a5d3373..c93aee8 100755 --- a/webhook-bridge.py +++ b/webhook-bridge.py @@ -257,9 +257,8 @@ def main(): global TAB_FOOTER, TAB_HEADER logging.debug("Got Tablist H/F Update: header={}".format(header_footer_packet.header)) logging.debug("Got Tablist H/F Update: footer={}".format(header_footer_packet.footer)) - # Strip out colour codes and some markdown - TAB_HEADER = escape_markdown(strip_colour(json.loads(header_footer_packet.header)["text"])) - TAB_FOOTER = escape_markdown(strip_colour(json.loads(header_footer_packet.footer)["text"])) + TAB_HEADER = json.loads(header_footer_packet.header)["text"] + TAB_FOOTER = json.loads(header_footer_packet.footer)["text"] def handle_tab_list(tab_list_packet): logging.debug("Processing tab list packet") @@ -543,7 +542,10 @@ def main(): player_list = ", ".join(list(map(lambda x: x[1], PLAYER_LIST.items()))) msg = "{}\n" \ "Players online: {}\n" \ - "{}".format(TAB_HEADER, player_list, TAB_FOOTER) + "{}".format(escape_markdown( + strip_colour(TAB_HEADER)), escape_markdown( + strip_colour(player_list)), escape_markdown( + strip_colour(TAB_FOOTER))) await send_channel.send(msg) except discord.errors.Forbidden: if isinstance(message.author, discord.abc.User):