Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-06-16 19:35:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add informative messages for authenticated user ban or reached max server limit

Browse Source
This commit is contained in:
Jeremy Zhang
2020-09-18 13:41:04 -07:00
parent 29d269a80d
commit 1226aea5ca
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,25 +545,25 @@ def create_authenticated_user():
else:
if not check_guild_existance(guild_id):
abort(404)
if not checkUserBanned(guild_id):
if not check_user_in_guild(guild_id):
add_member = discord_api.add_guild_member(guild_id, session['user_id'], session['user_keys']['access_token'])
if not add_member["success"]:
if not check_user_in_guild(guild_id):
add_member = discord_api.add_guild_member(guild_id, session['user_id'], session['user_keys']['access_token'])
if not add_member["success"]:
discord_status_code = add_member["content"].get("code", 0)
if discord_status_code == 40007: # user banned from server
status = {'banned': True}
response = jsonify(status=status)
response.status_code = 403
else:
response = jsonify(add_member)
response.status_code = 422
return response
db_user = db.session.query(AuthenticatedUsers).filter(and_(AuthenticatedUsers.guild_id == guild_id, AuthenticatedUsers.client_id == session['user_id'])).first()
if not db_user:
db_user = AuthenticatedUsers(guild_id, session['user_id'])
db.session.add(db_user)
db.session.commit()
status = update_user_status(guild_id, session['username'])
return jsonify(status=status)
else:
status = {'banned': True}
response = jsonify(status=status)
response.status_code = 403
return response
return response
db_user = db.session.query(AuthenticatedUsers).filter(and_(AuthenticatedUsers.guild_id == guild_id, AuthenticatedUsers.client_id == session['user_id'])).first()
if not db_user:
db_user = AuthenticatedUsers(guild_id, session['user_id'])
db.session.add(db_user)
db.session.commit()
status = update_user_status(guild_id, session['username'])
return jsonify(status=status)
@api.route("/user/<guild_id>/<user_id>")
@abort_if_guild_disabled()