forked from MarseyWorld/MarseyWorld
hide deleted posts and comments from userpages (frequently requested)
parent
193615a441
commit
f1f30635b2
|
@ -299,7 +299,10 @@ class User(Base):
|
||||||
posts = g.db.query(Submission.id).filter_by(author_id=self.id, is_pinned=False)
|
posts = g.db.query(Submission.id).filter_by(author_id=self.id, is_pinned=False)
|
||||||
|
|
||||||
if not (v and (v.admin_level > 1 or v.id == self.id)):
|
if not (v and (v.admin_level > 1 or v.id == self.id)):
|
||||||
posts = posts.filter_by(deleted_utc=0, is_banned=False, private=False, ghost=False)
|
posts = posts.filter_by(is_banned=False, private=False, ghost=False)
|
||||||
|
|
||||||
|
if not (v and v.admin_level > 1):
|
||||||
|
posts = posts.filter_by(deleted_utc=0)
|
||||||
|
|
||||||
now = int(time.time())
|
now = int(time.time())
|
||||||
if t == 'hour':
|
if t == 'hour':
|
||||||
|
|
|
@ -1298,6 +1298,7 @@ def delete_post_pid(pid, v):
|
||||||
g.db.add(post)
|
g.db.add(post)
|
||||||
|
|
||||||
cache.delete_memoized(frontlist)
|
cache.delete_memoized(frontlist)
|
||||||
|
cache.delete_memoized(User.userpagelisting)
|
||||||
|
|
||||||
g.db.commit()
|
g.db.commit()
|
||||||
|
|
||||||
|
@ -1314,6 +1315,7 @@ def undelete_post_pid(pid, v):
|
||||||
g.db.add(post)
|
g.db.add(post)
|
||||||
|
|
||||||
cache.delete_memoized(frontlist)
|
cache.delete_memoized(frontlist)
|
||||||
|
cache.delete_memoized(User.userpagelisting)
|
||||||
|
|
||||||
g.db.commit()
|
g.db.commit()
|
||||||
|
|
||||||
|
|
|
@ -1021,7 +1021,10 @@ def u_username_comments(username, v=None):
|
||||||
comments = g.db.query(Comment.id).filter(Comment.author_id == u.id, Comment.parent_submission != None)
|
comments = g.db.query(Comment.id).filter(Comment.author_id == u.id, Comment.parent_submission != None)
|
||||||
|
|
||||||
if not v or (v.id != u.id and v.admin_level < 2):
|
if not v or (v.id != u.id and v.admin_level < 2):
|
||||||
comments = comments.filter(Comment.deleted_utc == 0, Comment.is_banned == False, Comment.ghost == False)
|
comments = comments.filter(Comment.is_banned == False, Comment.ghost == False)
|
||||||
|
|
||||||
|
if not (v and v.admin_level > 1):
|
||||||
|
comments = comments.filter_by(deleted_utc=0)
|
||||||
|
|
||||||
now = int(time.time())
|
now = int(time.time())
|
||||||
if t == 'hour':
|
if t == 'hour':
|
||||||
|
|
Loading…
Reference in New Issue