forked from MarseyWorld/MarseyWorld
show posts by users who block you
parent
385f867be9
commit
c341be2866
|
@ -701,7 +701,7 @@ class User(Base):
|
||||||
@property
|
@property
|
||||||
@lazy
|
@lazy
|
||||||
def userblocks(self):
|
def userblocks(self):
|
||||||
return [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=self.id).all()] + [x[0] for x in g.db.query(UserBlock.user_id).filter_by(target_id=self.id).all()]
|
return [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=self.id).all()]
|
||||||
|
|
||||||
@lazy
|
@lazy
|
||||||
def saved_idlist(self, page=1):
|
def saved_idlist(self, page=1):
|
||||||
|
|
|
@ -368,8 +368,6 @@ def changeloglist(v=None, sort="new", page=1, t="all", site=None):
|
||||||
|
|
||||||
posts = g.db.query(Submission.id).filter_by(is_banned=False, private=False, deleted_utc=0)
|
posts = g.db.query(Submission.id).filter_by(is_banned=False, private=False, deleted_utc=0)
|
||||||
|
|
||||||
posts = posts.filter(Submission.author_id.notin_(v.userblocks))
|
|
||||||
|
|
||||||
allowed = g.db.query(User.id).filter(User.admin_level > 0).all() + g.db.query(Badge.user_id).filter_by(badge_id=3).all()
|
allowed = g.db.query(User.id).filter(User.admin_level > 0).all() + g.db.query(Badge.user_id).filter_by(badge_id=3).all()
|
||||||
allowed = [x[0] for x in allowed]
|
allowed = [x[0] for x in allowed]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue