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-14 13:22:24 +01:00
parent 52c06872a1
commit 8e5e5dfd71
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon_post.py
View File

@ -441,7 +441,9 @@ def daemon_http_post(self) -> None:
self.server.translate, self.server.translate,
self.server.max_replies, self.server.max_replies,
self.server.project_version, self.server.project_version,
self.server.recent_posts_cache) self.server.recent_posts_cache,
self.server.default_timeline,
self.server.auto_cw_cache)
self.server.postreq_busy = False self.server.postreq_busy = False
return return

16
daemon_post_question.py
View File

@ -41,7 +41,9 @@ def receive_vote(self, calling_domain: str, cookie: str,
content_license_url: str, content_license_url: str,
translate: {}, max_replies: int, translate: {}, max_replies: int,
project_version: str, project_version: str,
recent_posts_cache: {}) -> None: recent_posts_cache: {},
default_timeline: str,
auto_cw_cache: {}) -> None:
"""Receive a vote on a question via POST """Receive a vote on a question via POST
""" """
first_post_id = '' first_post_id = ''
@ -94,7 +96,7 @@ def receive_vote(self, calling_domain: str, cookie: str,
elif (calling_domain.endswith('.i2p') and i2p_domain): elif (calling_domain.endswith('.i2p') and i2p_domain):
actor = 'http://' + i2p_domain + users_path actor = 'http://' + i2p_domain + users_path
actor_path_str = \ actor_path_str = \
actor + '/' + self.server.default_timeline + \ actor + '/' + default_timeline + \
'?page=' + str(page_number) '?page=' + str(page_number)
redirect_headers(self, actor_path_str, redirect_headers(self, actor_path_str,
cookie, calling_domain) cookie, calling_domain)
@ -151,13 +153,14 @@ def receive_vote(self, calling_domain: str, cookie: str,
content_license_url, content_license_url,
translate, max_replies, translate, max_replies,
project_version, project_version,
recent_posts_cache) recent_posts_cache,
auto_cw_cache)
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
actor = 'http://' + onion_domain + users_path actor = 'http://' + onion_domain + users_path
elif (calling_domain.endswith('.i2p') and i2p_domain): elif (calling_domain.endswith('.i2p') and i2p_domain):
actor = 'http://' + i2p_domain + users_path actor = 'http://' + i2p_domain + users_path
actor_path_str = \ actor_path_str = \
actor + '/' + self.server.default_timeline + \ actor + '/' + default_timeline + \
'?page=' + str(page_number) + first_post_id + last_post_id '?page=' + str(page_number) + first_post_id + last_post_id
redirect_headers(self, actor_path_str, cookie, redirect_headers(self, actor_path_str, cookie,
calling_domain) calling_domain)
@ -183,7 +186,8 @@ def _send_reply_to_question(self, base_dir: str,
translate: {}, translate: {},
max_replies: int, max_replies: int,
project_version: str, project_version: str,
recent_posts_cache: {}) -> None: recent_posts_cache: {},
auto_cw_cache: {}) -> None:
"""Sends a reply to a question """Sends a reply to a question
""" """
votes_filename = \ votes_filename = \
@ -250,7 +254,7 @@ def _send_reply_to_question(self, base_dir: str,
languages_understood, False, languages_understood, False,
translate, buy_url, translate, buy_url,
chat_url, chat_url,
self.server.auto_cw_cache) auto_cw_cache)
if message_json: if message_json:
# NOTE: content and contentMap are not required, but we will keep # NOTE: content and contentMap are not required, but we will keep
# them in there so that the post does not get filtered out by # them in there so that the post does not get filtered out by