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-05-31 15:00:49 +01:00
parent 238e0b5d08
commit 634e601a46
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desktop_client.py
View File

@ -1482,8 +1482,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
system_language, espeak)
pgp_key_upload = True
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)
@ -1499,8 +1498,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
if not (curr_timeline == 'inbox' and page_number == 1):
# monitor the inbox to generate notifications
inbox_json = c2s_box_json(base_dir, session,
nickname, password,
inbox_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
'inbox', 1, debug,
signing_priv_key_pem)
@ -1575,8 +1573,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
page_number = 1
prev_timeline_first_id = ''
curr_timeline = 'dm'
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)
@ -1592,8 +1589,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
page_number = 1
prev_timeline_first_id = ''
curr_timeline = 'tlreplies'
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)
@ -1610,8 +1606,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
page_number = 1
prev_timeline_first_id = ''
curr_timeline = 'tlbookmarks'
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)
@ -1629,8 +1624,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
page_number = 1
prev_timeline_first_id = ''
curr_timeline = 'outbox'
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)
@ -1655,8 +1649,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
page_number -= 1
page_number = max(page_number, 1)
prev_timeline_first_id = ''
box_json = c2s_box_json(base_dir, session,
nickname, password,
box_json = c2s_box_json(session, nickname, password,
domain, port, http_prefix,
curr_timeline, page_number,
debug, signing_priv_key_pem)

3
epicyon.py
View File

@ -1681,8 +1681,7 @@ def _command_options() -> None:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
session = create_session(proxy_type)
box_json = c2s_box_json(base_dir, session,
argb.nickname, argb.password,
box_json = c2s_box_json(session, argb.nickname, argb.password,
domain, port, http_prefix,
argb.box, argb.pageNumber,
argb.debug, signing_priv_key_pem)

3
posts.py
View File

@ -5497,8 +5497,7 @@ def post_is_muted(base_dir: str, nickname: str, domain: str,
return is_muted
def c2s_box_json(base_dir: str, session,
nickname: str, password: str,
def c2s_box_json(session, nickname: str, password: str,
domain: str, port: int,
http_prefix: str,
box_name: str, page_number: int,