mirror of https://gitlab.com/bashrc2/epicyon
Tidying
Bob Mottram
parent
f53bd9eeae
commit
80eb4801ba
|
|
@ -3576,7 +3576,30 @@ def daemon_http_get(self) -> None:
|
|||
getreq_start_time,
|
||||
proxy_type,
|
||||
cookie, self.server.debug,
|
||||
curr_session)
|
||||
curr_session,
|
||||
self.server.signing_priv_key_pem,
|
||||
self.server.recent_posts_cache,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
self.server.cached_webfingers,
|
||||
self.server.person_cache,
|
||||
self.server.allow_deletion,
|
||||
self.server.project_version,
|
||||
self.server.yt_replace_domain,
|
||||
self.server.twitter_replacement_domain,
|
||||
self.server.show_published_date_only,
|
||||
self.server.peertube_instances,
|
||||
self.server.allow_local_network_access,
|
||||
self.server.theme_name,
|
||||
self.server.system_language,
|
||||
self.server.max_like_count,
|
||||
self.server.cw_lists,
|
||||
self.server.lists_enabled,
|
||||
self.server.dogwhistles,
|
||||
self.server.buy_sites,
|
||||
self.server.auto_cw_cache,
|
||||
self.server.fitness,
|
||||
self.server.federation_list)
|
||||
self.server.getreq_busy = False
|
||||
return
|
||||
|
||||
|
|
|
|||
|
|
@ -1629,7 +1629,30 @@ def bookmark_button(self, calling_domain: str, path: str,
|
|||
getreq_start_time,
|
||||
proxy_type: str, cookie: str,
|
||||
debug: str,
|
||||
curr_session) -> None:
|
||||
curr_session,
|
||||
signing_priv_key_pem: str,
|
||||
recent_posts_cache: {},
|
||||
max_recent_posts: int,
|
||||
translate: {},
|
||||
cached_webfingers: {},
|
||||
person_cache: {},
|
||||
allow_deletion: bool,
|
||||
project_version: str,
|
||||
yt_replace_domain: str,
|
||||
twitter_replacement_domain: str,
|
||||
show_published_date_only: bool,
|
||||
peertube_instances: [],
|
||||
allow_local_network_access: bool,
|
||||
theme_name: str,
|
||||
system_language: str,
|
||||
max_like_count: int,
|
||||
cw_lists: {},
|
||||
lists_enabled: {},
|
||||
dogwhistles: {},
|
||||
buy_sites: [],
|
||||
auto_cw_cache: {},
|
||||
fitness: {},
|
||||
federation_list: []) -> None:
|
||||
"""Bookmark button was pressed
|
||||
"""
|
||||
page_number = 1
|
||||
|
|
@ -1704,8 +1727,8 @@ def bookmark_button(self, calling_domain: str, path: str,
|
|||
bookmark_actor = \
|
||||
local_actor_url(http_prefix, self.post_to_nickname, domain_full)
|
||||
cc_list = []
|
||||
bookmark_post(self.server.recent_posts_cache,
|
||||
base_dir, self.server.federation_list,
|
||||
bookmark_post(recent_posts_cache,
|
||||
base_dir, federation_list,
|
||||
self.post_to_nickname, domain, port,
|
||||
cc_list, http_prefix, bookmark_url, bookmark_actor,
|
||||
debug)
|
||||
|
|
@ -1745,45 +1768,45 @@ def bookmark_button(self, calling_domain: str, path: str,
|
|||
if self.post_to_nickname in \
|
||||
self.server.min_images_for_accounts:
|
||||
minimize_all_images = True
|
||||
individual_post_as_html(self.server.signing_priv_key_pem,
|
||||
individual_post_as_html(signing_priv_key_pem,
|
||||
False,
|
||||
self.server.recent_posts_cache,
|
||||
self.server.max_recent_posts,
|
||||
self.server.translate,
|
||||
recent_posts_cache,
|
||||
max_recent_posts,
|
||||
translate,
|
||||
page_number, base_dir,
|
||||
curr_session,
|
||||
self.server.cached_webfingers,
|
||||
self.server.person_cache,
|
||||
cached_webfingers,
|
||||
person_cache,
|
||||
self.post_to_nickname, domain,
|
||||
port, bookmark_post_json,
|
||||
None, True,
|
||||
self.server.allow_deletion,
|
||||
allow_deletion,
|
||||
http_prefix,
|
||||
self.server.project_version,
|
||||
project_version,
|
||||
timeline_str,
|
||||
self.server.yt_replace_domain,
|
||||
self.server.twitter_replacement_domain,
|
||||
self.server.show_published_date_only,
|
||||
self.server.peertube_instances,
|
||||
self.server.allow_local_network_access,
|
||||
self.server.theme_name,
|
||||
self.server.system_language,
|
||||
self.server.max_like_count,
|
||||
yt_replace_domain,
|
||||
twitter_replacement_domain,
|
||||
show_published_date_only,
|
||||
peertube_instances,
|
||||
allow_local_network_access,
|
||||
theme_name,
|
||||
system_language,
|
||||
max_like_count,
|
||||
show_repeats,
|
||||
show_individual_post_icons,
|
||||
manually_approve_followers,
|
||||
False, True, False,
|
||||
self.server.cw_lists,
|
||||
self.server.lists_enabled,
|
||||
cw_lists,
|
||||
lists_enabled,
|
||||
timezone, mitm, bold_reading,
|
||||
self.server.dogwhistles,
|
||||
dogwhistles,
|
||||
minimize_all_images, None,
|
||||
self.server.buy_sites,
|
||||
self.server.auto_cw_cache)
|
||||
buy_sites,
|
||||
auto_cw_cache)
|
||||
else:
|
||||
print('WARN: Bookmarked post not found: ' + bookmark_filename)
|
||||
# _post_to_outbox(self, bookmark_json,
|
||||
# self.server.project_version, None,
|
||||
# project_version, None,
|
||||
# curr_session, proxy_type)
|
||||
actor_absolute = \
|
||||
get_instance_url(calling_domain,
|
||||
|
|
@ -1797,7 +1820,7 @@ def bookmark_button(self, calling_domain: str, path: str,
|
|||
actor_absolute + '/' + timeline_str + \
|
||||
'?page=' + str(page_number) + first_post_id + \
|
||||
timeline_bookmark
|
||||
fitness_performance(getreq_start_time, self.server.fitness,
|
||||
fitness_performance(getreq_start_time, fitness,
|
||||
'_GET', '_bookmark_button',
|
||||
debug)
|
||||
redirect_headers(self, actor_path_str, cookie,
|
||||
|
|
|
|||
Loading…
Reference in New Issue