From 99b816562c644e5c27ff6dec5a2b052600033088 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Sun, 20 Jul 2025 22:12:49 +0200 Subject: [PATCH 1/3] fix account suspension logic, aest' fixes, add ability to suspend user from admin panel, 0.4.0 feature freeze --- CHANGELOG.md | 3 ++- freak/models.py | 10 ++++++-- freak/static/sass/layout.sass | 6 +++++ freak/templates/403.html | 2 +- freak/templates/404.html | 2 +- freak/templates/405.html | 2 +- freak/templates/admin/admin_user_detail.html | 16 +++++++++++++ freak/website/admin.py | 25 ++++++++++++++++++-- 8 files changed, 58 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40a4377..be61e29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,9 @@ - Moderators (and admins) have now access to mod tools + Allowed operations: change display name, description, restriction status, and exile (guild-local ban) members + Site administrators and guild owners can add moderators -- Administrators can claim ownership of abandoned guilds - Guilds can have restricted posting/commenting now. Unmoderated guilds always have. +- Administrators can claim ownership of abandoned guilds +- Admins can now suspend users from admin panel - Implemented guild subscriptions (not as in $$$, yes as in the follow button) - Minimum karma requirement for creating a guild is now configurable via env variable `FREAK_CREATE_GUILD_THRESHOLD` (previously hardcoded at 15) - Users can now set their display name, biography and color theme in `/settings` diff --git a/freak/models.py b/freak/models.py index 6e68213..25f4485 100644 --- a/freak/models.py +++ b/freak/models.py @@ -54,7 +54,7 @@ post_report_reasons = [ REPORT_REASON_STRINGS = { **{x.num_code: x.description for x in post_report_reasons}, **{x.code: x.description for x in post_report_reasons} } -REPORT_REASONS = {x.code: x.num_code for x in post_report_reasons} +REPORT_REASONS: dict[str, int] = {x.code: x.num_code for x in post_report_reasons} REPORT_TARGET_POST = 1 REPORT_TARGET_COMMENT = 2 @@ -175,7 +175,13 @@ class User(Base): @property def is_disabled(self): - return (self.banned_at is not None and (self.banned_until is None or self.banned_until <= datetime.datetime.now())) or self.is_disabled_by_user + now = datetime.datetime.now() + return ( + # suspended + (self.banned_at is not None and (self.banned_until is None or self.banned_until >= now)) or + # self-disabled + self.is_disabled_by_user + ) @property def is_active(self): diff --git a/freak/static/sass/layout.sass b/freak/static/sass/layout.sass index 9325fb7..ae79fd1 100644 --- a/freak/static/sass/layout.sass +++ b/freak/static/sass/layout.sass @@ -310,6 +310,12 @@ button, [type="submit"], [type="reset"], [type="button"] &[disabled] opacity: .5 cursor: not-allowed + border: var(--border) + color: var(--border) + + &.primary[disabled] + color: var(--background) + background-color: var(--border) &:first-child margin-inline-start: 0 diff --git a/freak/templates/403.html b/freak/templates/403.html index f13fb50..ee4f511 100644 --- a/freak/templates/403.html +++ b/freak/templates/403.html @@ -2,7 +2,7 @@ {% from "macros/title.html" import title_tag with context %} {% block title %} - {{ title_tag('X _ X') }} + {{ title_tag('X _ X') }} {% endblock %} {% block body %} diff --git a/freak/templates/404.html b/freak/templates/404.html index e3b427a..4a9f92b 100644 --- a/freak/templates/404.html +++ b/freak/templates/404.html @@ -2,7 +2,7 @@ {% from "macros/title.html" import title_tag with context %} {% block title %} - {{ title_tag('O _ O') }} + {{ title_tag('O _ O') }} {% endblock %} {% block body %} diff --git a/freak/templates/405.html b/freak/templates/405.html index 0151dcc..02c926b 100644 --- a/freak/templates/405.html +++ b/freak/templates/405.html @@ -2,7 +2,7 @@ {% from "macros/title.html" import title_tag with context %} {% block title %} - {{ title_tag('O _ O') }} + {{ title_tag('O _ O') }} {% endblock %} {% block body %} diff --git a/freak/templates/admin/admin_user_detail.html b/freak/templates/admin/admin_user_detail.html index 52b1cd3..36f8cb3 100644 --- a/freak/templates/admin/admin_user_detail.html +++ b/freak/templates/admin/admin_user_detail.html @@ -24,7 +24,23 @@ {% endif %} +

Quick Actions

+ + +
+ {% if u.banned_at %} + + {% else %} + + + {% endif %}

Strikes

