From 3dae674c4e583213ae113fb35f00e5e86aaa586b Mon Sep 17 00:00:00 2001 From: Manuel cortez Date: Mon, 3 Mar 2025 11:59:14 -0600 Subject: [PATCH] for 'warn' filtered posts, parse and display a modified text on them (we must add a way to display those later) --- src/sessions/mastodon/compose.py | 6 ++++++ src/sessions/mastodon/templates.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/sessions/mastodon/compose.py b/src/sessions/mastodon/compose.py index a4591618..d95cc6c4 100644 --- a/src/sessions/mastodon/compose.py +++ b/src/sessions/mastodon/compose.py @@ -17,6 +17,9 @@ def compose_post(post, db, settings, relative_times, show_screen_names, safe=Tru text = _("Boosted from @{}: {}").format(post.reblog.account.acct, templates.process_text(post.reblog, safe=safe)) else: text = templates.process_text(post, safe=safe) + filtered = utils.evaluate_filters(post=post, current_context="home") + if filtered != None: + text = _("hidden by filter {}").format(filtered) source = post.get("application", "") # "" means remote user, None for legacy apps so we should cover both sides. if source != None and source != "": @@ -73,4 +76,7 @@ def compose_notification(notification, db, settings, relative_times, show_screen text = _("A poll in which you have voted has expired: {status}").format(status=",".join(compose_post(notification.status, db, settings, relative_times, show_screen_names, safe=safe))) elif notification.type == "follow_request": text = _("{username} wants to follow you.").format(username=user) + filtered = utils.evaluate_filters(post=notification, current_context="notifications") + if filtered != None: + text = _("hidden by filter {}").format(filtered) return [user, text, ts] \ No newline at end of file diff --git a/src/sessions/mastodon/templates.py b/src/sessions/mastodon/templates.py index 1b972560..1318f226 100644 --- a/src/sessions/mastodon/templates.py +++ b/src/sessions/mastodon/templates.py @@ -75,6 +75,9 @@ def render_post(post, template, settings, relative_times=False, offset_hours=0): else: text = process_text(post, safe=False) safe_text = process_text(post) + filtered = utils.evaluate_filters(post=post, current_context="home") + if filtered != None: + text = _("hidden by filter {}").format(filtered) visibility_settings = dict(public=_("Public"), unlisted=_("Not listed"), private=_("Followers only"), direct=_("Direct")) visibility = visibility_settings.get(post.visibility) available_data.update(lang=post.language, text=text, safe_text=safe_text, visibility=visibility) @@ -161,6 +164,9 @@ def render_notification(notification, template, post_template, settings, relativ text = _("A poll in which you have voted has expired: {status}").format(status=render_post(notification.status, post_template, settings, relative_times, offset_hours)) elif notification.type == "follow_request": text = _("wants to follow you.") + filtered = utils.evaluate_filters(post=notification, current_context="notifications") + if filtered != None: + text = _("hidden by filter {}").format(filtered) available_data.update(text=text) result = Template(_(template)).safe_substitute(**available_data) result = result.replace(" . ", "")