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

remove some more vestiges 

get_post and get_comment both handle this
master
justcool393 2022-10-09 01:25:21 -07:00
parent 52472b838d
commit c9ab2c515b
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/routes/comments.py
View File

@ -33,12 +33,7 @@ WORDLE_COLOR_MAPPINGS = {-1: "🟥", 0: "🟨", 1: "🟩"}
@app.get("/logged_out/h/<sub>/post/<pid>/<anything>/<cid>") @app.get("/logged_out/h/<sub>/post/<pid>/<anything>/<cid>")
@auth_desired_with_logingate @auth_desired_with_logingate
def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
try: cid = int(cid)
except: abort(404)
comment = get_comment(cid, v=v) comment = get_comment(cid, v=v)
if not comment.can_see(v): abort(403) if not comment.can_see(v): abort(403)
if comment.author.shadowbanned and not (v and v.shadowbanned) and not (v and v.admin_level >= PERMS['USER_SHADOWBAN']): if comment.author.shadowbanned and not (v and v.shadowbanned) and not (v and v.admin_level >= PERMS['USER_SHADOWBAN']):
@ -60,9 +55,6 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
elif SITE == 'pcmemes.net': pid = 2487 elif SITE == 'pcmemes.net': pid = 2487
else: pid = 1 else: pid = 1
try: pid = int(pid)
except: abort(404)
post = get_post(pid, v=v) 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 post.over_18 and not (v and v.over_18) and not session.get('over_18', 0) >= int(time.time()):

2
files/routes/posts.py
View File

@ -353,7 +353,7 @@ def viewmore(v, pid, sort, offset):
@auth_desired_with_logingate @auth_desired_with_logingate
def morecomments(v, cid): def morecomments(v, cid):
try: cid = int(cid) try: cid = int(cid)
except: abort(400) except: abort(404)
tcid = g.db.query(Comment.top_comment_id).filter_by(id=cid).one_or_none()[0] tcid = g.db.query(Comment.top_comment_id).filter_by(id=cid).one_or_none()[0]

6
files/routes/subs.py
View File

@ -12,9 +12,6 @@ import tldextract
@is_not_permabanned @is_not_permabanned
def exile_post(v, pid): def exile_post(v, pid):
if v.shadowbanned: return {"error": "Internal Server Error"}, 500 if v.shadowbanned: return {"error": "Internal Server Error"}, 500
try: pid = int(pid)
except: abort(400)
p = get_post(pid) p = get_post(pid)
sub = p.sub sub = p.sub
if not sub: abort(400) if not sub: abort(400)
@ -354,9 +351,6 @@ def create_sub2(v):
@app.post("/kick/<pid>") @app.post("/kick/<pid>")
@is_not_permabanned @is_not_permabanned
def kick(v, pid): def kick(v, pid):
try: pid = int(pid)
except: abort(400)
post = get_post(pid) post = get_post(pid)
if not post.sub: abort(403) if not post.sub: abort(403)