diff --git a/files/routes/admin.py b/files/routes/admin.py index a7ce6cfb3..99510442f 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -340,14 +340,7 @@ def shadowbanned(v): users = g.db.query(User) \ .filter( User.shadowbanned != None, - User.truescore > 0, - not_(and_( - User.profileurl.startswith('/e/'), - User.customtitle==None, - User.namecolor == DEFAULT_COLOR, - User.patron == 0, - User.truescore < 100, - )) + User.truescore >= 100, ) \ .order_by(nullslast(User.last_active.desc())).all() diff --git a/files/routes/users.py b/files/routes/users.py index c2d64ff8d..faa060e81 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -173,15 +173,8 @@ def user_voted_comments(v:User, username): def banned(v:User): users = g.db.query(User).filter( User.is_banned != None, - User.truescore > 0, or_(User.unban_utc == 0, User.unban_utc > time.time()), - not_(and_( - User.profileurl.startswith('/e/'), - User.customtitle==None, - User.namecolor == DEFAULT_COLOR, - User.patron == 0, - User.truescore < 100, - )) + User.truescore >= 100, ) if v.admin_level >= PERMS['VIEW_LAST_ACTIVE']: users = users.order_by(nullslast(User.last_active.desc())) @@ -206,15 +199,7 @@ def grassed(v:User): @auth_required def chuds(v:User): users = g.db.query(User).filter( - User.truescore > 0, or_(User.agendaposter == 1, User.agendaposter > time.time()), - not_(and_( - User.profileurl.startswith('/e/'), - User.customtitle==None, - User.namecolor == DEFAULT_COLOR, - User.patron == 0, - User.truescore < 100, - )) ) if v.admin_level >= PERMS['VIEW_LAST_ACTIVE']: users = users.order_by(nullslast(User.last_active.desc())) diff --git a/files/templates/admin/shadowbanned.html b/files/templates/admin/shadowbanned.html index 8c2fb66bb..4f1f3e890 100644 --- a/files/templates/admin/shadowbanned.html +++ b/files/templates/admin/shadowbanned.html @@ -2,6 +2,7 @@ {% block pagetitle %}Shadowbanned Users{% endblock %} {% block content %} +
Shadowbanned Users (>= 100 Truscore)
diff --git a/files/templates/banned.html b/files/templates/banned.html index 10b1f1fe6..7814d3a91 100644 --- a/files/templates/banned.html +++ b/files/templates/banned.html @@ -2,7 +2,7 @@ {% block pagetitle %}Banned Users{% endblock %} {% block content %} -
Banned Users
+
Banned Users (>= 100 Truscore)