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:41:37 +01:00
parent a2ef11c3c9
commit 516d3e6969
2 changed files with 69 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemon_get.py
View File

@ -3744,7 +3744,29 @@ def daemon_http_get(self) -> None:
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time, getreq_start_time,
cookie, self.server.debug, 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.getreq_busy = False self.server.getreq_busy = False
return return

70
daemon_get_buttons.py
View File

@ -2178,7 +2178,29 @@ def mute_button(self, calling_domain: str, path: str,
domain: str, domain_full: str, port: int, domain: str, domain_full: str, port: int,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, cookie: str, getreq_start_time, cookie: str,
debug: str, curr_session): debug: str, 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: {}):
"""Mute button is pressed """Mute button is pressed
""" """
mute_url = path.split('?mute=')[1] mute_url = path.split('?mute=')[1]
@ -2223,7 +2245,7 @@ def mute_button(self, calling_domain: str, path: str,
return return
mute_post(base_dir, nickname, domain, port, mute_post(base_dir, nickname, domain, port,
http_prefix, mute_url, http_prefix, mute_url,
self.server.recent_posts_cache, debug) recent_posts_cache, debug)
mute_filename = \ mute_filename = \
locate_post(base_dir, nickname, domain, mute_url) locate_post(base_dir, nickname, domain, mute_url)
if mute_filename: if mute_filename:
@ -2263,42 +2285,42 @@ def mute_button(self, calling_domain: str, path: str,
minimize_all_images = False minimize_all_images = False
if nickname in self.server.min_images_for_accounts: if nickname in 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,
allow_downloads, allow_downloads,
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,
nickname, domain, nickname, domain,
port, mute_post_json, port, mute_post_json,
avatar_url, show_avatar_options, avatar_url, show_avatar_options,
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,
show_public_only, store_to_cache, show_public_only, store_to_cache,
use_cache_only, use_cache_only,
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: Muted post not found: ' + mute_filename) print('WARN: Muted post not found: ' + mute_filename)
@ -2310,7 +2332,7 @@ def mute_button(self, calling_domain: str, path: str,
actor = \ actor = \
'http://' + i2p_domain + \ 'http://' + i2p_domain + \
path.split('?mute=')[0] path.split('?mute=')[0]
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_mute_button', debug) '_GET', '_mute_button', debug)
page_number_str = str(page_number) page_number_str = str(page_number)