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-23 10:41:39 +01:00
parent 54319bd38d
commit af8344615b
2 changed files with 111 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
daemon_get.py
View File

@ -4907,7 +4907,43 @@ def daemon_http_get(self) -> None:
getreq_start_time, getreq_start_time,
proxy_type, proxy_type,
cookie, self.server.debug, 'shares', cookie, self.server.debug, 'shares',
curr_session, SHARES_PER_PAGE): curr_session, SHARES_PER_PAGE,
self.server.access_keys,
self.server.key_shortcuts,
self.server.city,
self.server.shared_items_federated_domains,
self.server.account_timezone,
self.server.bold_reading,
self.server.signing_priv_key_pem,
self.server.rss_icon_at_top,
self.server.icons_as_buttons,
self.server.default_timeline,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.translate,
self.server.project_version,
self.server.cached_webfingers,
self.server.person_cache,
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.show_published_date_only,
self.server.newswire,
self.server.theme_name,
self.server.dormant_months,
self.server.peertube_instances,
self.server.allow_local_network_access,
self.server.text_mode_banner,
self.server.system_language,
self.server.max_like_count,
self.server.cw_lists,
self.server.lists_enabled,
self.server.content_license_url,
self.server.buy_sites,
self.server.max_shares_on_profile,
self.server.sites_unavailable,
self.server.no_of_books,
self.server.auto_cw_cache,
self.server.fitness):
self.server.getreq_busy = False self.server.getreq_busy = False
return return

120
daemon_get_feeds.py
View File

@ -32,7 +32,42 @@ def show_shares_feed(self, authorized: bool,
domain: str, port: int, getreq_start_time, domain: str, port: int, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, shares_file_type: str, debug: str, shares_file_type: str,
curr_session, shares_per_page: int) -> bool: curr_session, shares_per_page: int,
access_keys: {}, key_shortcuts: {},
city: str,
shared_items_federated_domains: [],
account_timezone: {},
bold_reading_nicknames: {},
signing_priv_key_pem: str,
rss_icon_at_top: bool,
icons_as_buttons: bool,
default_timeline: str,
recent_posts_cache: {},
max_recent_posts: int,
translate: {},
project_version: str,
cached_webfingers: {},
person_cache: {},
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
newswire: {},
theme_name: str,
dormant_months: int,
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
system_language: str,
max_like_count: int,
cw_lists: {},
lists_enabled: {},
content_license_url: str,
buy_sites: [],
max_shares_on_profile: int,
sites_unavailable: [],
no_of_books: int,
auto_cw_cache: {},
fitness: {}) -> bool:
"""Shows the shares feed for a particular account/actor """Shows the shares feed for a particular account/actor
""" """
shares = \ shares = \
@ -74,75 +109,69 @@ def show_shares_feed(self, authorized: bool,
self.server.getreq_busy = False self.server.getreq_busy = False
return True return True
access_keys = self.server.access_keys
if '/users/' in path: if '/users/' in path:
nickname = path.split('/users/')[1] nickname = path.split('/users/')[1]
if '/' in nickname: if '/' in nickname:
nickname = nickname.split('/')[0] nickname = nickname.split('/')[0]
if self.server.key_shortcuts.get(nickname): if key_shortcuts.get(nickname):
access_keys = \ access_keys = key_shortcuts[nickname]
self.server.key_shortcuts[nickname]
city = get_spoofed_city(city, base_dir, nickname, domain)
city = get_spoofed_city(self.server.city,
base_dir, nickname, domain)
shared_items_federated_domains = \
self.server.shared_items_federated_domains
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
msg = \ msg = \
html_profile(self.server.signing_priv_key_pem, html_profile(signing_priv_key_pem,
self.server.rss_icon_at_top, rss_icon_at_top,
self.server.icons_as_buttons, icons_as_buttons,
self.server.default_timeline, default_timeline,
self.server.recent_posts_cache, recent_posts_cache,
self.server.max_recent_posts, max_recent_posts,
self.server.translate, translate,
self.server.project_version, project_version,
base_dir, http_prefix, base_dir, http_prefix,
authorized, authorized,
get_person, shares_file_type, get_person, shares_file_type,
curr_session, curr_session,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, person_cache,
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.newswire, newswire,
self.server.theme_name, theme_name,
self.server.dormant_months, dormant_months,
self.server.peertube_instances, peertube_instances,
self.server.allow_local_network_access, allow_local_network_access,
self.server.text_mode_banner, text_mode_banner,
debug, debug,
access_keys, city, access_keys, city,
self.server.system_language, system_language,
self.server.max_like_count, max_like_count,
shared_items_federated_domains, shared_items_federated_domains,
shares, shares,
page_number, shares_per_page, page_number, shares_per_page,
self.server.cw_lists, cw_lists,
self.server.lists_enabled, lists_enabled,
self.server.content_license_url, content_license_url,
timezone, bold_reading, timezone, bold_reading,
self.server.buy_sites, buy_sites,
None, None,
self.server.max_shares_on_profile, max_shares_on_profile,
self.server.sites_unavailable, sites_unavailable,
self.server.no_of_books, no_of_books,
self.server.auto_cw_cache) auto_cw_cache)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
set_headers(self, 'text/html', msglen, set_headers(self, 'text/html', msglen,
cookie, calling_domain, False) cookie, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, fitness_performance(getreq_start_time,
self.server.fitness, fitness, '_GET', '_show_shares_feed',
'_GET', '_show_shares_feed',
debug) debug)
self.server.getreq_busy = False self.server.getreq_busy = False
return True return True
@ -168,8 +197,7 @@ def show_shares_feed(self, authorized: bool,
None, calling_domain, False) None, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, fitness_performance(getreq_start_time,
self.server.fitness, fitness, '_GET', '_show_shares_feed json',
'_GET', '_show_shares_feed json',
debug) debug)
else: else:
http_404(self, 78) http_404(self, 78)