diff --git a/files/classes/user.py b/files/classes/user.py index 0299e7e4a..e27d7aac5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -108,7 +108,6 @@ class User(Base): is_banned = Column(Integer, default=0) unban_utc = Column(Integer, default=0) ban_reason = deferred(Column(String)) - club_banned = Column(Boolean, default=False) club_allowed = Column(Boolean, default=False) login_nonce = Column(Integer, default=0) reserved = deferred(Column(String)) @@ -188,7 +187,7 @@ class User(Base): @property @lazy def paid_dues(self): - return self.admin_level > 1 or self.club_allowed or (self.truecoins > int(environ.get("DUES").strip()) and not self.club_banned) + return self.admin_level > 1 or self.club_allowed or self.truecoins > int(environ.get("DUES").strip()) and self.club_allowed != False def any_block_exists(self, other): diff --git a/files/routes/admin.py b/files/routes/admin.py index fe179b8ee..51b32a6e4 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -112,12 +112,10 @@ def club_allow(v, username): if u.admin_level >= v.admin_level: return {"error": "noob"} u.club_allowed = True - u.club_banned = False g.db.add(u) for x in u.alts_unique: x.club_allowed = True - x.club_banned = False g.db.add(x) g.db.commit() @@ -135,11 +133,9 @@ def club_ban(v, username): if u.admin_level >= v.admin_level: return {"error": "noob"} - u.club_banned = True u.club_allowed = False for x in u.alts_unique: - x.club_banned = True u.club_allowed = False g.db.add(x) diff --git a/files/routes/login.py b/files/routes/login.py index 66a35df3d..fc325327f 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -327,8 +327,7 @@ def sign_up_post(v): created_utc=int(time.time()), referred_by=ref_id or None, ban_evade = int(any([(x.is_banned or x.shadowbanned) and not x.unban_utc for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x])), - agendaposter = any([x.agendaposter for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x]), - club_banned=any([x.club_banned for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x]) + agendaposter = any([x.agendaposter for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x]) ) g.db.add(new_user) diff --git a/files/routes/posts.py b/files/routes/posts.py index 352bb5261..eb22a56d3 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -33,7 +33,7 @@ if path.exists(f'snappy_{site_name}.txt'): @auth_required def toggle_club(pid, v): - if v.club_banned: abort(403) + if v.club_allowed == False: abort(403) post = get_post(pid) if post.author_id != v.id and v.admin_level == 0: abort(403) @@ -982,9 +982,9 @@ def submit_post(v): else: template = 'CHRISTMAS/' return render_template(f"{template}submit.html", v=v, error=reason, title=title, url=url, body=request.values.get("body", "")), 403 - if not v.club_banned: club = bool(request.values.get("club","")) - else: club = False - + if v.club_allowed == False: club = False + else: club = bool(request.values.get("club","")) + if embed and len(embed) > 1500: embed = None new_post = Submission( diff --git a/files/templates/default.html b/files/templates/default.html index 1a91d77cd..7be78569c 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -207,7 +207,7 @@ - + {% endif %} {% endblock %} diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index cc61e2ef2..30d71590f 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -5,7 +5,7 @@
- + expanded image
View original diff --git a/files/templates/submission.html b/files/templates/submission.html index 419563d42..a86b6215b 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -213,7 +213,7 @@ {% endif %} - {% if not v.club_banned %} + {% if v.club_allowed != False %} {% endif %} @@ -552,7 +552,7 @@ {% endif %} {% if v %} - {% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %} + {% if v.admin_level > 1 or v.id == p.author.id and v.club_allowed != False %} Mark club Unmark club {% endif %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index e6dbcdb96..799fc6157 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -250,7 +250,7 @@ {% endif %} {% if v %} - {% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %} + {% if v.admin_level > 1 or v.id == p.author.id and v.club_allowed != False %} Mark club Unmark club {% endif %} @@ -412,7 +412,7 @@ {% endif %} - {% if not v.club_banned %} + {% if v.club_allowed != False %} {% endif %} diff --git a/files/templates/submit.html b/files/templates/submit.html index c93a3133d..ea9188f2f 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -138,7 +138,7 @@
- {% if not v.club_banned %} + {% if v.club_allowed != False %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html index b3062a85e..ff2d90d65 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -289,7 +289,7 @@ - + {% endif %} 

 					
User ID: {{u.id}}

@@ -483,7 +483,7 @@
 					{% if v.admin_level > 1 %}
 
 					
-					
+					
 
 						


 						

diff --git a/schema.sql b/schema.sql
index 4ca10c0f2..aa4edfaac 100644
--- a/schema.sql
+++ b/schema.sql
@@ -733,7 +733,6 @@ CREATE TABLE public.users (
     cardview boolean,
     received_award_count integer,
     highlightcomments boolean,
-    club_banned boolean DEFAULT false,
     nitter boolean,
     truecoins integer,
     club_allowed boolean DEFAULT false,