diff --git a/files/classes/user.py b/files/classes/user.py index 626d7845b4..1663e8acd5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -260,7 +260,7 @@ class User(Base, Stndrd, Age_times): @property def banned_by(self): - if not self.is_banned: return None + if not self.is_suspended: return None return g.db.query(User).filter_by(id=self.is_banned).first() def has_badge(self, badgedef_id): diff --git a/files/helpers/wrappers.py b/files/helpers/wrappers.py index 04fef00b8b..510509ad25 100644 --- a/files/helpers/wrappers.py +++ b/files/helpers/wrappers.py @@ -176,7 +176,7 @@ def admin_level_required(x): if not v: abort(401) - if v.is_banned: + if v.is_suspended: abort(403) if v.admin_level < x: diff --git a/files/routes/discord.py b/files/routes/discord.py index 3eda9ee73b..5160dbe98e 100644 --- a/files/routes/discord.py +++ b/files/routes/discord.py @@ -15,7 +15,7 @@ WELCOME_CHANNEL="846509313941700618" @auth_required def join_discord(v): - if v.is_banned != 0: return "You're banned" + if v.is_suspended != 0: return "You're banned" if 'rdrama' in request.host and v.admin_level == 0 and v.patron == 0 and v.coins < 150: return f"You must earn 150 {COINS_NAME} before entering the Discord server. You earn {COINS_NAME} by making posts/comments and getting upvoted."