fdsfd
This commit is contained in:
parent
6c44398f30
commit
3ced4ca8dc
2 changed files with 3 additions and 4 deletions
|
@ -231,7 +231,7 @@ 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)
|
posts = posts.filter_by(deleted_utc=0, is_banned=False, private=False, ghosts=None)
|
||||||
|
|
||||||
now = int(time.time())
|
now = int(time.time())
|
||||||
if t == 'hour':
|
if t == 'hour':
|
||||||
|
|
|
@ -813,9 +813,8 @@ 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 == 0):
|
if not v or (v.id != u.id and v.admin_level == 0):
|
||||||
comments = comments.filter(Comment.deleted_utc == 0)
|
comments = comments.filter(Comment.deleted_utc == 0, Comment.is_banned == False, Comment.ghosts == None)
|
||||||
comments = comments.filter(Comment.is_banned == False)
|
|
||||||
|
|
||||||
now = int(time.time())
|
now = int(time.time())
|
||||||
if t == 'hour':
|
if t == 'hour':
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue