diff --git a/daemon_get.py b/daemon_get.py
index b03f1f30f..783e14e3d 100644
--- a/daemon_get.py
+++ b/daemon_get.py
@@ -4701,7 +4701,48 @@ def daemon_http_get(self) -> None:
self.server.port,
getreq_start_time,
cookie, self.server.debug,
- curr_session, ua_str, MAX_POSTS_IN_FEED):
+ curr_session, ua_str, MAX_POSTS_IN_FEED,
+ self.server.recent_posts_cache,
+ self.server.positive_voting,
+ self.server.voting_time_mins,
+ self.server.full_width_tl_button_header,
+ self.server.access_keys,
+ self.server.key_shortcuts,
+ self.server.shared_items_federated_domains,
+ self.server.allow_local_network_access,
+ self.server.twitter_replacement_domain,
+ self.server.show_published_date_only,
+ self.server.account_timezone,
+ self.server.bold_reading,
+ self.server.reverse_sequence,
+ self.server.default_timeline,
+ 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.newswire,
+ self.server.show_publish_as_icon,
+ self.server.icons_as_buttons,
+ self.server.rss_icon_at_top,
+ self.server.publish_button_at_top,
+ self.server.theme_name,
+ self.server.peertube_instances,
+ self.server.text_mode_banner,
+ 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.fitness,
+ self.server.onion_domain,
+ self.server.i2p_domain):
self.server.getreq_busy = False
return
diff --git a/daemon_get_timeline.py b/daemon_get_timeline.py
index 122090c3f..cca2f8494 100644
--- a/daemon_get_timeline.py
+++ b/daemon_get_timeline.py
@@ -1942,13 +1942,54 @@ def show_replies(self, authorized: bool,
getreq_start_time,
cookie: str, debug: str,
curr_session, ua_str: str,
- max_posts_in_feed: int) -> bool:
+ max_posts_in_feed: int,
+ recent_posts_cache: {},
+ positive_voting: bool,
+ voting_time_mins: int,
+ full_width_tl_button_header: bool,
+ access_keys: {},
+ key_shortcuts: {},
+ shared_items_federated_domains: [],
+ allow_local_network_access: bool,
+ twitter_replacement_domain: str,
+ show_published_date_only: bool,
+ account_timezone: {},
+ bold_reading_nicknames: [],
+ reverse_sequence_nicknames: [],
+ default_timeline: str,
+ max_recent_posts: int,
+ translate: {},
+ cached_webfingers: {},
+ person_cache: {},
+ allow_deletion: bool,
+ project_version: str,
+ yt_replace_domain: str,
+ newswire: {},
+ show_publish_as_icon: bool,
+ icons_as_buttons: bool,
+ rss_icon_at_top: bool,
+ publish_button_at_top: bool,
+ theme_name: str,
+ peertube_instances: [],
+ text_mode_banner: str,
+ system_language: str,
+ max_like_count: int,
+ signing_priv_key_pem: str,
+ cw_lists: {},
+ lists_enabled: {},
+ dogwhistles: {},
+ min_images_for_accounts: [],
+ buy_sites: [],
+ auto_cw_cache: {},
+ fitness: {},
+ onion_domain: str,
+ i2p_domain: str) -> bool:
"""Shows the replies timeline
"""
if '/users/' in path:
if authorized:
inbox_replies_feed = \
- person_box_json(self.server.recent_posts_cache,
+ person_box_json(recent_posts_cache,
base_dir,
domain,
port,
@@ -1956,8 +1997,8 @@ def show_replies(self, authorized: bool,
http_prefix,
max_posts_in_feed, 'tlreplies',
True,
- 0, self.server.positive_voting,
- self.server.voting_time_mins)
+ 0, positive_voting,
+ voting_time_mins)
if not inbox_replies_feed:
inbox_replies_feed = []
if request_http(self.headers, debug):
@@ -1978,7 +2019,7 @@ def show_replies(self, authorized: bool,
if 'page=' not in path:
# if no page was specified then show the first
inbox_replies_feed = \
- person_box_json(self.server.recent_posts_cache,
+ person_box_json(recent_posts_cache,
base_dir,
domain,
port,
@@ -1986,34 +2027,21 @@ def show_replies(self, authorized: bool,
http_prefix,
max_posts_in_feed, 'tlreplies',
True,
- 0, self.server.positive_voting,
- self.server.voting_time_mins)
- full_width_tl_button_header = \
- self.server.full_width_tl_button_header
+ 0, positive_voting,
+ voting_time_mins)
minimal_nick = is_minimal(base_dir, domain, nickname)
- access_keys = self.server.access_keys
- if self.server.key_shortcuts.get(nickname):
- access_keys = \
- self.server.key_shortcuts[nickname]
+ if key_shortcuts.get(nickname):
+ access_keys = key_shortcuts[nickname]
- shared_items_federated_domains = \
- self.server.shared_items_federated_domains
- allow_local_network_access = \
- self.server.allow_local_network_access
- twitter_replacement_domain = \
- self.server.twitter_replacement_domain
- show_published_date_only = \
- self.server.show_published_date_only
timezone = None
- if self.server.account_timezone.get(nickname):
- timezone = \
- self.server.account_timezone.get(nickname)
+ if account_timezone.get(nickname):
+ timezone = account_timezone.get(nickname)
bold_reading = False
- if self.server.bold_reading.get(nickname):
+ if bold_reading_nicknames.get(nickname):
bold_reading = True
reverse_sequence = False
- if nickname in self.server.reverse_sequence:
+ if nickname in reverse_sequence_nicknames:
reverse_sequence = True
last_post_id = None
if ';lastpost=' in path:
@@ -2021,65 +2049,62 @@ def show_replies(self, authorized: bool,
if ';' in last_post_id:
last_post_id = last_post_id.split(';')[0]
msg = \
- html_inbox_replies(self.server.default_timeline,
- self.server.recent_posts_cache,
- self.server.max_recent_posts,
- self.server.translate,
+ html_inbox_replies(default_timeline,
+ recent_posts_cache,
+ max_recent_posts,
+ translate,
page_number, max_posts_in_feed,
curr_session,
base_dir,
- self.server.cached_webfingers,
- self.server.person_cache,
+ cached_webfingers,
+ person_cache,
nickname,
domain,
port,
inbox_replies_feed,
- self.server.allow_deletion,
+ allow_deletion,
http_prefix,
- self.server.project_version,
+ project_version,
minimal_nick,
- self.server.yt_replace_domain,
+ yt_replace_domain,
twitter_replacement_domain,
show_published_date_only,
- self.server.newswire,
- self.server.positive_voting,
- self.server.show_publish_as_icon,
+ newswire,
+ positive_voting,
+ show_publish_as_icon,
full_width_tl_button_header,
- self.server.icons_as_buttons,
- self.server.rss_icon_at_top,
- self.server.publish_button_at_top,
- authorized, self.server.theme_name,
- self.server.peertube_instances,
+ icons_as_buttons,
+ rss_icon_at_top,
+ publish_button_at_top,
+ authorized, theme_name,
+ peertube_instances,
allow_local_network_access,
- self.server.text_mode_banner,
+ text_mode_banner,
access_keys,
- self.server.system_language,
- self.server.max_like_count,
+ system_language,
+ max_like_count,
shared_items_federated_domains,
- self.server.signing_priv_key_pem,
- self.server.cw_lists,
- self.server.lists_enabled,
+ signing_priv_key_pem,
+ cw_lists,
+ lists_enabled,
timezone, bold_reading,
- self.server.dogwhistles,
+ dogwhistles,
ua_str,
- self.server.min_images_for_accounts,
+ min_images_for_accounts,
reverse_sequence, last_post_id,
- self.server.buy_sites,
- self.server.auto_cw_cache)
+ 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_replies',
debug)
else:
# don't need authorized fetch here because there is
# already the authorization check
- onion_domain = self.server.onion_domain
- i2p_domain = self.server.i2p_domain
msg_str = json.dumps(inbox_replies_feed,
ensure_ascii=False)
msg_str = convert_domains(calling_domain,
@@ -2095,8 +2120,7 @@ def show_replies(self, authorized: bool,
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_replies json',
debug)
return True