diff --git a/freak/website/admin.py b/freak/website/admin.py index 1a75ed1..682f749 100644 --- a/freak/website/admin.py +++ b/freak/website/admin.py @@ -10,10 +10,12 @@ from markupsafe import Markup from sqlalchemy import insert, select, update from suou import additem, not_implemented -from ..models import REPORT_REASON_STRINGS, REPORT_TARGET_COMMENT, REPORT_TARGET_POST, REPORT_UPDATE_COMPLETE, REPORT_UPDATE_ON_HOLD, REPORT_UPDATE_REJECTED, Comment, Post, PostReport, User, UserStrike, db +from ..models import REPORT_REASON_STRINGS, REPORT_REASONS, REPORT_TARGET_COMMENT, REPORT_TARGET_POST, REPORT_UPDATE_COMPLETE, REPORT_UPDATE_ON_HOLD, REPORT_UPDATE_REJECTED, Comment, Post, PostReport, User, UserStrike, db bp = Blueprint('admin', __name__) +current_user: User + ## TODO make admin interface def admin_required(func: Callable): @@ -191,7 +193,26 @@ def user_detail(id: int): if u is None: abort(404) if request.method == 'POST': - abort(501) + action = request.form['do'] + if action == 'suspend': + u.banned_at = datetime.datetime.now() + u.banned_by_id = current_user.id + u.banned_reason = REPORT_REASONS.get(request.form.get('reason'), 0) + db.session.commit() + elif action == 'unsuspend': + u.banned_at = None + u.banned_by_id = None + u.banned_until = None + u.banned_reason = None + db.session.commit() + elif action == 'to_3d': + u.banned_at = datetime.datetime.now() + u.banned_until = datetime.datetime.now() + datetime.timedelta(days=3) + u.banned_by_id = current_user.id + u.banned_reason = REPORT_REASONS.get(request.form.get('reason'), 0) + db.session.commit() + else: + abort(400) strikes = db.session.execute(select(UserStrike).where(UserStrike.user_id == id).order_by(UserStrike.id.desc())).scalars() return render_template('admin/admin_user_detail.html', u=u, report_reasons=REPORT_REASON_STRINGS, account_status_string=colorized_account_status_string, strikes=strikes) From 48f05820964195ab206279c479ae8443ec164908 Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Sun, 20 Jul 2025 22:27:34 +0200 Subject: [PATCH 2/3] fix JS bug, outlaw something more --- freak/models.py | 23 ++++++++++++----------- freak/static/js/lib.js | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/freak/models.py b/freak/models.py index 25f4485..904c969 100644 --- a/freak/models.py +++ b/freak/models.py @@ -66,21 +66,22 @@ REPORT_UPDATE_ON_HOLD = 3 USERNAME_RE = r'[a-z2-9_-][a-z0-9_-]+' -ILLEGAL_USERNAMES = ( +ILLEGAL_USERNAMES = tuple(( ## masspings and administrative claims - 'me', 'everyone', 'here', 'room', 'all', 'any', 'founder', 'owner', - 'admin', 'administrator', 'mod', 'modteam', 'moderator', 'sysop', 'server', 'app' + 'me everyone here room all any server app dev devel develop nil none ' + 'founder owner admin administrator mod modteam moderator sysop some ' ## fictitious users and automations - 'nobody', 'deleted', 'suspended', 'default', 'bot', 'developer', 'undefined', 'null', - 'ai', 'automod', 'automoderator', 'assistant', 'privacy', 'anonymous', 'removed' + 'nobody deleted suspended default bot developer undefined null ' + 'ai automod automoderator assistant privacy anonymous removed assistance ' ## law enforcement corps and slurs because yes - 'pedo', 'rape', 'rapist', 'nigger', 'retard', 'ncmec', 'police', 'cops', '911', 'childsafety', - 'report', 'dmca', 'login', 'logout', 'security', 'order66', 'gestapo', 'ss', 'hitler', - 'pedophile', 'lolicon', 'giphy', 'tenor', 'csam', 'cp', 'pedobear', 'lolita', - 'loli', 'kkk', 'pnf', 'adl', 'cop', 'tranny', 'google', 'trustandsafety', 'safety', 'ice', + 'pedo rape rapist nigger retard ncmec police cops 911 childsafety ' + 'report dmca login logout security order66 gestapo ss hitler heilhitler kgb ' + 'pedophile lolicon giphy tenor csam cp pedobear lolita lolice thanos ' + 'loli kkk pnf adl cop tranny google trustandsafety safety ice fbi nsa it ' ## VVVVIP - 'potus', 'realdonaldtrump', 'elonmusk', 'teddysphotos', 'mrbeast', 'jkrowling', 'pewdiepie' -) + 'potus realdonaldtrump elonmusk teddysphotos mrbeast jkrowling pewdiepie ' + 'elizabethii king queen pontifex hogwarts lumos alohomora ' +).split()) def username_is_legal(username: str) -> bool: if len(username) < 2 or len(username) > 100: diff --git a/freak/static/js/lib.js b/freak/static/js/lib.js index 450d97c..a9d7557 100644 --- a/freak/static/js/lib.js +++ b/freak/static/js/lib.js @@ -45,7 +45,7 @@ usernameInputMessage.className = 'username-input-message error'; return; } - if (!resp.is_legal) { + if (resp.is_valid === false) { usernameInputMessage.innerHTML = "You can't use this username."; usernameInputMessage.className = 'username-input-message error'; return; From a1dffc6a371869b0504f038badbe79f2bb0c1b9f Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Mon, 21 Jul 2025 00:00:13 +0200 Subject: [PATCH 3/3] don't suggest posting in restricted communities ~ --- freak/models.py | 2 +- freak/templates/base.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freak/models.py b/freak/models.py index 904c969..caf4e72 100644 --- a/freak/models.py +++ b/freak/models.py @@ -80,7 +80,7 @@ ILLEGAL_USERNAMES = tuple(( 'loli kkk pnf adl cop tranny google trustandsafety safety ice fbi nsa it ' ## VVVVIP 'potus realdonaldtrump elonmusk teddysphotos mrbeast jkrowling pewdiepie ' - 'elizabethii king queen pontifex hogwarts lumos alohomora ' + 'elizabethii king queen pontifex hogwarts lumos alohomora isis daesh ' ).split()) def username_is_legal(username: str) -> bool: diff --git a/freak/templates/base.html b/freak/templates/base.html index 4833a27..a4eb90c 100644 --- a/freak/templates/base.html +++ b/freak/templates/base.html @@ -47,7 +47,7 @@ {% elif current_user.is_authenticated %}
  • - + {{ icon('add') }} New post