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

fdRevert "dfsfds" 

This reverts commit b0511a1b85.
master
Aevann1 2021-09-18 21:56:11 +02:00
parent b0511a1b85
commit 29824b810c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/routes/comments.py
View File

@ -896,7 +896,7 @@ def save_comment(cid, v):
comment=get_comment(cid) comment=get_comment(cid)
save=g.db.query(SaveRelationship).filter_by(user_id=v.id, submission_id=comment.id, type=2).first() save=g.db.query(SaveRelationship).options(lazyload('*')).filter_by(user_id=v.id, submission_id=comment.id, type=2).first()
if not save: if not save:
new_save=SaveRelationship(user_id=v.id, submission_id=comment.id, type=2) new_save=SaveRelationship(user_id=v.id, submission_id=comment.id, type=2)
@ -912,7 +912,7 @@ def unsave_comment(cid, v):
comment=get_comment(cid) comment=get_comment(cid)
save=g.db.query(SaveRelationship).filter_by(user_id=v.id, submission_id=comment.id, type=2).first() save=g.db.query(SaveRelationship).options(lazyload('*')).filter_by(user_id=v.id, submission_id=comment.id, type=2).first()
if save: g.db.delete(save) if save: g.db.delete(save)

12
files/routes/votes.py
View File

@ -69,7 +69,7 @@ def api_vote_post(post_id, new, v):
post = get_post(post_id) post = get_post(post_id)
# check for existing vote # check for existing vote
existing = g.db.query(Vote).filter_by(user_id=v.id, submission_id=post.id).first() existing = g.db.query(Vote).options(lazyload('*')).filter_by(user_id=v.id, submission_id=post.id).first()
if existing and existing.vote_type == new: return "", 204 if existing and existing.vote_type == new: return "", 204
@ -96,8 +96,8 @@ def api_vote_post(post_id, new, v):
) )
g.db.add(vote) g.db.add(vote)
post.upvotes = g.db.query(Vote).filter_by(submission_id=post.id, vote_type=1).count() post.upvotes = g.db.query(Vote).options(lazyload('*')).filter_by(submission_id=post.id, vote_type=1).count()
post.downvotes = g.db.query(Vote).filter_by(submission_id=post.id, vote_type=-1).count() post.downvotes = g.db.query(Vote).options(lazyload('*')).filter_by(submission_id=post.id, vote_type=-1).count()
g.db.add(post) g.db.add(post)
g.db.commit() g.db.commit()
return "", 204 return "", 204
@ -121,7 +121,7 @@ def api_vote_comment(comment_id, new, v):
comment = get_comment(comment_id) comment = get_comment(comment_id)
# check for existing vote # check for existing vote
existing = g.db.query(CommentVote).filter_by(user_id=v.id, comment_id=comment.id).first() existing = g.db.query(CommentVote).options(lazyload('*')).filter_by(user_id=v.id, comment_id=comment.id).first()
if existing and existing.vote_type == new: return "", 204 if existing and existing.vote_type == new: return "", 204
@ -149,8 +149,8 @@ def api_vote_comment(comment_id, new, v):
g.db.add(vote) g.db.add(vote)
comment.upvotes = g.db.query(CommentVote).filter_by(comment_id=comment.id, vote_type=1).count() comment.upvotes = g.db.query(CommentVote).options(lazyload('*')).filter_by(comment_id=comment.id, vote_type=1).count()
comment.downvotes = g.db.query(CommentVote).filter_by(comment_id=comment.id, vote_type=-1).count() comment.downvotes = g.db.query(CommentVote).options(lazyload('*')).filter_by(comment_id=comment.id, vote_type=-1).count()
g.db.add(comment) g.db.add(comment)
g.db.commit() g.db.commit()
return "", 204 return "", 204