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-11 11:00:00 +01:00
parent 33268d2b28
commit 40221f0efd
2 changed files with 100 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
daemon_get.py
View File

@ -2847,7 +2847,10 @@ def daemon_http_get(self) -> None:
self.server.port, self.server.port,
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time) getreq_start_time,
self.server.system_language,
self.server.fitness,
self.server.debug)
self.server.getreq_busy = False self.server.getreq_busy = False
return return
if not html_getreq: if not html_getreq:
@ -2861,7 +2864,9 @@ def daemon_http_get(self) -> None:
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time, getreq_start_time,
MAX_POSTS_IN_FEED) MAX_POSTS_IN_FEED,
self.server.fitness,
self.server.debug)
self.server.getreq_busy = False self.server.getreq_busy = False
return return
hashtag_search2(self, calling_domain, hashtag_search2(self, calling_domain,
@ -2875,7 +2880,34 @@ def daemon_http_get(self) -> None:
self.server.i2p_domain, self.server.i2p_domain,
getreq_start_time, getreq_start_time,
curr_session, curr_session,
MAX_POSTS_IN_HASHTAG_FEED) MAX_POSTS_IN_HASHTAG_FEED,
self.server.translate,
self.server.account_timezone,
self.server.bold_reading,
self.server.fitness,
self.server.debug,
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.map_format,
self.server.access_keys,
self.server.min_images_for_accounts,
self.server.buy_sites,
self.server.auto_cw_cache)
self.server.getreq_busy = False self.server.getreq_busy = False
return return

104
daemon_get_hashtag.py
View File

@ -32,7 +32,9 @@ def hashtag_search_rss2(self, calling_domain: str,
base_dir: str, http_prefix: str, base_dir: str, http_prefix: 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) -> None: getreq_start_time,
system_language: str,
fitness: {}, debug: bool) -> None:
"""Return an RSS 2 feed for a hashtag """Return an RSS 2 feed for a hashtag
""" """
hashtag = path.split('/tags/rss2/')[1] hashtag = path.split('/tags/rss2/')[1]
@ -50,7 +52,7 @@ def hashtag_search_rss2(self, calling_domain: str,
domain, port, domain, port,
base_dir, hashtag, base_dir, hashtag,
http_prefix, http_prefix,
self.server.system_language) system_language)
if hashtag_str: if hashtag_str:
msg = hashtag_str.encode('utf-8') msg = hashtag_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -69,9 +71,9 @@ def hashtag_search_rss2(self, calling_domain: str,
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
redirect_headers(self, origin_path_str_absolute + '/search', redirect_headers(self, origin_path_str_absolute + '/search',
cookie, calling_domain) cookie, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_hashtag_search_rss2', '_GET', '_hashtag_search_rss2',
self.server.debug) debug)
def hashtag_search_json2(self, calling_domain: str, def hashtag_search_json2(self, calling_domain: str,
@ -81,7 +83,8 @@ def hashtag_search_json2(self, calling_domain: 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, getreq_start_time,
max_posts_in_feed: int) -> None: max_posts_in_feed: int,
fitness: {}, debug: bool) -> None:
"""Return a json collection for a hashtag """Return a json collection for a hashtag
""" """
page_number = 1 page_number = 1
@ -128,9 +131,9 @@ def hashtag_search_json2(self, calling_domain: str,
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
redirect_headers(self, origin_path_str_absolute, redirect_headers(self, origin_path_str_absolute,
cookie, calling_domain) cookie, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_hashtag_search_json', '_GET', '_hashtag_search_json',
self.server.debug) debug)
def hashtag_search2(self, calling_domain: str, def hashtag_search2(self, calling_domain: str,
@ -140,7 +143,32 @@ def hashtag_search2(self, calling_domain: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, getreq_start_time,
curr_session, curr_session,
max_posts_in_hashtag_feed: int) -> None: max_posts_in_hashtag_feed: int,
translate: {}, account_timezone: {},
bold_reading_nicknames: {},
fitness: {}, debug: bool,
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: {},
map_format: str,
access_keys: {},
min_images_for_accounts: [],
buy_sites: [],
auto_cw_cache: {}) -> None:
"""Return the result of a hashtag search """Return the result of a hashtag search
""" """
page_number = 1 page_number = 1
@ -159,7 +187,7 @@ def hashtag_search2(self, calling_domain: str,
if is_blocked_hashtag(base_dir, hashtag): if is_blocked_hashtag(base_dir, hashtag):
print('BLOCK: blocked hashtag #' + hashtag) print('BLOCK: blocked hashtag #' + hashtag)
msg = html_hashtag_blocked(base_dir, msg = html_hashtag_blocked(base_dir,
self.server.translate).encode('utf-8') translate).encode('utf-8')
msglen = len(msg) msglen = len(msg)
login_headers(self, 'text/html', msglen, calling_domain) login_headers(self, 'text/html', msglen, calling_domain)
write2(self, msg) write2(self, msg)
@ -172,43 +200,42 @@ def hashtag_search2(self, calling_domain: str,
if '?' in nickname: if '?' in nickname:
nickname = nickname.split('?')[0] nickname = nickname.split('?')[0]
timezone = None timezone = None
if self.server.account_timezone.get(nickname): if account_timezone.get(nickname):
timezone = \ timezone = account_timezone.get(nickname)
self.server.account_timezone.get(nickname)
bold_reading = False bold_reading = False
if self.server.bold_reading.get(nickname): if bold_reading_nicknames.get(nickname):
bold_reading = True bold_reading = True
hashtag_str = \ hashtag_str = \
html_hashtag_search(nickname, domain, port, html_hashtag_search(nickname, domain, port,
self.server.recent_posts_cache, recent_posts_cache,
self.server.max_recent_posts, max_recent_posts,
self.server.translate, translate,
base_dir, hashtag, page_number, base_dir, hashtag, page_number,
max_posts_in_hashtag_feed, max_posts_in_hashtag_feed,
curr_session, curr_session,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, person_cache,
http_prefix, http_prefix,
self.server.project_version, project_version,
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,
timezone, bold_reading, timezone, bold_reading,
self.server.dogwhistles, dogwhistles,
self.server.map_format, map_format,
self.server.access_keys, access_keys,
'search', 'search',
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 hashtag_str: if hashtag_str:
msg = hashtag_str.encode('utf-8') msg = hashtag_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -227,9 +254,8 @@ def hashtag_search2(self, calling_domain: str,
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
redirect_headers(self, origin_path_str_absolute + '/search', redirect_headers(self, origin_path_str_absolute + '/search',
cookie, calling_domain) cookie, calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_hashtag_search', '_GET', '_hashtag_search', debug)
self.server.debug)
def get_hashtag_categories_feed2(self, calling_domain: str, path: str, def get_hashtag_categories_feed2(self, calling_domain: str, path: str,