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

Set both ports when sending to non-clearnet instances

merge-requests/30/head
Bob Mottram 2022-03-13 13:09:20 +00:00
parent f1c2ea7002
commit ea025e283f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon.py
View File

@ -8535,10 +8535,12 @@ class PubServer(BaseHTTPRequestHandler):
if following_handle.endswith('.onion'): if following_handle.endswith('.onion'):
curr_session = self.server.session_onion curr_session = self.server.session_onion
proxy_type = 'tor' proxy_type = 'tor'
port = 80
if self.server.i2p_domain: if self.server.i2p_domain:
if following_handle.endswith('.i2p'): if following_handle.endswith('.i2p'):
curr_session = self.server.session_i2p curr_session = self.server.session_i2p
proxy_type = 'i2p' proxy_type = 'i2p'
port = 80
curr_session = \ curr_session = \
self._establish_session("followApproveButton", self._establish_session("followApproveButton",

8
posts.py
View File

@ -3112,12 +3112,16 @@ def _send_to_named_addresses(session, session_onion, session_i2p,
from_domain_full = onion_domain from_domain_full = onion_domain
from_http_prefix = 'http' from_http_prefix = 'http'
curr_session = session_onion curr_session = session_onion
port = 80
to_port = 80
if i2p_domain: if i2p_domain:
if to_domain.endswith('.i2p'): if to_domain.endswith('.i2p'):
from_domain = i2p_domain from_domain = i2p_domain
from_domain_full = i2p_domain from_domain_full = i2p_domain
from_http_prefix = 'http' from_http_prefix = 'http'
curr_session = session_i2p curr_session = session_i2p
port = 80
to_port = 80
cc_list = [] cc_list = []
# if the "to" domain is within the shared items # if the "to" domain is within the shared items
@ -3324,10 +3328,14 @@ def send_to_followers(session, session_onion, session_i2p,
if to_domain.endswith('.onion'): if to_domain.endswith('.onion'):
from_domain = onion_domain from_domain = onion_domain
from_http_prefix = 'http' from_http_prefix = 'http'
port = 80
to_port = 80
if i2p_domain: if i2p_domain:
if to_domain.endswith('.i2p'): if to_domain.endswith('.i2p'):
from_domain = i2p_domain from_domain = i2p_domain
from_http_prefix = 'http' from_http_prefix = 'http'
port = 80
to_port = 80
if with_shared_inbox: if with_shared_inbox:
to_nickname = follower_handles[index].split('@')[0] to_nickname = follower_handles[index].split('@')[0]