Frisk/RcGcDw
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDw.git synced 2025-02-23 00:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed #36 forever, please do not even mention this issue to me ever again

Browse source
This commit is contained in:
Frisk 2018-12-30 19:27:16 +01:00
parent f66f40df11
commit 52b61d75c9
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rcgcdw.py
View file

@ -77,7 +77,13 @@ LinkParser = LinkParser()
def send(message, name, avatar): def send(message, name, avatar):
send_to_discord({"content": message, "avatar_url": avatar, "username": name}) dictionary_creator = {}
dictionary_creator["content"] = message
if name:
dictionary_creator["username"] = name
if avatar:
dictionary_creator["avatar_url"] = avatar
send_to_discord(dictionary_creator)
def safe_read(request, *keys): def safe_read(request, *keys):
@ -101,6 +107,8 @@ def send_to_discord_webhook(data):
header = settings["header"] header = settings["header"]
if "content" not in data: if "content" not in data:
header['Content-Type'] = 'application/json' header['Content-Type'] = 'application/json'
else:
header['Content-Type'] = 'application/x-www-form-urlencoded'
try: try:
result = requests.post(settings["webhookURL"], data=data, result = requests.post(settings["webhookURL"], data=data,
headers=header, timeout=10) headers=header, timeout=10)
@ -511,7 +519,7 @@ def webhook_formatter(action, STATIC, **params):
def handle_discord_http(code, formatted_embed, result): def handle_discord_http(code, formatted_embed, result):
if 300 > code > 199: # message went through if 300 > code > 199: # message went through
return 0 return 0
elif code == 400: # HTTP BAD REQUEST elif code == 400: # HTTP BAD REQUEST result.status_code, data, result, header
logging.error( logging.error(
"Following message has been rejected by Discord, please submit a bug on our bugtracker adding it:") "Following message has been rejected by Discord, please submit a bug on our bugtracker adding it:")
logging.error(formatted_embed) logging.error(formatted_embed)