simplar syntax
parent
745b43adad
commit
d6cbbc05c6
|
@ -1043,7 +1043,7 @@ class User(Base):
|
|||
raise TypeError("Relationships supported is SaveRelationship, Subscription, CommentSaveRelationship")
|
||||
|
||||
query = g.db.query(query).join(join).filter(relationship_cls.user_id == self.id)
|
||||
if not self.admin_level >= PERMS['POST_COMMENT_MODERATION']:
|
||||
if self.admin_level < PERMS['POST_COMMENT_MODERATION']:
|
||||
query = query.filter(cls.is_banned == False, cls.deleted_utc == 0)
|
||||
return query.count()
|
||||
|
||||
|
|
|
@ -208,7 +208,7 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, log_cost=None, followers_pi
|
|||
if SITE == 'rdrama.net' and v.id in {256, 9287, 10489, 18701}:
|
||||
notify_users.discard(AEVANN_ID)
|
||||
|
||||
if len(notify_users) > 400 and not v.admin_level >= PERMS['POST_COMMENT_INFINITE_PINGS']:
|
||||
if len(notify_users) > 400 and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
|
||||
abort(403, "You can only notify a maximum of 400 users.")
|
||||
|
||||
return notify_users - BOT_IDs - {v.id, 0} - v.all_twoway_blocks
|
||||
|
|
|
@ -453,7 +453,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
|
|||
|
||||
names = set(m.group(1) for m in mention_regex.finditer(sanitized))
|
||||
|
||||
if limit_pings and len(names) > limit_pings and not v.admin_level >= PERMS['POST_COMMENT_INFINITE_PINGS']:
|
||||
if limit_pings and len(names) > limit_pings and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
|
||||
error("Max ping limit is 5 for comments and 50 for posts!")
|
||||
|
||||
users_list = get_users(names, graceful=True)
|
||||
|
|
|
@ -174,7 +174,7 @@ def comment(v):
|
|||
|
||||
if not body and not request.files.get('file'): abort(400, "You need to actually write something!")
|
||||
|
||||
if not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and parent_user.any_block_exists(v):
|
||||
if v.admin_level < PERMS['POST_COMMENT_MODERATION'] and parent_user.any_block_exists(v):
|
||||
abort(403, "You can't reply to users who have blocked you or users that you have blocked!")
|
||||
|
||||
if request.files.get("file") and not g.is_tor:
|
||||
|
@ -591,7 +591,7 @@ def diff_words(answer, guess):
|
|||
def toggle_comment_nsfw(cid, v):
|
||||
comment = get_comment(cid)
|
||||
|
||||
if comment.author_id != v.id and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (comment.post.sub and v.mods(comment.post.sub)):
|
||||
if comment.author_id != v.id and v.admin_level < PERMS['POST_COMMENT_MODERATION'] and not (comment.post.sub and v.mods(comment.post.sub)):
|
||||
abort(403)
|
||||
|
||||
if comment.over_18 and v.is_permabanned:
|
||||
|
|
|
@ -747,7 +747,7 @@ def undelete_post_pid(pid, v):
|
|||
def mark_post_nsfw(pid, v):
|
||||
p = get_post(pid)
|
||||
|
||||
if p.author_id != v.id and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (p.sub and v.mods(p.sub)):
|
||||
if p.author_id != v.id and v.admin_level < PERMS['POST_COMMENT_MODERATION'] and not (p.sub and v.mods(p.sub)):
|
||||
abort(403)
|
||||
|
||||
if p.over_18 and v.is_permabanned:
|
||||
|
@ -786,7 +786,7 @@ def mark_post_nsfw(pid, v):
|
|||
def unmark_post_nsfw(pid, v):
|
||||
p = get_post(pid)
|
||||
|
||||
if p.author_id != v.id and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (p.sub and v.mods(p.sub)):
|
||||
if p.author_id != v.id and v.admin_level < PERMS['POST_COMMENT_MODERATION'] and not (p.sub and v.mods(p.sub)):
|
||||
abort(403)
|
||||
|
||||
if p.over_18 and v.is_permabanned:
|
||||
|
|
|
@ -1293,7 +1293,7 @@ def get_saves_and_subscribes(v, template, relationship_cls, page, standalone=Fal
|
|||
ids = [x[0] for x in listing]
|
||||
|
||||
extra = None
|
||||
if not v.admin_level >= PERMS['POST_COMMENT_MODERATION']:
|
||||
if v.admin_level < PERMS['POST_COMMENT_MODERATION']:
|
||||
extra = lambda q:q.filter(cls.is_banned == False, cls.deleted_utc == 0)
|
||||
|
||||
if cls is Post:
|
||||
|
|
Loading…
Reference in New Issue