From 8a37c6d1188a2747b8fd55eb466ccf9c831826b2 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 10 Feb 2022 01:12:17 +0200 Subject: [PATCH] vxc --- files/classes/user.py | 2 +- files/routes/front.py | 6 +++--- files/routes/posts.py | 8 ++++---- files/routes/search.py | 4 ++-- files/routes/users.py | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 7c5ad1d5d..5f0b5d28b 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -262,7 +262,7 @@ class User(Base): elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) + posts = posts.order_by((Submission.downvotes+1)/(Submission.downvotes+1) + (Submission.downvotes+1)/(Submission.upvotes+1)) elif sort == "top": posts = posts.order_by(Submission.downvotes - Submission.upvotes) elif sort == "bottom": diff --git a/files/routes/front.py b/files/routes/front.py index fea845748..610f4f391 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -323,7 +323,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) + posts = posts.order_by((Submission.downvotes+1)/(Submission.downvotes+1) + (Submission.downvotes+1)/(Submission.upvotes+1)) elif sort == "top": posts = posts.order_by(Submission.downvotes - Submission.upvotes) elif sort == "bottom": @@ -435,7 +435,7 @@ def changeloglist(v=None, sort="new", page=1 ,t="all"): elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) + posts = posts.order_by((Submission.downvotes+1)/(Submission.downvotes+1) + (Submission.downvotes+1)/(Submission.upvotes+1)) elif sort == "top": posts = posts.order_by(Submission.downvotes - Submission.upvotes) elif sort == "bottom": @@ -499,7 +499,7 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom": diff --git a/files/routes/posts.py b/files/routes/posts.py index f67932c80..b875c56fc 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -179,7 +179,7 @@ def post_id(pid, anything=None, v=None, sub=None): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": @@ -198,7 +198,7 @@ def post_id(pid, anything=None, v=None, sub=None): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": @@ -307,7 +307,7 @@ def viewmore(v, pid, sort, offset): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": @@ -324,7 +324,7 @@ def viewmore(v, pid, sort, offset): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.realupvotes.desc()) elif sort == "bottom": diff --git a/files/routes/search.py b/files/routes/search.py index a02c4f567..1f0cfeed5 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -149,7 +149,7 @@ def searchposts(v): elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) + posts = posts.order_by((Submission.downvotes+1)/(Submission.downvotes+1) + (Submission.downvotes+1)/(Submission.upvotes+1)) elif sort == "top": posts = posts.order_by(Submission.downvotes - Submission.upvotes) elif sort == "bottom": @@ -255,7 +255,7 @@ def searchcomments(v): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom": diff --git a/files/routes/users.py b/files/routes/users.py index 468b92586..ff368a32e 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -857,7 +857,7 @@ def u_username_comments(username, v=None): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) + comments = comments.order_by((Comment.downvotes+1)/(Comment.downvotes+1) + (Comment.downvotes+1)/(Comment.upvotes+1)) elif sort == "top": comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom":