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-12 21:56:41 +01:00
parent c5aa3270a5
commit 0244925535
2 changed files with 278 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
daemon_get.py
View File

@ -3919,7 +3919,31 @@ def daemon_http_get(self) -> None:
cookie, self.server.debug,
curr_session,
self.server.translate,
self.server.account_timezone):
self.server.account_timezone,
self.server.fitness,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.cached_webfingers,
self.server.person_cache,
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.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.onion_domain,
self.server.i2p_domain,
self.server.bold_reading):
self.server.getreq_busy = False
return
@ -4177,7 +4201,30 @@ def daemon_http_get(self) -> None:
curr_session,
self.server.translate,
self.server.account_timezone,
self.server.fitness):
self.server.fitness,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.cached_webfingers,
self.server.person_cache,
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.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.onion_domain,
self.server.i2p_domain,
self.server.bold_reading):
self.server.getreq_busy = False
return
@ -4197,7 +4244,31 @@ def daemon_http_get(self) -> None:
cookie, self.server.debug,
curr_session,
self.server.translate,
self.server.account_timezone):
self.server.account_timezone,
self.server.fitness,
self.server.bold_reading,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.cached_webfingers,
self.server.person_cache,
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.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.onion_domain,
self.server.i2p_domain):
self.server.getreq_busy = False
return

239
daemon_get_post.py
View File

