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

yggdrasil flag

main
bashrc 2026-02-23 17:50:18 +00:00
parent d58e567498
commit 371d6d2c94
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epicyon.py
View File

@ -75,6 +75,7 @@ from tests import test_update_actor
from tests import run_all_tests from tests import run_all_tests
from auth import store_basic_credentials from auth import store_basic_credentials
from auth import create_password from auth import create_password
from utils import is_yggdrasil_url
from utils import get_event_categories from utils import get_event_categories
from utils import replace_strings from utils import replace_strings
from utils import set_accounts_data_dir from utils import set_accounts_data_dir
@ -658,6 +659,9 @@ def _command_options() -> None:
parser.add_argument("--i2p", type=str2bool, nargs='?', parser.add_argument("--i2p", type=str2bool, nargs='?',
const=True, default=False, const=True, default=False,
help="Use i2p protocol only") help="Use i2p protocol only")
parser.add_argument("--yggdrasil", type=str2bool, nargs='?',
const=True, default=False,
help="Use yggdrasil protocol only")
parser.add_argument("--tor", type=str2bool, nargs='?', parser.add_argument("--tor", type=str2bool, nargs='?',
const=True, default=False, const=True, default=False,
help="Route via Tor") help="Route via Tor")
@ -937,7 +941,7 @@ def _command_options() -> None:
sys.exit() sys.exit()
http_prefix = 'https' http_prefix = 'https'
if argb.http or argb.i2p or argb.yggdrasil_domain: if argb.http or argb.i2p or argb.yggdrasil:
http_prefix = 'http' http_prefix = 'http'
elif argb.ipfs: elif argb.ipfs:
http_prefix = 'ipfs' http_prefix = 'ipfs'
@ -1035,7 +1039,7 @@ def _command_options() -> None:
proxy_type = 'i2p' proxy_type = 'i2p'
if domain.endswith('.i2p'): if domain.endswith('.i2p'):
argb.port = 80 argb.port = 80
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'yggdrasil' proxy_type = 'yggdrasil'
if is_yggdrasil_address(domain): if is_yggdrasil_address(domain):
argb.port = 80 argb.port = 80
@ -1084,7 +1088,7 @@ def _command_options() -> None:
proxy_type = 'i2p' proxy_type = 'i2p'
if domain.endswith('.i2p'): if domain.endswith('.i2p'):
argb.port = 80 argb.port = 80
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'yggdrasil' proxy_type = 'yggdrasil'
if is_yggdrasil_address(domain): if is_yggdrasil_address(domain):
argb.port = 80 argb.port = 80
@ -1124,7 +1128,7 @@ def _command_options() -> None:
proxy_type = 'i2p' proxy_type = 'i2p'
if domain.endswith('.i2p'): if domain.endswith('.i2p'):
argb.port = 80 argb.port = 80
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'yggdrasil' proxy_type = 'yggdrasil'
if is_yggdrasil_address(domain): if is_yggdrasil_address(domain):
argb.port = 80 argb.port = 80
@ -1188,7 +1192,7 @@ def _command_options() -> None:
proxy_type = 'i2p' proxy_type = 'i2p'
if domain.endswith('.i2p'): if domain.endswith('.i2p'):
argb.port = 80 argb.port = 80
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'yggdrasil' proxy_type = 'yggdrasil'
if is_yggdrasil_address(domain): if is_yggdrasil_address(domain):
argb.port = 80 argb.port = 80
@ -1244,7 +1248,7 @@ def _command_options() -> None:
proxy_type = 'i2p' proxy_type = 'i2p'
if domain.endswith('.i2p'): if domain.endswith('.i2p'):
argb.port = 80 argb.port = 80
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'i2p' proxy_type = 'i2p'
if is_yggdrasil_address(domain): if is_yggdrasil_address(domain):
argb.port = 80 argb.port = 80
@ -1339,7 +1343,7 @@ def _command_options() -> None:
proxy_type = 'tor' proxy_type = 'tor'
elif argb.i2p or domain.endswith('.i2p'): elif argb.i2p or domain.endswith('.i2p'):
proxy_type = 'i2p' proxy_type = 'i2p'
elif argb.yggdrasil_domain or is_yggdrasil_address(domain): elif argb.yggdrasil or is_yggdrasil_address(domain):
proxy_type = 'yggdrasil' proxy_type = 'yggdrasil'
elif argb.gnunet: elif argb.gnunet:
proxy_type = 'gnunet' proxy_type = 'gnunet'
@ -1399,6 +1403,9 @@ def _command_options() -> None:
elif '.i2p' in argb.instance_software: elif '.i2p' in argb.instance_software:
proxy_type = 'i2p' proxy_type = 'i2p'
http_prefix = 'http' http_prefix = 'http'
elif is_yggdrasil_url(argb.instance_software):
proxy_type = 'yggdrasil'
http_prefix = 'http'
if '://' not in argb.instance_software: if '://' not in argb.instance_software:
argb.instance_software = \ argb.instance_software = \
http_prefix + '://' + argb.instance_software http_prefix + '://' + argb.instance_software