From ccd58da8e9cf299b2a3cf722ecc77147856b1d72 Mon Sep 17 00:00:00 2001 From: missytake Date: Wed, 17 Jun 2026 11:34:40 +0200 Subject: [PATCH] fix: show privacy email or invite as link fix #635 --- chatmaild/src/chatmaild/config.py | 2 +- chatmaild/src/chatmaild/ini/chatmail.ini.f | 4 ++-- cmdeploy/src/cmdeploy/www.py | 15 ++++++--------- www/src/privacy.md | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index 591fd3e0..9f2f62f5 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -71,7 +71,7 @@ class Config: self.iroh_relay = iroh_relay.strip() self.enable_iroh_relay = False self.privacy_postal = params.pop("privacy_postal", None) - self.privacy_mail = params.pop("privacy_mail", None) + self.privacy_mail = params.pop("admin_contact", params.pop("privacy_mail", None)) self.privacy_pdo = params.pop("privacy_pdo", None) self.privacy_supervisor = params.pop("privacy_supervisor", None) diff --git a/chatmaild/src/chatmaild/ini/chatmail.ini.f b/chatmaild/src/chatmaild/ini/chatmail.ini.f index bb138704..92202ccd 100644 --- a/chatmaild/src/chatmaild/ini/chatmail.ini.f +++ b/chatmaild/src/chatmaild/ini/chatmail.ini.f @@ -109,8 +109,8 @@ mail_domain = {mail_domain} # postal address of privacy contact privacy_postal = -# email address of privacy contact -privacy_mail = +# email address or invite link of admin contact +admin_contact = # postal address of the privacy data officer privacy_pdo = diff --git a/cmdeploy/src/cmdeploy/www.py b/cmdeploy/src/cmdeploy/www.py index 9b543c6e..02f937d2 100644 --- a/cmdeploy/src/cmdeploy/www.py +++ b/cmdeploy/src/cmdeploy/www.py @@ -94,15 +94,12 @@ def _build_webpages(src_dir, build_dir, config): for path in src_dir.iterdir(): if path.suffix == ".md": render_vars, content = prepare_template(path) - render_vars["username_min_length"] = int_to_english( - config.username_min_length - ) - render_vars["username_max_length"] = int_to_english( - config.username_max_length - ) - render_vars["password_min_length"] = int_to_english( - config.password_min_length - ) + if config.privacy_mail.startswith("https://"): + render_vars["admin_contact"] = f"{config.privacy_mail}" + elif "@" in config.privacy_mail: + render_vars["admin_contact"] = f"{config.privacy_mail}" + else: + render_vars["admin_contact"] = config.privacy_mail target = build_dir.joinpath(path.stem + ".html") # recursive jinja2 rendering diff --git a/www/src/privacy.md b/www/src/privacy.md index a6626960..063aed75 100644 --- a/www/src/privacy.md +++ b/www/src/privacy.md @@ -48,7 +48,7 @@ Responsible for the processing of your personal data is: {{ config.privacy_postal }} ``` -E-mail: {{ config.privacy_mail }} +E-mail: {{ admin_contact }} We have appointed a data protection officer: