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

fdfsd

master
Aevann1 2021-11-30 18:37:28 +02:00
parent 48ed942261
commit 9f62ea6351
8 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/classes/comment.py
View File

@ -43,7 +43,6 @@ class Comment(Base):
upvotes = Column(Integer, default=1) upvotes = Column(Integer, default=1)
downvotes = Column(Integer, default=0) downvotes = Column(Integer, default=0)
realupvotes = Column(Integer, default=1) realupvotes = Column(Integer, default=1)
realdownvotes = Column(Integer, default=0)
body = Column(String) body = Column(String)
body_html = Column(String) body_html = Column(String)
ban_reason = Column(String) ban_reason = Column(String)

1
files/classes/submission.py
View File

@ -44,7 +44,6 @@ class Submission(Base):
upvotes = Column(Integer, default=1) upvotes = Column(Integer, default=1)
downvotes = Column(Integer, default=0) downvotes = Column(Integer, default=0)
realupvotes = Column(Integer, default=1) realupvotes = Column(Integer, default=1)
realdownvotes = Column(Integer, default=0)
app_id=Column(Integer, ForeignKey("oauth_apps.id")) app_id=Column(Integer, ForeignKey("oauth_apps.id"))
title = Column(String) title = Column(String)
title_html = Column(String) title_html = Column(String)

6
files/classes/user.py
View File

@ -251,11 +251,11 @@ class User(Base):
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) posts = posts.order_by(Submission.downvotes - Submission.realupvotes)
elif sort == "bottom": elif sort == "bottom":
posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) posts = posts.order_by(Submission.realupvotes - Submission.downvotes)
elif sort == "comments": elif sort == "comments":
posts = posts.order_by(Submission.comment_count.desc()) posts = posts.order_by(Submission.comment_count.desc())

20
files/routes/front.py
View File

@ -237,17 +237,17 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
if sort == "hot": if sort == "hot":
ti = int(time.time()) + 3600 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": elif sort == "new":
posts = posts.order_by(Submission.created_utc.desc()) posts = posts.order_by(Submission.created_utc.desc())
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) posts = posts.order_by(Submission.downvotes - Submission.realupvotes)
elif sort == "bottom": elif sort == "bottom":
posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) posts = posts.order_by(Submission.realupvotes - Submission.downvotes)
elif sort == "comments": elif sort == "comments":
posts = posts.order_by(Submission.comment_count.desc()) 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": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) posts = posts.order_by(Submission.downvotes - Submission.realupvotes)
elif sort == "bottom": elif sort == "bottom":
posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) posts = posts.order_by(Submission.realupvotes - Submission.downvotes)
elif sort == "comments": elif sort == "comments":
posts = posts.order_by(Submission.comment_count.desc()) 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": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) comments = comments.order_by(Comment.downvotes - Comment.realupvotes)
elif sort == "bottom": 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() comments = comments.offset(25 * (page - 1)).limit(26).all()
return [x[0] for x in comments] return [x[0] for x in comments]

12
files/routes/posts.py
View File

@ -167,11 +167,11 @@ def post_id(pid, anything=None, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
comments = comments.order_by(-Comment.realupvotes - Comment.realdownvotes) comments = comments.order_by(-Comment.realupvotes - Comment.downvotes)
elif sort == "bottom": elif sort == "bottom":
comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) comments = comments.order_by(Comment.realupvotes - Comment.downvotes)
output = [] output = []
for c in comments.all(): for c in comments.all():
@ -191,11 +191,11 @@ def post_id(pid, anything=None, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
comments = comments.order_by(-Comment.realupvotes - Comment.realdownvotes) comments = comments.order_by(-Comment.realupvotes - Comment.downvotes)
elif sort == "bottom": 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() post.replies = comments.filter(Comment.is_pinned != None).all() + comments.filter(Comment.level == 1, Comment.is_pinned == None).all()

12
files/routes/search.py
View File

@ -131,11 +131,11 @@ def searchposts(v):
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
posts = posts.order_by(Submission.realdownvotes - Submission.realupvotes) posts = posts.order_by(Submission.downvotes - Submission.realupvotes)
elif sort == "bottom": elif sort == "bottom":
posts = posts.order_by(Submission.realupvotes - Submission.realdownvotes) posts = posts.order_by(Submission.realupvotes - Submission.downvotes)
elif sort == "comments": elif sort == "comments":
posts = posts.order_by(Submission.comment_count.desc()) posts = posts.order_by(Submission.comment_count.desc())
@ -230,11 +230,11 @@ def searchcomments(v):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) comments = comments.order_by(Comment.downvotes - Comment.realupvotes)
elif sort == "bottom": elif sort == "bottom":
comments = comments.order_by(Comment.realupvotes - Comment.realdownvotes) comments = comments.order_by(Comment.realupvotes - Comment.downvotes)
total = comments.count() total = comments.count()

6
files/routes/users.py
View File

@ -690,11 +690,11 @@ def u_username_comments(username, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": 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": elif sort == "top":
comments = comments.order_by(Comment.realdownvotes - Comment.realupvotes) comments = comments.order_by(Comment.downvotes - Comment.realupvotes)
elif sort == "bottom": 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() comments = comments.offset(25 * (page - 1)).limit(26).all()
ids = [x.id for x in comments] ids = [x.id for x in comments]

3
files/routes/votes.py
View File

@ -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.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.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.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.add(post)
g.db.commit() g.db.commit()
except: g.db.rollback() except: g.db.rollback()
return "", 204 return "", 204
@app.post("/vote/comment/<comment_id>/<new>") @app.post("/vote/comment/<comment_id>/<new>")
@limiter.limit("5/second;60/minute;200/hour")
@auth_required @auth_required
@validate_formkey @validate_formkey
def api_vote_comment(comment_id, new, v): 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.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.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.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.add(comment)
g.db.commit() g.db.commit()
except: g.db.rollback() except: g.db.rollback()