diff --git a/daemon_utils.py b/daemon_utils.py index 0d7e51cfd..a4299e46c 100644 --- a/daemon_utils.py +++ b/daemon_utils.py @@ -662,6 +662,7 @@ def show_person_options(self, calling_domain: str, path: str, also_known_as = None moved_to = '' repo_url = None + status = None actor_json = \ get_person_from_cache(base_dir, options_actor, @@ -701,6 +702,11 @@ def show_person_options(self, calling_domain: str, path: str, if actor_json.get('alsoKnownAs'): also_known_as = remove_html(actor_json['alsoKnownAs']) repo_url = get_repo_url(actor_json) + # https://codeberg.org/fediverse/fep/src/branch/main/ + # fep/82f6/fep-82f6.md + if actor_json.get('sm:status'): + if isinstance(actor_json['sm:status'], str): + status = actor_json['sm:status'] access_keys = self.server.access_keys nickname = 'instance' @@ -763,7 +769,9 @@ def show_person_options(self, calling_domain: str, path: str, youtube, peertube, pixelfed, discord, music_site_url, art_site_url, - self.server.mitm_servers) + self.server.mitm_servers, + status, + self.server.system_language) if msg: msg = msg.encode('utf-8') msglen = len(msg) diff --git a/webapp_person_options.py b/webapp_person_options.py index bbddffeac..76dc360f1 100644 --- a/webapp_person_options.py +++ b/webapp_person_options.py @@ -40,6 +40,7 @@ from webapp_utils import get_banner_file from webapp_utils import html_hide_from_screen_reader from webapp_utils import minimizing_attached_images from blocking import allowed_announce +from filters import is_filtered def _minimize_attached_images(base_dir: str, nickname: str, domain: str, @@ -179,7 +180,9 @@ def html_person_options(default_timeline: str, discord: str, music_site_url: str, art_site_url: str, - mitm_servers: []) -> str: + mitm_servers: [], + status: str, + system_language: str) -> str: """Show options for a person: view/follow/block/report """ options_link_str = '' @@ -396,6 +399,14 @@ def html_person_options(default_timeline: str, if ctr > 0: options_str += other_accounts_html + if status: + if len(status) < 100 and \ + not is_filtered(base_dir, nickname, domain, status, + system_language): + # https://codeberg.org/fediverse/fep/src/branch/main/ + # fep/82f6/fep-82f6.md + options_str += \ + '
' + remove_html(status) + '
\n' if pronouns: options_str += \ '' + translate['Pronouns'] + \