merge-requests/30/head
Bob Mottram 2024-04-15 20:05:33 +01:00
parent d75db28246
commit 08f6ebc69a
2 changed files with 73 additions and 27 deletions

View File

@ -3487,7 +3487,30 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
cookie, cookie,
self.server.debug, 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.port,
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.getreq_busy = False self.server.getreq_busy = False
return return

View File

@ -1087,7 +1087,30 @@ def reaction_button(self, calling_domain: str, path: str,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: 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: {},
port: int,
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: {}) -> None:
"""Press an emoji reaction button """Press an emoji reaction button
Note that this is not the emoji reaction selection icon at the Note that this is not the emoji reaction selection icon at the
bottom of the post bottom of the post
@ -1209,10 +1232,10 @@ def reaction_button(self, calling_domain: str, path: str,
} }
# send out the emoji reaction to followers # send out the emoji reaction to followers
post_to_outbox(self, reaction_json, self.server.project_version, None, post_to_outbox(self, reaction_json, project_version, None,
curr_session, proxy_type) curr_session, proxy_type)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_reaction_button postToOutbox', '_GET', '_reaction_button postToOutbox',
debug) debug)
@ -1276,41 +1299,41 @@ def reaction_button(self, calling_domain: str, path: str,
if self.post_to_nickname in \ if self.post_to_nickname in \
self.server.min_images_for_accounts: self.server.min_images_for_accounts:
minimize_all_images = True minimize_all_images = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, recent_posts_cache,
self.server.max_recent_posts, max_recent_posts,
self.server.translate, translate,
page_number, base_dir, page_number, base_dir,
curr_session, curr_session,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, person_cache,
self.post_to_nickname, domain, self.post_to_nickname, domain,
self.server.port, reaction_post_json, port, reaction_post_json,
None, True, None, True,
self.server.allow_deletion, allow_deletion,
http_prefix, http_prefix,
self.server.project_version, project_version,
timeline_str, timeline_str,
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,
show_repeats, show_repeats,
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, False, True, False,
self.server.cw_lists, cw_lists,
self.server.lists_enabled, lists_enabled,
timezone, mitm, bold_reading, timezone, mitm, bold_reading,
self.server.dogwhistles, dogwhistles,
minimize_all_images, None, minimize_all_images, None,
self.server.buy_sites, buy_sites,
self.server.auto_cw_cache) auto_cw_cache)
else: else:
print('WARN: Emoji reaction post not found: ' + print('WARN: Emoji reaction post not found: ' +
reaction_post_filename) reaction_post_filename)
@ -1330,7 +1353,7 @@ def reaction_button(self, calling_domain: str, path: str,
actor_absolute + '/' + timeline_str + \ actor_absolute + '/' + timeline_str + \
'?page=' + str(page_number) + first_post_id + \ '?page=' + str(page_number) + first_post_id + \
timeline_bookmark timeline_bookmark
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_reaction_button', '_GET', '_reaction_button',
debug) debug)
redirect_headers(self, actor_path_str, cookie, redirect_headers(self, actor_path_str, cookie,