From 683be1485c8ba94c60e4da28cb8fd8520c26a74b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 10 Feb 2022 01:08:55 +0200 Subject: [PATCH] bv --- files/assets/images/subs/2american4you.webp | Bin 0 -> 13166 bytes files/classes/user.py | 2 +- files/routes/admin.py | 6 +++++- files/routes/front.py | 6 +++--- files/routes/posts.py | 8 ++++---- files/routes/search.py | 4 ++-- files/routes/users.py | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 files/assets/images/subs/2american4you.webp diff --git a/files/assets/images/subs/2american4you.webp b/files/assets/images/subs/2american4you.webp new file mode 100644 index 0000000000000000000000000000000000000000..0f33d68f841260b70cc3af0738cd26ab68c49a1f GIT binary patch literal 13166 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 UBF#8bX_|9226MSV6&x4<09V!CdjJ3c literal 0 HcmV?d00001 diff --git a/files/classes/user.py b/files/classes/user.py index 9696f9300..7c5ad1d5d 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(-1 * Submission.upvotes * Submission.downvotes * Submission.downvotes) + posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) elif sort == "top": posts = posts.order_by(Submission.downvotes - Submission.upvotes) elif sort == "bottom": diff --git a/files/routes/admin.py b/files/routes/admin.py index 81ce2429b..5e2bc07bd 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -990,7 +990,11 @@ def admin_title_change(user_id, v): user=g.db.query(User).filter_by(id=user.id).one_or_none() user.customtitle=new_name if request.values.get("locked"): user.flairchanged = int(time.time()) + 2629746 - else: user.flairchanged = None + else: + user.flairchanged = None + badge = user.has_badge(96) + if badge: g.db.delete(badge) + g.db.add(user) if user.flairchanged: kind = "set_flair_locked" diff --git a/files/routes/front.py b/files/routes/front.py index c3dd29133..fea845748 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(-1 * Submission.upvotes * Submission.downvotes * Submission.downvotes) + posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) 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(-1 * Submission.upvotes * Submission.downvotes * Submission.downvotes) + posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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 327fc1f9a..f67932c80 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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 b99d19f68..a02c4f567 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(-1 * Submission.upvotes * Submission.downvotes * Submission.downvotes) + posts = posts.order_by(Submission.upvotes/Submission.downvotes + Submission.downvotes/Submission.upvotes) 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) 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 b8a791c87..468b92586 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(-1 * Comment.upvotes * Comment.downvotes * Comment.downvotes) + comments = comments.order_by(Comment.upvotes/Comment.downvotes + Comment.downvotes/Comment.upvotes) elif sort == "top": comments = comments.order_by(Comment.downvotes - Comment.upvotes) elif sort == "bottom":