diff --git a/files/helpers/get.py b/files/helpers/get.py index bdebc19db..a1e544c2c 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -71,11 +71,7 @@ def get_account(id, v=None): user = g.db.query(User).filter_by(id = id).one_or_none() - if not user: - try: id = int(str(id), 36) - except: abort(404) - user = g.db.query(User).filter_by(id = id).one_or_none() - if not user: abort(404) + if not user: abort(404) if v: block = g.db.query(UserBlock).filter( diff --git a/files/routes/comments.py b/files/routes/comments.py index 843b653d6..018d9806a 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -34,9 +34,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None): if v and request.path.startswith('/logged_out'): v = None try: cid = int(cid) - except: - try: cid = int(cid, 36) - except: abort(404) + except: abort(404) comment = get_comment(cid, v=v) diff --git a/files/routes/posts.py b/files/routes/posts.py index dd929b80e..2ed30fe54 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -110,9 +110,7 @@ def post_id(pid, anything=None, v=None): try: pid = int(pid) - except: - try: pid = int(pid, 36) - except: abort(404) + except: abort(404) post = get_post(pid, v=v) diff --git a/files/routes/static.py b/files/routes/static.py index 3696b30c8..27abf423f 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -237,17 +237,11 @@ def log(v): def log_item(id, v): try: id = int(id) - except: - try: id = int(id, 36) - except: abort(404) + except: abort(404) action=g.db.query(ModAction).filter_by(id=id).one_or_none() - if not action: - abort(404) - - if request.path != action.permalink: - return redirect(action.permalink) + if not action: abort(404) admins = [x[0] for x in g.db.query(User.username).filter(User.admin_level > 1).all()] diff --git a/files/routes/users.py b/files/routes/users.py index 35c2e2b61..52fc8f885 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -967,9 +967,7 @@ def user_profile_uid(v, id): if v and request.path.startswith('/logged_out'): v = None try: id = int(id) - except: - try: id = int(id, 36) - except: abort(404) + except: abort(404) x=get_account(id) return redirect(x.profile_url) diff --git a/files/routes/votes.py b/files/routes/votes.py index 76fde6776..94ecc4853 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -138,9 +138,7 @@ def api_vote_comment(comment_id, new, v): new = int(new) try: comment_id = int(comment_id) - except: - try: comment_id = int(comment_id, 36) - except: abort(404) + except: abort(404) comment = get_comment(comment_id)