Only alter tab list content when formatting a message to send

feature/embed-uploads
Tristan Gosselin-Hane 7 years ago
parent ab7e09e045
commit 8049701c43
  1. 10
      webhook-bridge.py

@ -257,9 +257,8 @@ def main():
global TAB_FOOTER, TAB_HEADER 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: header={}".format(header_footer_packet.header))
logging.debug("Got Tablist H/F Update: footer={}".format(header_footer_packet.footer)) logging.debug("Got Tablist H/F Update: footer={}".format(header_footer_packet.footer))
# Strip out colour codes and some markdown TAB_HEADER = json.loads(header_footer_packet.header)["text"]
TAB_HEADER = escape_markdown(strip_colour(json.loads(header_footer_packet.header)["text"])) TAB_FOOTER = json.loads(header_footer_packet.footer)["text"]
TAB_FOOTER = escape_markdown(strip_colour(json.loads(header_footer_packet.footer)["text"]))
def handle_tab_list(tab_list_packet): def handle_tab_list(tab_list_packet):
logging.debug("Processing 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()))) player_list = ", ".join(list(map(lambda x: x[1], PLAYER_LIST.items())))
msg = "{}\n" \ msg = "{}\n" \
"Players online: {}\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) await send_channel.send(msg)
except discord.errors.Forbidden: except discord.errors.Forbidden:
if isinstance(message.author, discord.abc.User): if isinstance(message.author, discord.abc.User):

Loading…
Cancel
Save