Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2024-12-24 14:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some issues with posting message containing unicode, fetch status code, and cleanup

Browse Source
This commit is contained in:
Jeremy Zhang 2017-05-14 09:26:29 +00:00
parent 5a69d4463b
commit c63ce42524
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/titanembeds/blueprints/api/api.py
View File

@ -108,7 +108,6 @@ def format_post_content(guild_id, message):
dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first() dbguild = db.session.query(Guilds).filter(Guilds.guild_id == guild_id).first()
links = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', message) links = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', message)
print links
if not dbguild.chat_links and len(links) > 0: if not dbguild.chat_links and len(links) > 0:
illegal_post = True illegal_post = True
illegal_reasons.append("Links is not allowed.") illegal_reasons.append("Links is not allowed.")
@ -127,9 +126,9 @@ def format_post_content(guild_id, message):
message = message.replace(match, mention, 1) message = message.replace(match, mention, 1)
if (session['unauthenticated']): if (session['unauthenticated']):
message = "**[{}#{}]** {}".format(session['username'], session['user_id'], message) message = u"**[{}#{}]** {}".format(session['username'], session['user_id'], message)
else: else:
message = "**<{}#{}>** {}".format(session['username'], session['discriminator'], message) # I would like to do a @ mention, but i am worried about notif spam message = u"**<{}#{}>** {}".format(session['username'], session['discriminator'], message) # I would like to do a @ mention, but i am worried about notif spam
return (message, illegal_post, illegal_reasons) return (message, illegal_post, illegal_reasons)
def format_everyone_mention(channel, content): def format_everyone_mention(channel, content):
@ -303,8 +302,9 @@ def fetch():
status_code = 401 status_code = 401
else: else:
messages = get_channel_messages(channel_id, after_snowflake) messages = get_channel_messages(channel_id, after_snowflake)
status_code = 200
response = jsonify(messages=messages, status=status) response = jsonify(messages=messages, status=status)
response.status_code = 200 response.status_code = status_code
return response return response
@api.route("/post", methods=["POST"]) @api.route("/post", methods=["POST"])