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

View button uses actor url

main
Bob Mottram 2025-12-18 15:34:58 +00:00
parent 50a08b003f
commit c2b85c5746
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon_post_confirm.py
View File

@ -192,7 +192,7 @@ def follow_confirm2(self, calling_domain: str, cookie: str,
if '&submitView=' in follow_confirm_params: if '&submitView=' in follow_confirm_params:
following_actor = \ following_actor = \
urllib.parse.unquote_plus(follow_confirm_params) urllib.parse.unquote_plus(follow_confirm_params)
following_actor = following_actor.split('actor=')[1] following_actor = following_actor.split('actorUrl=')[1]
if '&' in following_actor: if '&' in following_actor:
following_actor = following_actor.split('&')[0] following_actor = following_actor.split('&')[0]
redirect_headers(self, following_actor, cookie, calling_domain, 303) redirect_headers(self, following_actor, cookie, calling_domain, 303)

5
daemon_utils.py
View File

@ -615,6 +615,7 @@ def show_person_options(self, calling_domain: str, path: str,
page_number = 1 page_number = 1
options_list = options_str.split(';') options_list = options_str.split(';')
options_actor = options_list[0] options_actor = options_list[0]
options_actor_url = options_actor
options_page_number = 1 options_page_number = 1
if len(options_list) > 1: if len(options_list) > 1:
options_page_number = options_list[1] options_page_number = options_list[1]
@ -670,6 +671,9 @@ def show_person_options(self, calling_domain: str, path: str,
options_actor, options_actor,
self.server.person_cache) self.server.person_cache)
if actor_json: if actor_json:
if actor_json.get('url'):
if isinstance(actor_json['url'], str):
options_actor_url = actor_json['url']
if actor_json.get('movedTo'): if actor_json.get('movedTo'):
if isinstance(actor_json['movedTo'], str): if isinstance(actor_json['movedTo'], str):
moved_to = remove_html(actor_json['movedTo']) moved_to = remove_html(actor_json['movedTo'])
@ -750,6 +754,7 @@ def show_person_options(self, calling_domain: str, path: str,
domain_full, domain_full,
origin_path_str, origin_path_str,
options_actor, options_actor,
options_actor_url,
options_profile_url, options_profile_url,
options_link, options_link,
page_number, donate_url, website_url, page_number, donate_url, website_url,

3
webapp_person_options.py
View File

@ -142,6 +142,7 @@ def html_person_options(default_timeline: str,
domain: str, domain_full: str, domain: str, domain_full: str,
origin_path_str: str, origin_path_str: str,
options_actor: str, options_actor: str,
options_actor_url: str,
options_profile_url: str, options_profile_url: str,
options_link: str, options_link: str,
page_number: int, page_number: int,
@ -527,6 +528,8 @@ def html_person_options(default_timeline: str,
str(page_number) + '">\n' str(page_number) + '">\n'
options_str += ' <input type="hidden" name="actor" value="' + \ options_str += ' <input type="hidden" name="actor" value="' + \
options_actor + '">\n' options_actor + '">\n'
options_str += ' <input type="hidden" name="actorUrl" value="' + \
options_actor_url + '">\n'
options_str += ' <input type="hidden" name="avatarUrl" value="' + \ options_str += ' <input type="hidden" name="avatarUrl" value="' + \
options_profile_url + '">\n' options_profile_url + '">\n'