Formatting commands now scrubs for discord formatting

+ format_message scrubs for markdown characters and mentions and escapes
them
master
Joey Hines 2019-05-13 13:02:29 -05:00
parent 7c29e6e9b0
commit 2bef9ec611
1 changed files with 30 additions and 10 deletions

View File

@ -1,23 +1,43 @@
import re
def format_message(msg_format, *args):
chars_to_escape = ['\\', '`', '_', '*', '|', "~"]
string_format_args = []
for arg in args:
arg = str(arg)
for char in chars_to_escape:
arg = arg.replace(char, "\\" + char)
arg = re.sub(r"@(?!\s)", "@\u200B", arg)
string_format_args.append(arg)
msg = msg_format.format(*string_format_args)
return msg
def formatted_item_listing(item):
return "{} {} for {}D".format(item["amount"], item["item_name"], item["price"])
return format_message("{} {} for {}D", item["amount"], item["item_name"], item["price"])
def formatted_location(location):
if location["tunnel"] is not None:
tunnel = "**{}** ".format(location["tunnel"])
else:
tunnel = ""
return '**{}** @ **{}** {}{}'.format(location["name"], formatted_position(location), tunnel,
return format_message("**{}** @ **{}** **{}** {}", location["name"], formatted_position(location),
location["tunnel"],
formatted_owners(location))
else:
return format_message("**{}** @ **{}** {}", location["name"], formatted_position(location), formatted_owners(location))
def formatted_tunnel(tunnel):
return '**{} {}**: {}'.format(tunnel["tunnel_direction"], tunnel["tunnel_number"], tunnel["location_name"])
return format_message('**{} {}**: {}', tunnel["tunnel_direction"], tunnel["tunnel_number"], tunnel["location_name"])
def formatted_position(location):
return '(x={}, z={})'.format(location["x_coord"], location["z_coord"])
return format_message('(x={}, z={})', location["x_coord"], location["z_coord"])
def formatted_shop(shop, base_url):
@ -79,10 +99,10 @@ def formatted_owners(location):
if "owner" in location:
if len(location["owner"]) == 1:
owner_list = 'Owner: **{}**'
owner_list = 'Owner: {}'
owner_list = owner_list.format(location["owner"][0]["name"])
else:
owner_list = 'Owners: **{}**'
owner_list = 'Owners: {}'
owners = location["owner"][0]["name"]
for owner in location["owner"][1:3]: