forked from MarseyWorld/MarseyWorld
prevent carp from undoing award pins
parent
0f8ecd48dc
commit
4b37bd721b
|
@ -462,7 +462,7 @@ class User(Base):
|
|||
|
||||
if self.shadowbanned and not (v and v.can_see_shadowbanned): return []
|
||||
|
||||
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, is_banned=False)
|
||||
|
||||
if not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.id)):
|
||||
posts = posts.filter_by(is_banned=False, private=False, ghost=False, deleted_utc=0)
|
||||
|
|
|
@ -1121,8 +1121,6 @@ def remove_post(post_id, v):
|
|||
post = get_post(post_id)
|
||||
post.is_banned = True
|
||||
post.is_approved = None
|
||||
post.stickied = None
|
||||
post.is_pinned = False
|
||||
post.ban_reason = v.username
|
||||
g.db.add(post)
|
||||
|
||||
|
|
Loading…
Reference in New Issue