remove leftover code from ill-fated joinedload attempt
parent
a64736d9fb
commit
c380848d47
|
@ -23,7 +23,7 @@ def get_id(username, v=None, graceful=False):
|
|||
return user[0]
|
||||
|
||||
|
||||
def get_user(username, v=None, graceful=False, rendered=False):
|
||||
def get_user(username, v=None, graceful=False):
|
||||
|
||||
if not username:
|
||||
if not graceful: abort(404)
|
||||
|
@ -119,7 +119,7 @@ def get_account(id, v=None):
|
|||
return user
|
||||
|
||||
|
||||
def get_post(i, v=None, graceful=False, rendered=False, entered=False):
|
||||
def get_post(i, v=None, graceful=False):
|
||||
|
||||
try: i = int(i)
|
||||
except: abort(404)
|
||||
|
|
|
@ -11,7 +11,7 @@ def post_embed(id, v):
|
|||
try: id = int(id)
|
||||
except: return None
|
||||
|
||||
p = get_post(id, v, graceful=True, rendered=True)
|
||||
p = get_post(id, v, graceful=True)
|
||||
|
||||
if p: return render_template("submission_listing.html", listing=[p], v=v)
|
||||
return ''
|
||||
|
|
|
@ -106,7 +106,7 @@ def buy(v, award):
|
|||
@is_not_permabanned
|
||||
def award_thing(v, thing_type, id):
|
||||
|
||||
if thing_type == 'post': thing = get_post(id, rendered=True)
|
||||
if thing_type == 'post': thing = get_post(id)
|
||||
else: thing = get_comment(id)
|
||||
|
||||
if not thing: return {"error": f"That {thing_type} doesn't exist."}, 404
|
||||
|
|
|
@ -67,7 +67,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
|
|||
try: pid = int(pid)
|
||||
except: abort(404)
|
||||
|
||||
post = get_post(pid, v=v, rendered=True)
|
||||
post = get_post(pid, v=v)
|
||||
|
||||
if post.over_18 and not (v and v.over_18) and not session.get('over_18', 0) >= int(time.time()):
|
||||
if request.headers.get("Authorization"): return {'error': 'This content is not suitable for some users and situations.'}
|
||||
|
|
|
@ -124,7 +124,7 @@ def post_id(pid, anything=None, v=None, sub=None):
|
|||
try: pid = int(pid)
|
||||
except: abort(404)
|
||||
|
||||
post = get_post(pid, v=v, rendered=True, entered=True)
|
||||
post = get_post(pid, v=v)
|
||||
|
||||
if post.over_18 and not (v and v.over_18) and session.get('over_18', 0) < int(time.time()):
|
||||
if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error":"Must be 18+ to view"}, 451
|
||||
|
@ -389,7 +389,7 @@ def morecomments(v, cid):
|
|||
@limiter.limit("1/second;10/minute;100/hour;200/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}')
|
||||
@auth_required
|
||||
def edit_post(pid, v):
|
||||
p = get_post(pid, rendered=True)
|
||||
p = get_post(pid)
|
||||
|
||||
title = request.values.get("title", "").strip().replace('','')
|
||||
|
||||
|
|
|
@ -873,7 +873,7 @@ def u_username(username, v=None):
|
|||
if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
|
||||
if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
|
||||
|
||||
u = get_user(username, v=v, rendered=True)
|
||||
u = get_user(username, v=v)
|
||||
|
||||
if v and username == v.username:
|
||||
is_following = False
|
||||
|
@ -969,7 +969,7 @@ def u_username_comments(username, v=None):
|
|||
if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
|
||||
if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
|
||||
|
||||
user = get_user(username, v=v, rendered=True)
|
||||
user = get_user(username, v=v)
|
||||
|
||||
if v and username == v.username:
|
||||
is_following = False
|
||||
|
|
Loading…
Reference in New Issue