carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

assets: use .get where we can instead of .query

master
justcool393 2022-10-20 13:00:14 -05:00
parent 05ba34973f
commit 4f35819fee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/routes/asset_submissions.py
View File

@ -101,7 +101,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
abort(403, f"Only Carp can approve {asset_type}!") abort(403, f"Only Carp can approve {asset_type}!")
name = name.strip() name = name.strip()
if make_lower: name = name.lower() if make_lower: name = name.lower()
asset = g.db.query(cls).filter_by(name=name).one_or_none() asset = g.db.get(cls, name)
if not asset: if not asset:
abort(404, f"This {asset} '{name}' doesn't exist!") abort(404, f"This {asset} '{name}' doesn't exist!")
return asset return asset
@ -171,7 +171,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
name = name.strip() name = name.strip()
if not name: if not name:
abort(400, f"You need to specify a {type_name}!") abort(400, f"You need to specify a {type_name}!")
asset = g.db.query(cls).filter_by(name=name).one_or_none() asset = g.db.get(cls, name)
if not asset: if not asset:
abort(404, f"This {type_name} '{name}' doesn't exist!") abort(404, f"This {type_name} '{name}' doesn't exist!")
if v.id not in (asset.submitter_id, AEVANN_ID, CARP_ID): if v.id not in (asset.submitter_id, AEVANN_ID, CARP_ID):
@ -332,7 +332,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
tags = None tags = None
error = None error = None
if name: if name:
marsey = g.db.query(Marsey).filter_by(name=name).one_or_none() marsey = g.db.get(Marsey, name)
if marsey: if marsey:
tags = marsey.tags tags = marsey.tags
else: else:
@ -357,7 +357,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
if not marsey_regex.fullmatch(name): if not marsey_regex.fullmatch(name):
return error("Invalid name!") return error("Invalid name!")
existing = g.db.query(Marsey).filter_by(name=name).one_or_none() existing = g.db.get(Marsey, name)
if not existing: if not existing:
return error("A marsey with this name doesn't exist!") return error("A marsey with this name doesn't exist!")