diff --git a/files/routes/admin.py b/files/routes/admin.py index 8e642dbfa..0187d71c9 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -340,6 +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, diff --git a/files/routes/users.py b/files/routes/users.py index c6f181c65..1a5881b03 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -173,6 +173,7 @@ def user_voted_comments(v:User, username): def banned(v:User): users = g.db.query(User).filter( User.is_banned > 0, + User.truescore > 0, or_(User.unban_utc == 0, User.unban_utc > time.time()), not_(and_( User.profileurl.startswith('/e/'), @@ -204,6 +205,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/'),