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

Set from domain when searching for onion handle from clearnet

merge-requests/30/head
Bob Mottram 2022-03-11 16:13:40 +00:00
parent ae9c77870e
commit 259016b725
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -3858,7 +3858,9 @@ class PubServer(BaseHTTPRequestHandler):
signing_priv_key_pem, signing_priv_key_pem,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone,
self.server.onion_domain,
self.server.i2p_domain)
if profile_str: if profile_str:
msg = profile_str.encode('utf-8') msg = profile_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)

16
webapp_profile.py
View File

@ -144,7 +144,8 @@ def html_profile_after_search(css_cache: {},
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
cw_lists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
timezone: str) -> str: timezone: str,
onion_domain: str, i2p_domain: str) -> str:
"""Show a profile page after a search for a fediverse address """Show a profile page after a search for a fediverse address
""" """
http = False http = False
@ -153,8 +154,17 @@ def html_profile_after_search(css_cache: {},
http = True http = True
elif http_prefix == 'gnunet': elif http_prefix == 'gnunet':
gnunet = True gnunet = True
from_domain = domain
if onion_domain:
if '.onion/' in profile_handle or profile_handle.endswith('.onion'):
from_domain = onion_domain
http = True
if i2p_domain:
if '.i2p/' in profile_handle or profile_handle.endswith('.i2p'):
from_domain = i2p_domain
http = True
profile_json, as_header = \ profile_json, as_header = \
get_actor_json(domain, profile_handle, http, gnunet, debug, False, get_actor_json(from_domain, profile_handle, http, gnunet, debug, False,
signing_priv_key_pem, session) signing_priv_key_pem, session)
if not profile_json: if not profile_json:
return None return None
@ -327,7 +337,7 @@ def html_profile_after_search(css_cache: {},
user_feed = \ user_feed = \
parse_user_feed(signing_priv_key_pem, parse_user_feed(signing_priv_key_pem,
session, outbox_url, as_header, project_version, session, outbox_url, as_header, project_version,
http_prefix, domain, debug) http_prefix, from_domain, debug)
if user_feed: if user_feed:
i = 0 i = 0
for item in user_feed: for item in user_feed: