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

Strings instead of int

Browse Source
This commit is contained in:
Jeremy Zhang 2018-08-10 04:42:27 +00:00
parent 6d06b4001f
commit 6e886bcf1c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,26 +564,26 @@ def bot_ban():
return jsonify(error="Missing required parameters."), 400 return jsonify(error="Missing required parameters."), 400
if discriminator: if discriminator:
dbuser = db.session.query(UnauthenticatedUsers) \ dbuser = db.session.query(UnauthenticatedUsers) \
.filter(UnauthenticatedUsers.guild_id == int(guild_id)) \ .filter(UnauthenticatedUsers.guild_id == str(guild_id)) \
.filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \ .filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \
.filter(UnauthenticatedUsers.discriminator == discriminator) \ .filter(UnauthenticatedUsers.discriminator == discriminator) \
.order_by(UnauthenticatedUsers.id.desc()).first() .order_by(UnauthenticatedUsers.id.desc()).first()
else: else:
dbuser = db.session.query(UnauthenticatedUsers) \ dbuser = db.session.query(UnauthenticatedUsers) \
.filter(UnauthenticatedUsers.guild_id == int(guild_id)) \ .filter(UnauthenticatedUsers.guild_id == str(guild_id)) \
.filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \ .filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \
.order_by(UnauthenticatedUsers.id.desc()).first() .order_by(UnauthenticatedUsers.id.desc()).first()
if not dbuser: if not dbuser:
return jsonify(error="Guest user cannot be found."), 404 return jsonify(error="Guest user cannot be found."), 404
dbban = db.session.query(UnauthenticatedBans) \ dbban = db.session.query(UnauthenticatedBans) \
.filter(UnauthenticatedBans.guild_id == int(guild_id)) \ .filter(UnauthenticatedBans.guild_id == str(guild_id)) \
.filter(UnauthenticatedBans.last_username == dbuser.username) \ .filter(UnauthenticatedBans.last_username == dbuser.username) \
.filter(UnauthenticatedBans.last_discriminator == dbuser.discriminator).first() .filter(UnauthenticatedBans.last_discriminator == dbuser.discriminator).first()
if dbban is not None: if dbban is not None:
if dbban.lifter_id is None: if dbban.lifter_id is None:
return jsonify(error="Guest user, **{}#{}**, has already been banned.".format(dbban.last_username, dbban.last_discriminator)), 409 return jsonify(error="Guest user, **{}#{}**, has already been banned.".format(dbban.last_username, dbban.last_discriminator)), 409
db.session.delete(dbban) db.session.delete(dbban)
dbban = UnauthenticatedBans(int(guild_id), dbuser.ip_address, dbuser.username, dbuser.discriminator, "", int(placer_id)) dbban = UnauthenticatedBans(str(guild_id), dbuser.ip_address, dbuser.username, dbuser.discriminator, "", int(placer_id))
db.session.add(dbban) db.session.add(dbban)
db.session.commit() db.session.commit()
return jsonify(success="Guest user, **{}#{}**, has successfully been added to the ban list!".format(dbban.last_username, dbban.last_discriminator)) return jsonify(success="Guest user, **{}#{}**, has successfully been added to the ban list!".format(dbban.last_username, dbban.last_discriminator))
@ -600,13 +600,13 @@ def bot_revoke():
return jsonify(error="Missing required parameters."), 400 return jsonify(error="Missing required parameters."), 400
if discriminator: if discriminator:
dbuser = db.session.query(UnauthenticatedUsers) \ dbuser = db.session.query(UnauthenticatedUsers) \
.filter(UnauthenticatedUsers.guild_id == int(guild_id)) \ .filter(UnauthenticatedUsers.guild_id == str(guild_id)) \
.filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \ .filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \
.filter(UnauthenticatedUsers.discriminator == discriminator) \ .filter(UnauthenticatedUsers.discriminator == discriminator) \
.order_by(UnauthenticatedUsers.id.desc()).first() .order_by(UnauthenticatedUsers.id.desc()).first()
else: else:
dbuser = db.session.query(UnauthenticatedUsers) \ dbuser = db.session.query(UnauthenticatedUsers) \
.filter(UnauthenticatedUsers.guild_id == int(guild_id)) \ .filter(UnauthenticatedUsers.guild_id == str(guild_id)) \
.filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \ .filter(UnauthenticatedUsers.username.ilike("%" + username + "%")) \
.order_by(UnauthenticatedUsers.id.desc()).first() .order_by(UnauthenticatedUsers.id.desc()).first()
if not dbuser: if not dbuser: