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

Tidying

merge-requests/30/head
Bob Mottram 2022-06-01 16:54:28 +01:00
parent 5eef7c72e9
commit 2fdfe4ed5a
3 changed files with 39 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desktop_client.py
View File

@ -1485,11 +1485,10 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
debug, signing_priv_key_pem) debug, signing_priv_key_pem)
follow_requests_json = \ follow_requests_json = \
get_follow_requests_via_server(base_dir, session, get_follow_requests_via_server(session,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, 1, http_prefix, 1,
cached_webfingers, person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
@ -2214,12 +2213,10 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
if page_num.isdigit(): if page_num.isdigit():
curr_page = int(page_num) curr_page = int(page_num)
follow_requests_json = \ follow_requests_json = \
get_follow_requests_via_server(base_dir, session, get_follow_requests_via_server(session,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, curr_page, http_prefix, curr_page,
cached_webfingers,
person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
if follow_requests_json: if follow_requests_json:
@ -2235,11 +2232,10 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
if page_num.isdigit(): if page_num.isdigit():
curr_page = int(page_num) curr_page = int(page_num)
following_json = \ following_json = \
get_following_via_server(base_dir, session, get_following_via_server(session,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, curr_page, http_prefix, curr_page,
cached_webfingers, person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
if following_json: if following_json:
@ -2256,11 +2252,10 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
if page_num.isdigit(): if page_num.isdigit():
curr_page = int(page_num) curr_page = int(page_num)
followers_json = \ followers_json = \
get_followers_via_server(base_dir, session, get_followers_via_server(session,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, curr_page, http_prefix, curr_page,
cached_webfingers, person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
if followers_json: if followers_json:
@ -2359,14 +2354,11 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, system_language, espeak) screenreader, system_language, espeak)
session_approve = create_session(proxy_type) session_approve = create_session(proxy_type)
approve_follow_request_via_server(base_dir, approve_follow_request_via_server(session_approve,
session_approve,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, http_prefix,
approve_handle, approve_handle,
cached_webfingers,
person_cache,
debug, debug,
__version__, __version__,
signing_priv_key_pem) signing_priv_key_pem)
@ -2393,13 +2385,11 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
_say_command(say_str, say_str, _say_command(say_str, say_str,
screenreader, system_language, espeak) screenreader, system_language, espeak)
session_deny = create_session(proxy_type) session_deny = create_session(proxy_type)
deny_follow_request_via_server(base_dir, session_deny, deny_follow_request_via_server(session_deny,
nickname, password, nickname, password,
domain, port, domain, port,
http_prefix, http_prefix,
deny_handle, deny_handle,
cached_webfingers,
person_cache,
debug, debug,
__version__, __version__,
signing_priv_key_pem) signing_priv_key_pem)

9
epicyon.py
View File

@ -2268,11 +2268,10 @@ def _command_options() -> None:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain) signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
following_json = \ following_json = \
get_following_via_server(base_dir, session, get_following_via_server(session,
argb.nickname, argb.password, argb.nickname, argb.password,
domain, port, domain, port,
follow_http_prefix, argb.pageNumber, follow_http_prefix, argb.pageNumber,
cached_webfingers, person_cache,
debug, __version__, signing_priv_key_pem) debug, __version__, signing_priv_key_pem)
if following_json: if following_json:
pprint(following_json) pprint(following_json)
@ -2302,11 +2301,10 @@ def _command_options() -> None:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain) signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
followers_json = \ followers_json = \
get_followers_via_server(base_dir, session, get_followers_via_server(session,
argb.nickname, argb.password, argb.nickname, argb.password,
domain, port, domain, port,
follow_http_prefix, argb.pageNumber, follow_http_prefix, argb.pageNumber,
cached_webfingers, person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
if followers_json: if followers_json:
@ -2337,11 +2335,10 @@ def _command_options() -> None:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain) signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
follow_requests_json = \ follow_requests_json = \
get_follow_requests_via_server(base_dir, session, get_follow_requests_via_server(session,
argb.nickname, argb.password, argb.nickname, argb.password,
domain, port, domain, port,
follow_http_prefix, argb.pageNumber, follow_http_prefix, argb.pageNumber,
cached_webfingers, person_cache,
debug, __version__, debug, __version__,
signing_priv_key_pem) signing_priv_key_pem)
if follow_requests_json: if follow_requests_json:

39
follow.py
View File

@ -1147,11 +1147,9 @@ def send_unfollow_request_via_server(base_dir: str, session,
return unfollow_json return unfollow_json
def get_following_via_server(base_dir: str, session, def get_following_via_server(session, nickname: str, password: str,
nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, page_number: int, http_prefix: str, page_number: int,
cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
"""Gets a page from the following collection as json """Gets a page from the following collection as json
@ -1175,7 +1173,7 @@ def get_following_via_server(base_dir: str, session,
url = follow_actor + '/following?page=' + str(page_number) url = follow_actor + '/following?page=' + str(page_number)
following_json = \ following_json = \
get_json(signing_priv_key_pem, session, url, headers, {}, debug, get_json(signing_priv_key_pem, session, url, headers, {}, debug,
__version__, http_prefix, domain, 10, True) project_version, http_prefix, domain, 10, True)
if not following_json: if not following_json:
if debug: if debug:
print('DEBUG: GET following list failed for c2s to ' + url) print('DEBUG: GET following list failed for c2s to ' + url)
@ -1187,11 +1185,9 @@ def get_following_via_server(base_dir: str, session,
return following_json return following_json
def get_followers_via_server(base_dir: str, session, def get_followers_via_server(session, nickname: str, password: str,
nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, page_number: int, http_prefix: str, page_number: int,
cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
"""Gets a page from the followers collection as json """Gets a page from the followers collection as json
@ -1211,12 +1207,11 @@ def get_followers_via_server(base_dir: str, session,
'Authorization': auth_header 'Authorization': auth_header
} }
if page_number < 1: page_number = max(page_number, 1)
page_number = 1
url = follow_actor + '/followers?page=' + str(page_number) url = follow_actor + '/followers?page=' + str(page_number)
followers_json = \ followers_json = \
get_json(signing_priv_key_pem, session, url, headers, {}, debug, get_json(signing_priv_key_pem, session, url, headers, {}, debug,
__version__, http_prefix, domain, 10, True) project_version, http_prefix, domain, 10, True)
if not followers_json: if not followers_json:
if debug: if debug:
print('DEBUG: GET followers list failed for c2s to ' + url) print('DEBUG: GET followers list failed for c2s to ' + url)
@ -1228,11 +1223,10 @@ def get_followers_via_server(base_dir: str, session,
return followers_json return followers_json
def get_follow_requests_via_server(base_dir: str, session, def get_follow_requests_via_server(session,
nickname: str, password: str, nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, page_number: int, http_prefix: str, page_number: int,
cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
"""Gets a page from the follow requests collection as json """Gets a page from the follow requests collection as json
@ -1256,7 +1250,7 @@ def get_follow_requests_via_server(base_dir: str, session,
url = follow_actor + '/followrequests?page=' + str(page_number) url = follow_actor + '/followrequests?page=' + str(page_number)
followers_json = \ followers_json = \
get_json(signing_priv_key_pem, session, url, headers, {}, debug, get_json(signing_priv_key_pem, session, url, headers, {}, debug,
__version__, http_prefix, domain, 10, True) project_version, http_prefix, domain, 10, True)
if not followers_json: if not followers_json:
if debug: if debug:
print('DEBUG: GET follow requests list failed for c2s to ' + url) print('DEBUG: GET follow requests list failed for c2s to ' + url)
@ -1268,11 +1262,10 @@ def get_follow_requests_via_server(base_dir: str, session,
return followers_json return followers_json
def approve_follow_request_via_server(base_dir: str, session, def approve_follow_request_via_server(session,
nickname: str, password: str, nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, approve_handle: int, http_prefix: str, approve_handle: int,
cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> str: signing_priv_key_pem: str) -> str:
"""Approves a follow request """Approves a follow request
@ -1297,7 +1290,7 @@ def approve_follow_request_via_server(base_dir: str, session,
url = actor + '/followapprove=' + approve_handle url = actor + '/followapprove=' + approve_handle
approve_html = \ approve_html = \
get_json(signing_priv_key_pem, session, url, headers, {}, debug, get_json(signing_priv_key_pem, session, url, headers, {}, debug,
__version__, http_prefix, domain, 10, True) project_version, http_prefix, domain, 10, True)
if not approve_html: if not approve_html:
if debug: if debug:
print('DEBUG: GET approve follow request failed for c2s to ' + url) print('DEBUG: GET approve follow request failed for c2s to ' + url)
@ -1309,11 +1302,10 @@ def approve_follow_request_via_server(base_dir: str, session,
return approve_html return approve_html
def deny_follow_request_via_server(base_dir: str, session, def deny_follow_request_via_server(session,
nickname: str, password: str, nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, deny_handle: int, http_prefix: str, deny_handle: int,
cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> str: signing_priv_key_pem: str) -> str:
"""Denies a follow request """Denies a follow request
@ -1338,7 +1330,7 @@ def deny_follow_request_via_server(base_dir: str, session,
url = actor + '/followdeny=' + deny_handle url = actor + '/followdeny=' + deny_handle
deny_html = \ deny_html = \
get_json(signing_priv_key_pem, session, url, headers, {}, debug, get_json(signing_priv_key_pem, session, url, headers, {}, debug,
__version__, http_prefix, domain, 10, True) project_version, http_prefix, domain, 10, True)
if not deny_html: if not deny_html:
if debug: if debug:
print('DEBUG: GET deny follow request failed for c2s to ' + url) print('DEBUG: GET deny follow request failed for c2s to ' + url)
@ -1376,9 +1368,12 @@ def get_followers_of_actor(base_dir: str, actor: str, debug: bool) -> {}:
# for each of the accounts # for each of the accounts
for subdir, dirs, _ in os.walk(base_dir + '/accounts'): for subdir, dirs, _ in os.walk(base_dir + '/accounts'):
for account in dirs: for account in dirs:
if '@' in account and \ if '@' not in account:
not account.startswith('inbox@') and \ continue
not account.startswith('Actor@'): if account.startswith('inbox@'):
continue
if account.startswith('Actor@'):
continue
following_filename = \ following_filename = \
os.path.join(subdir, account) + '/following.txt' os.path.join(subdir, account) + '/following.txt'
if debug: if debug: