indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Show status on person options screen

main
Bob Mottram 2025-05-15 17:07:10 +01:00
parent cd4e13db06
commit b4dd368061
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon_utils.py
View File

@ -662,6 +662,7 @@ def show_person_options(self, calling_domain: str, path: str,
also_known_as = None also_known_as = None
moved_to = '' moved_to = ''
repo_url = None repo_url = None
status = None
actor_json = \ actor_json = \
get_person_from_cache(base_dir, get_person_from_cache(base_dir,
options_actor, options_actor,
@ -701,6 +702,11 @@ def show_person_options(self, calling_domain: str, path: str,
if actor_json.get('alsoKnownAs'): if actor_json.get('alsoKnownAs'):
also_known_as = remove_html(actor_json['alsoKnownAs']) also_known_as = remove_html(actor_json['alsoKnownAs'])
repo_url = get_repo_url(actor_json) 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 access_keys = self.server.access_keys
nickname = 'instance' nickname = 'instance'
@ -763,7 +769,9 @@ def show_person_options(self, calling_domain: str, path: str,
youtube, peertube, pixelfed, youtube, peertube, pixelfed,
discord, music_site_url, discord, music_site_url,
art_site_url, art_site_url,
self.server.mitm_servers) self.server.mitm_servers,
status,
self.server.system_language)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)

13
webapp_person_options.py
View File

@ -40,6 +40,7 @@ from webapp_utils import get_banner_file
from webapp_utils import html_hide_from_screen_reader from webapp_utils import html_hide_from_screen_reader
from webapp_utils import minimizing_attached_images from webapp_utils import minimizing_attached_images
from blocking import allowed_announce from blocking import allowed_announce
from filters import is_filtered
def _minimize_attached_images(base_dir: str, nickname: str, domain: str, def _minimize_attached_images(base_dir: str, nickname: str, domain: str,
@ -179,7 +180,9 @@ def html_person_options(default_timeline: str,
discord: str, discord: str,
music_site_url: str, music_site_url: str,
art_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 """Show options for a person: view/follow/block/report
""" """
options_link_str = '' options_link_str = ''
@ -396,6 +399,14 @@ def html_person_options(default_timeline: str,
if ctr > 0: if ctr > 0:
options_str += other_accounts_html 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 += \
' <p class="imText">' + remove_html(status) + '</p>\n'
if pronouns: if pronouns:
options_str += \ options_str += \
' <p class="imText">' + translate['Pronouns'] + \ ' <p class="imText">' + translate['Pronouns'] + \