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 2024-04-15 21:20:39 +01:00
parent 80eb4801ba
commit 26cc086f20
2 changed files with 70 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemon_get.py
View File

@ -3661,7 +3661,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.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.getreq_busy = False self.server.getreq_busy = False
return return

72
daemon_get_buttons.py
View File

@ -1834,7 +1834,29 @@ def bookmark_button_undo(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: {},
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:
"""Button pressed to undo a bookmark """Button pressed to undo a bookmark
""" """
page_number = 1 page_number = 1
@ -1908,7 +1930,7 @@ def bookmark_button_undo(self, calling_domain: str, path: str,
undo_actor = \ undo_actor = \
local_actor_url(http_prefix, self.post_to_nickname, domain_full) local_actor_url(http_prefix, self.post_to_nickname, domain_full)
cc_list = [] cc_list = []
undo_bookmark_post(self.server.recent_posts_cache, undo_bookmark_post(recent_posts_cache,
base_dir, self.server.federation_list, base_dir, self.server.federation_list,
self.post_to_nickname, self.post_to_nickname,
domain, port, cc_list, http_prefix, domain, port, cc_list, http_prefix,
@ -1917,7 +1939,7 @@ def bookmark_button_undo(self, calling_domain: str, path: str,
if self.server.iconsCache.get('bookmark_inactive.png'): if self.server.iconsCache.get('bookmark_inactive.png'):
del self.server.iconsCache['bookmark_inactive.png'] del self.server.iconsCache['bookmark_inactive.png']
# post_to_outbox(self, undo_bookmark_json, # post_to_outbox(self, undo_bookmark_json,
# self.server.project_version, None, # project_version, None,
# curr_session, proxy_type) # curr_session, proxy_type)
bookmark_filename = \ bookmark_filename = \
locate_post(base_dir, self.post_to_nickname, domain, bookmark_url) locate_post(base_dir, self.post_to_nickname, domain, bookmark_url)
@ -1952,41 +1974,41 @@ def bookmark_button_undo(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,
port, bookmark_post_json, port, bookmark_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: Unbookmarked post not found: ' + print('WARN: Unbookmarked post not found: ' +
bookmark_filename) bookmark_filename)
@ -2002,7 +2024,7 @@ def bookmark_button_undo(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', '_undo_bookmark_button', '_GET', '_undo_bookmark_button',
debug) debug)
redirect_headers(self, actor_path_str, cookie, redirect_headers(self, actor_path_str, cookie,