From 9f62ea63517856f9029e050d3a20f91635df2045 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 30 Nov 2021 18:37:28 +0200 Subject: [PATCH] fdfsd --- files/classes/comment.py | 1 - files/classes/submission.py | 1 - files/classes/user.py | 6 +++--- files/routes/front.py | 20 ++++++++++---------- files/routes/posts.py | 12 ++++++------ files/routes/search.py | 12 ++++++------ files/routes/users.py | 6 +++--- files/routes/votes.py | 3 +-- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 75f20f1be..b11502826 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -43,7 +43,6 @@ class Comment(Base): upvotes = Column(Integer, default=1) downvotes = Column(Integer, default=0) realupvotes = Column(Integer, default=1) - realdownvotes = Column(Integer, default=0) body = Column(String) body_html = Column(String) ban_reason = Column(String) diff --git a/files/classes/submission.py b/files/classes/submission.py index cb0a3c021..7702c7a5d 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -44,7 +44,6 @@ class Submission(Base): upvotes = Column(Integer, default=1) downvotes = Column(Integer, default=0) realupvotes = Column(Integer, default=1) - realdownvotes = Column(Integer, default=0) app_id=Column(Integer, ForeignKey("oauth_apps.id")) title = Column(String) title_html = Column(String) diff --git a/files/classes/user.py b/files/classes/user.py index 910fb74a0..f17d69b46 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -251,11 +251,11 @@ class User(Base): elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(-1 * Submission.realupvotes * Submission.realdownvotes * Submission.realdownvotes) + posts = posts.order_by(-1 * Submission.realupvotes * Submission.downvotes * Submission.downvotes) elif sort == "top": - posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) + posts = posts.order_by(Submission.downvotes - Submission.realupvotes) elif sort == "bottom": - posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) + posts = posts.order_by(Submission.realupvotes - Submission.downvotes) elif sort == "comments": posts = posts.order_by(Submission.comment_count.desc()) diff --git a/files/routes/front.py b/files/routes/front.py index 88bcf1cbc..dc2e1fcbf 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -237,17 +237,17 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' if sort == "hot": ti = int(time.time()) + 3600 - posts = posts.order_by(-1000000*(Submission.realupvotes + Submission.realdownvotes + 1 + Submission.comment_count/5)/(func.power(((ti - Submission.created_utc)/1000), 1.35))) + posts = posts.order_by(-1000000*(Submission.realupvotes + Submission.downvotes + 1 + Submission.comment_count/5)/(func.power(((ti - Submission.created_utc)/1000), 1.35))) elif sort == "new": posts = posts.order_by(Submission.created_utc.desc()) elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(-1 * Submission.realupvotes * Submission.realdownvotes * Submission.realdownvotes) + posts = posts.order_by(-1 * Submission.realupvotes * Submission.downvotes * Submission.downvotes) elif sort == "top": - posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) + posts = posts.order_by(Submission.downvotes - Submission.realupvotes) elif sort == "bottom": - posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) + posts = posts.order_by(Submission.realupvotes - Submission.downvotes) elif sort == "comments": posts = posts.order_by(Submission.comment_count.desc()) @@ -340,11 +340,11 @@ 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.realupvotes * Submission.realdownvotes * Submission.realdownvotes) + posts = posts.order_by(-1 * Submission.realupvotes * Submission.downvotes * Submission.downvotes) elif sort == "top": - posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) + posts = posts.order_by(Submission.downvotes - Submission.realupvotes) elif sort == "bottom": - posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) + posts = posts.order_by(Submission.realupvotes - Submission.downvotes) elif sort == "comments": posts = posts.order_by(Submission.comment_count.desc()) @@ -407,11 +407,11 @@ 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.realupvotes * Comment.realdownvotes * Comment.realdownvotes) + comments = comments.order_by(-1 * Comment.realupvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) + comments = comments.order_by(Comment.downvotes - Comment.realupvotes) elif sort == "bottom": - comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(Comment.realupvotes - Comment.downvotes) comments = comments.offset(25 * (page - 1)).limit(26).all() return [x[0] for x in comments] diff --git a/files/routes/posts.py b/files/routes/posts.py index 479e377be..b7fee11f6 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -167,11 +167,11 @@ def post_id(pid, anything=None, v=None): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(-1 * Comment.realupvotes * Comment.realdownvotes * Comment.realdownvotes) + comments = comments.order_by(-1 * Comment.realupvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(-Comment.realupvotes - Comment.downvotes) elif sort == "bottom": - comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(Comment.realupvotes - Comment.downvotes) output = [] for c in comments.all(): @@ -191,11 +191,11 @@ def post_id(pid, anything=None, v=None): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(-1 * Comment.realupvotes * Comment.realdownvotes * Comment.realdownvotes) + comments = comments.order_by(-1 * Comment.realupvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(-Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(-Comment.realupvotes - Comment.downvotes) elif sort == "bottom": - comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(Comment.realupvotes - Comment.downvotes) post.replies = comments.filter(Comment.is_pinned != None).all() + comments.filter(Comment.level == 1, Comment.is_pinned == None).all() diff --git a/files/routes/search.py b/files/routes/search.py index e4219e13e..0bbe3fbd5 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -131,11 +131,11 @@ def searchposts(v): elif sort == "old": posts = posts.order_by(Submission.created_utc.asc()) elif sort == "controversial": - posts = posts.order_by(-1 * Submission.realupvotes * Submission.realdownvotes * Submission.realdownvotes) + posts = posts.order_by(-1 * Submission.realupvotes * Submission.downvotes * Submission.downvotes) elif sort == "top": - posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) + posts = posts.order_by(Submission.downvotes - Submission.realupvotes) elif sort == "bottom": - posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) + posts = posts.order_by(Submission.realupvotes - Submission.downvotes) elif sort == "comments": posts = posts.order_by(Submission.comment_count.desc()) @@ -230,11 +230,11 @@ def searchcomments(v): elif sort == "old": comments = comments.order_by(Comment.created_utc.asc()) elif sort == "controversial": - comments = comments.order_by(-1 * Comment.realupvotes * Comment.realdownvotes * Comment.realdownvotes) + comments = comments.order_by(-1 * Comment.realupvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) + comments = comments.order_by(Comment.downvotes - Comment.realupvotes) elif sort == "bottom": - comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(Comment.realupvotes - Comment.downvotes) total = comments.count() diff --git a/files/routes/users.py b/files/routes/users.py index f95f75c79..01357fb87 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -690,11 +690,11 @@ 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.realupvotes * Comment.realdownvotes * Comment.realdownvotes) + comments = comments.order_by(-1 * Comment.realupvotes * Comment.downvotes * Comment.downvotes) elif sort == "top": - comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) + comments = comments.order_by(Comment.downvotes - Comment.realupvotes) elif sort == "bottom": - comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) + comments = comments.order_by(Comment.realupvotes - Comment.downvotes) comments = comments.offset(25 * (page - 1)).limit(26).all() ids = [x.id for x in comments] diff --git a/files/routes/votes.py b/files/routes/votes.py index 7ed386ae3..23a260680 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -120,13 +120,13 @@ def api_vote_post(post_id, new, v): post.upvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1).count() post.downvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1).count() post.realupvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=1, real=True).count() - post.realdownvotes = g.db.query(Vote.id).filter_by(submission_id=post.id, vote_type=-1, real=True).count() g.db.add(post) g.db.commit() except: g.db.rollback() return "", 204 @app.post("/vote/comment//") +@limiter.limit("5/second;60/minute;200/hour") @auth_required @validate_formkey def api_vote_comment(comment_id, new, v): @@ -188,7 +188,6 @@ def api_vote_comment(comment_id, new, v): comment.upvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1).count() comment.downvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1).count() comment.realupvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=1, real=True).count() - comment.realdownvotes = g.db.query(CommentVote.id).filter_by(comment_id=comment.id, vote_type=-1, real=True).count() g.db.add(comment) g.db.commit() except: g.db.rollback()