@ -57,7 +57,31 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
proxy_type: str, cookie: str,
debug: str, include_create_wrapper: bool,
curr_session, translate: {},
account_timezone: {}) -> bool:
account_timezone: {},
bold_reading_nicknames: {},
recent_posts_cache: {},
max_recent_posts: int,
cached_webfingers: {},
person_cache: {},
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,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
fitness: {}, path: str,
onion_domain: str,
i2p_domain: str) -> bool:
"""Shows an individual post from its filename
"""
if not os.path.isfile(post_filename):
@ -101,50 +125,50 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
mitm = True
bold_reading = False
if self.server.bold_reading.get(nickname):
if bold_reading_nicknames.get(nickname):
bold_reading = True
msg = \
html_individual_post(self.server.recent_posts_cache,
self.server.max_recent_posts,
html_individual_post(recent_posts_cache,
max_recent_posts,
translate,
base_dir,
curr_session,
self.server.cached_webfingers,
self.server.person_cache,
cached_webfingers,
person_cache,
nickname, domain, port,
authorized,
post_json_object,
http_prefix,
self.server.project_version,
project_version,
liked_by, react_by, react_emoji,
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,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertube_instances,
allow_local_network_access,
theme_name,
system_language,
max_like_count,
signing_priv_key_pem,
cw_lists,
lists_enabled,
timezone, mitm, bold_reading,
self.server.dogwhistles,
self.server.min_images_for_accounts,
self.server.buy_sites,
self.server.auto_cw_cache)
dogwhistles,
min_images_for_accounts,
buy_sites,
auto_cw_cache)
msg = msg.encode('utf-8')
msglen = len(msg)
set_headers(self, 'text/html', msglen,
cookie, calling_domain, False)
write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness,
fitness_performance(getreq_start_time, fitness,
'_GET', 'show_post_from_file',
debug)
else:
if secure_mode(curr_session, proxy_type, False,
self.server, self.headers, self.path):
self.server, self.headers, path):
if not include_create_wrapper and \
post_json_object['type'] == 'Create' and \
has_object_dict(post_json_object):
@ -160,8 +184,8 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
referer_domain,
msg_str, http_prefix,
domain,
self.server.onion_domain,
self.server.i2p_domain)
onion_domain,
i2p_domain)
msg = msg_str.encode('utf-8')
msglen = len(msg)
protocol_str = \
@ -169,7 +193,7 @@ def _show_post_from_file(self, post_filename: str, liked_by: str,
set_headers(self, protocol_str, msglen,
None, calling_domain, False)
write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness,
fitness_performance(getreq_start_time, fitness,
'_GET', 'show_post_from_file json',
debug)
else:
@ -187,7 +211,31 @@ def show_individual_post(self, ssml_getreq: bool, authorized: bool,
proxy_type: str, cookie: str,
debug: str,
curr_session, translate: {},
account_timezone: {}) -> bool:
account_timezone: {},
fitness: {},
bold_reading_nicknames: {},
recent_posts_cache: {},
max_recent_posts: int,
cached_webfingers: {},
person_cache: {},
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,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
onion_domain: str,
i2p_domain: str) -> bool:
"""Shows an individual post
"""
liked_by = None
@ -268,8 +316,33 @@ def show_individual_post(self, ssml_getreq: bool, authorized: bool,
proxy_type, cookie, debug,
include_create_wrapper,
curr_session, translate,
account_timezone)
fitness_performance(getreq_start_time, self.server.fitness,
account_timezone,
bold_reading_nicknames,
recent_posts_cache,
max_recent_posts,
cached_webfingers,
person_cache,
project_version,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertube_instances,
allow_local_network_access,
theme_name,
system_language,
max_like_count,
signing_priv_key_pem,
cw_lists,
lists_enabled,
dogwhistles,
min_images_for_accounts,
buy_sites,
auto_cw_cache,
fitness, path,
onion_domain,
i2p_domain)
fitness_performance(getreq_start_time, fitness,
'_GET', 'show_individual_post',
debug)
return result
@ -461,7 +534,31 @@ def show_individual_at_post(self, ssml_getreq: bool, authorized: bool,
proxy_type: str, cookie: str,
debug: str,
curr_session, translate: {},
account_timezone: {}) -> bool:
account_timezone: {},
fitness: {},
recent_posts_cache: {},
max_recent_posts: int,
cached_webfingers: {},
person_cache: {},
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,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
onion_domain: str,
i2p_domain: str,
bold_reading_nicknames: {}) -> bool:
"""get an individual post from the path /@nickname/statusnumber
"""
if '/@' not in path:
@ -548,8 +645,33 @@ def show_individual_at_post(self, ssml_getreq: bool, authorized: bool,
proxy_type, cookie, debug,
include_create_wrapper,
curr_session, translate,
account_timezone)
fitness_performance(getreq_start_time, self.server.fitness,
account_timezone,
bold_reading_nicknames,
recent_posts_cache,
max_recent_posts,
cached_webfingers,
person_cache,
project_version,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertube_instances,
allow_local_network_access,
theme_name,
system_language,
max_like_count,
signing_priv_key_pem,
cw_lists,
lists_enabled,
dogwhistles,
min_images_for_accounts,
buy_sites,
auto_cw_cache,
fitness, path,
onion_domain,
i2p_domain)
fitness_performance(getreq_start_time, fitness,
'_GET', 'show_individual_at_post',
debug)
return result
@ -1030,7 +1152,30 @@ def show_notify_post(self, authorized: bool,
debug: str,
curr_session, translate: {},
account_timezone: {},
fitness: {}) -> bool:
fitness: {},
recent_posts_cache: {},
max_recent_posts: int,
cached_webfingers: {},
person_cache: {},
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,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
onion_domain: str,
i2p_domain: str,
bold_reading_nicknames: {}) -> bool:
"""Shows an individual post from an account which you are following
and where you have the notify checkbox set on person options
"""
@ -1064,7 +1209,31 @@ def show_notify_post(self, authorized: bool,
proxy_type, cookie, debug,
include_create_wrapper,
curr_session, translate,
account_timezone)
account_timezone,
bold_reading_nicknames,
recent_posts_cache,
max_recent_posts,
cached_webfingers,
person_cache,
project_version,
yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
peertube_instances,
allow_local_network_access,
theme_name,
system_language,
max_like_count,
signing_priv_key_pem,
cw_lists,
lists_enabled,
dogwhistles,
min_images_for_accounts,
buy_sites,
auto_cw_cache,
fitness, path,
onion_domain,
i2p_domain)
fitness_performance(getreq_start_time, fitness,
'_GET', 'show_notify_post',
debug)