merge-requests/30/head
Bob Mottram 2024-04-15 21:31:32 +01:00
parent 26cc086f20
commit a2ef11c3c9
2 changed files with 68 additions and 24 deletions

View File

@ -3702,7 +3702,29 @@ def daemon_http_get(self) -> None:
getreq_start_time, getreq_start_time,
proxy_type, cookie, proxy_type, cookie,
self.server.debug, self.server.debug,
curr_session) curr_session,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.translate,
self.server.project_version,
self.server.cached_webfingers,
self.server.person_cache,
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.signing_priv_key_pem,
self.server.cw_lists,
self.server.lists_enabled,
self.server.dogwhistles,
self.server.min_images_for_accounts,
self.server.buy_sites,
self.server.auto_cw_cache,
self.server.fitness)
self.server.getreq_busy = False self.server.getreq_busy = False
return return

View File

@ -2037,7 +2037,29 @@ def delete_button(self, calling_domain: str, path: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, curr_session) -> None: debug: str, curr_session,
recent_posts_cache: {},
max_recent_posts: int,
translate: {},
project_version: str,
cached_webfingers: {},
person_cache: {},
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,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
fitness: {}) -> None:
"""Delete button is pressed on a post """Delete button is pressed on a post
""" """
if not cookie: if not cookie:
@ -2110,29 +2132,29 @@ def delete_button(self, calling_domain: str, path: str,
delete_str = \ delete_str = \
html_confirm_delete(self.server, html_confirm_delete(self.server,
self.server.recent_posts_cache, recent_posts_cache,
self.server.max_recent_posts, max_recent_posts,
self.server.translate, page_number, translate, page_number,
curr_session, base_dir, curr_session, base_dir,
delete_url, http_prefix, delete_url, http_prefix,
self.server.project_version, project_version,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, calling_domain, person_cache, calling_domain,
self.server.yt_replace_domain, yt_replace_domain,
self.server.twitter_replacement_domain, twitter_replacement_domain,
self.server.show_published_date_only, show_published_date_only,
self.server.peertube_instances, peertube_instances,
self.server.allow_local_network_access, allow_local_network_access,
self.server.theme_name, theme_name,
self.server.system_language, system_language,
self.server.max_like_count, max_like_count,
self.server.signing_priv_key_pem, signing_priv_key_pem,
self.server.cw_lists, cw_lists,
self.server.lists_enabled, lists_enabled,
self.server.dogwhistles, dogwhistles,
self.server.min_images_for_accounts, min_images_for_accounts,
self.server.buy_sites, buy_sites,
self.server.auto_cw_cache) auto_cw_cache)
if delete_str: if delete_str:
delete_str_len = len(delete_str) delete_str_len = len(delete_str)
set_headers(self, 'text/html', delete_str_len, set_headers(self, 'text/html', delete_str_len,
@ -2144,7 +2166,7 @@ def delete_button(self, calling_domain: str, path: str,
actor = 'http://' + onion_domain + users_path actor = 'http://' + onion_domain + users_path
elif (calling_domain.endswith('.i2p') and i2p_domain): elif (calling_domain.endswith('.i2p') and i2p_domain):
actor = 'http://' + i2p_domain + users_path actor = 'http://' + i2p_domain + users_path
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_delete_button', '_GET', '_delete_button',
debug) debug)
redirect_headers(self, actor + '/' + timeline_str, redirect_headers(self, actor + '/' + timeline_str,