mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-04-05 11:22:30 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

for 'warn' filtered posts, parse and display a modified text on them (we must add a way to display those later)

Browse Source
This commit is contained in:
Manuel Cortez 2025-03-03 11:59:14 -06:00
parent c76134b064
commit 3dae674c4e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sessions/mastodon/compose.py
View File

@ -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)) text = _("Boosted from @{}: {}").format(post.reblog.account.acct, templates.process_text(post.reblog, safe=safe))
else: else:
text = templates.process_text(post, safe=safe) 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", "") source = post.get("application", "")
# "" means remote user, None for legacy apps so we should cover both sides. # "" means remote user, None for legacy apps so we should cover both sides.
if source != None and source != "": 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))) 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": elif notification.type == "follow_request":
text = _("{username} wants to follow you.").format(username=user) 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] return [user, text, ts]

6
src/sessions/mastodon/templates.py
View File

@ -75,6 +75,9 @@ def render_post(post, template, settings, relative_times=False, offset_hours=0):
else: else:
text = process_text(post, safe=False) text = process_text(post, safe=False)
safe_text = process_text(post) 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_settings = dict(public=_("Public"), unlisted=_("Not listed"), private=_("Followers only"), direct=_("Direct"))
visibility = visibility_settings.get(post.visibility) visibility = visibility_settings.get(post.visibility)
available_data.update(lang=post.language, text=text, safe_text=safe_text, visibility=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)) 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": elif notification.type == "follow_request":
text = _("wants to follow you.") 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) available_data.update(text=text)
result = Template(_(template)).safe_substitute(**available_data) result = Template(_(template)).safe_substitute(**available_data)
result = result.replace(" . ", "") result = result.replace(" . ", "")