From 22148634968b53aa5ae2ab13679d888997483ace Mon Sep 17 00:00:00 2001 From: Yusur Princeps Date: Mon, 14 Jul 2025 14:47:02 +0200 Subject: [PATCH] hide comment area when not authenticated, outlaw more usernames --- freak/models.py | 15 ++++++++++++--- freak/templates/403.html | 3 ++- freak/templates/404.html | 3 ++- freak/templates/405.html | 3 ++- freak/templates/macros/create.html | 4 ++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/freak/models.py b/freak/models.py index dd807e4..e52aa3a 100644 --- a/freak/models.py +++ b/freak/models.py @@ -66,10 +66,19 @@ REPORT_UPDATE_ON_HOLD = 3 USERNAME_RE = r'[a-z2-9_-][a-z0-9_-]+' ILLEGAL_USERNAMES = ( - ## reserved for masspings and administrative claims - 'me', 'everyone', 'here', 'admin', 'mod', 'modteam', 'moderator', 'sysop', 'room', 'all', 'any', 'nobody', 'deleted', 'suspended', 'owner', 'administrator', 'ai', + ## masspings and administrative claims + 'me', 'everyone', 'here', 'room', 'all', 'any', 'founder', 'owner', + 'admin', 'administrator', 'mod', 'modteam', 'moderator', 'sysop', 'server', 'app' + ## fictitious users and automations + 'nobody', 'deleted', 'suspended', 'default', 'bot', 'developer', 'undefined', 'null', + 'ai', 'automod', 'automoderator', 'assistant', 'privacy', 'anonymous', 'removed' ## law enforcement corps and slurs because yes - 'pedo', 'rape', 'rapist', 'nigger', 'retard', 'ncmec', 'police', 'cops', '911', 'childsafety', 'report', 'dmca' + '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', + ## VVVVIP + 'potus', 'realdonaldtrump', 'elonmusk', 'teddysphotos', 'mrbeast', 'jkrowling' ) def username_is_legal(username: str) -> bool: diff --git a/freak/templates/403.html b/freak/templates/403.html index 0826e46..f13fb50 100644 --- a/freak/templates/403.html +++ b/freak/templates/403.html @@ -1,7 +1,8 @@ {% extends "base.html" %} +{% from "macros/title.html" import title_tag with context %} {% block title %} - X _ X; on {{ app_name }} + {{ title_tag('X _ X') }} {% endblock %} {% block body %} diff --git a/freak/templates/404.html b/freak/templates/404.html index dae2961..e3b427a 100644 --- a/freak/templates/404.html +++ b/freak/templates/404.html @@ -1,7 +1,8 @@ {% extends "base.html" %} +{% from "macros/title.html" import title_tag with context %} {% block title %} - O _ O; on {{ app_name }} + {{ title_tag('O _ O') }} {% endblock %} {% block body %} diff --git a/freak/templates/405.html b/freak/templates/405.html index c3cde64..0151dcc 100644 --- a/freak/templates/405.html +++ b/freak/templates/405.html @@ -1,7 +1,8 @@ {% extends "base.html" %} +{% from "macros/title.html" import title_tag with context %} {% block title %} - O _ O; on {{ app_name }} + {{ title_tag('O _ O') }} {% endblock %} {% block body %} diff --git a/freak/templates/macros/create.html b/freak/templates/macros/create.html index 61fd95f..6a3a609 100644 --- a/freak/templates/macros/create.html +++ b/freak/templates/macros/create.html @@ -23,6 +23,7 @@ disabled="" {% endmacro %} {% macro comment_area(url) %} +{% if current_user.is_authenticated %}
@@ -34,4 +35,7 @@ disabled=""
+{% else %} +
Log in to leave a comment
+{% endif %} {% endmacro %} \ No newline at end of file