indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Supply more arguments

merge-requests/30/head
Bob Mottram 2023-10-01 18:23:11 +01:00
parent efc0c50520
commit ff3ce91eac
1 changed files with 80 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
daemon.py
View File

@ -664,13 +664,29 @@ class PubServer(BaseHTTPRequestHandler):
print('ERROR: http server error: ' + str(request) + ', ' + print('ERROR: http server error: ' + str(request) + ', ' +
str(client_address)) str(client_address))
def _send_reply_to_question(self, nickname: str, message_id: str, def _send_reply_to_question(self, base_dir: str,
http_prefix: str,
nickname: str, domain: str,
domain_full: str,
port: int,
message_id: str,
answer: str, answer: str,
curr_session, proxy_type: str) -> None: curr_session, proxy_type: str,
city_name: str,
person_cache: {},
debug: bool,
system_language: str,
low_bandwidth: bool,
dm_license_url: str,
content_license_url: str,
translate: {},
max_replies: int,
project_version: str,
recent_posts_cache: {}) -> None:
"""Sends a reply to a question """Sends a reply to a question
""" """
votes_filename = \ votes_filename = \
acct_dir(self.server.base_dir, nickname, self.server.domain) + \ acct_dir(base_dir, nickname, domain) + \
'/questions.txt' '/questions.txt'
if os.path.isfile(votes_filename): if os.path.isfile(votes_filename):
@ -697,15 +713,11 @@ class PubServer(BaseHTTPRequestHandler):
conversation_id = None conversation_id = None
buy_url = '' buy_url = ''
chat_url = '' chat_url = ''
city = get_spoofed_city(self.server.city, city = get_spoofed_city(city_name, base_dir, nickname, domain)
self.server.base_dir,
nickname, self.server.domain)
languages_understood = \ languages_understood = \
get_understood_languages(self.server.base_dir, get_understood_languages(base_dir, http_prefix,
self.server.http_prefix, nickname, domain_full,
nickname, person_cache)
self.server.domain_full,
self.server.person_cache)
reply_to_nickname = get_nickname_from_actor(in_reply_to) reply_to_nickname = get_nickname_from_actor(in_reply_to)
reply_to_domain, reply_to_port = get_domain_from_actor(in_reply_to) reply_to_domain, reply_to_port = get_domain_from_actor(in_reply_to)
message_json = None message_json = None
@ -715,10 +727,8 @@ class PubServer(BaseHTTPRequestHandler):
mentions_str = '@' + reply_to_nickname + '@' + reply_to_domain_full mentions_str = '@' + reply_to_nickname + '@' + reply_to_domain_full
message_json = \ message_json = \
create_direct_message_post(self.server.base_dir, nickname, create_direct_message_post(base_dir, nickname, domain,
self.server.domain, port, http_prefix,
self.server.port,
self.server.http_prefix,
mentions_str + ' ' + answer, mentions_str + ' ' + answer,
False, False, False, False,
comments_enabled, comments_enabled,
@ -726,18 +736,18 @@ class PubServer(BaseHTTPRequestHandler):
media_type, image_description, media_type, image_description,
video_transcript, city, video_transcript, city,
in_reply_to, in_reply_to_atom_uri, in_reply_to, in_reply_to_atom_uri,
subject, self.server.debug, subject, debug,
schedule_post, schedule_post,
event_date, event_time, event_date, event_time,
event_end_time, event_end_time,
location, location,
self.server.system_language, system_language,
conversation_id, conversation_id,
self.server.low_bandwidth, low_bandwidth,
self.server.dm_license_url, dm_license_url,
self.server.content_license_url, '', content_license_url, '',
languages_understood, False, languages_understood, False,
self.server.translate, buy_url, translate, buy_url,
chat_url) chat_url)
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
@ -746,20 +756,19 @@ class PubServer(BaseHTTPRequestHandler):
# name field contains the answer # name field contains the answer
message_json['object']['name'] = answer message_json['object']['name'] = answer
if self._post_to_outbox(message_json, if self._post_to_outbox(message_json,
self.server.project_version, nickname, project_version, nickname,
curr_session, proxy_type): curr_session, proxy_type):
post_filename = \ post_filename = \
locate_post(self.server.base_dir, nickname, locate_post(base_dir, nickname, domain, message_id)
self.server.domain, message_id)
if post_filename: if post_filename:
post_json_object = load_json(post_filename) post_json_object = load_json(post_filename)
if post_json_object: if post_json_object:
populate_replies(self.server.base_dir, populate_replies(base_dir,
self.server.http_prefix, http_prefix,
self.server.domain_full, domain_full,
post_json_object, post_json_object,
self.server.max_replies, max_replies,
self.server.debug) debug)
# record the vote # record the vote
try: try:
with open(votes_filename, 'a+', with open(votes_filename, 'a+',
@ -772,9 +781,8 @@ class PubServer(BaseHTTPRequestHandler):
# ensure that the cached post is removed if it exists, # ensure that the cached post is removed if it exists,
# so that it then will be recreated # so that it then will be recreated
cached_post_filename = \ cached_post_filename = \
get_cached_post_filename(self.server.base_dir, get_cached_post_filename(base_dir,
nickname, nickname, domain,
self.server.domain,
post_json_object) post_json_object)
if cached_post_filename: if cached_post_filename:
if os.path.isfile(cached_post_filename): if os.path.isfile(cached_post_filename):
@ -786,7 +794,7 @@ class PubServer(BaseHTTPRequestHandler):
cached_post_filename) cached_post_filename)
# remove from memory cache # remove from memory cache
remove_post_from_cache(post_json_object, remove_post_from_cache(post_json_object,
self.server.recent_posts_cache) recent_posts_cache)
else: else:
print('ERROR: unable to post vote to outbox') print('ERROR: unable to post vote to outbox')
else: else:
@ -5071,9 +5079,19 @@ class PubServer(BaseHTTPRequestHandler):
self.server.postreq_busy = False self.server.postreq_busy = False
def _receive_vote(self, calling_domain: str, cookie: str, def _receive_vote(self, calling_domain: str, cookie: str,
path: str, http_prefix: str, domain_full: str, path: str, http_prefix: str,
domain: str, domain_full: str, port: int,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
curr_session, proxy_type: str) -> None: curr_session, proxy_type: str,
base_dir: str, city: str,
person_cache: {}, debug: bool,
system_language: str,
low_bandwidth: bool,
dm_license_url: str,
content_license_url: str,
translate: {}, max_replies: int,
project_version: str,
recent_posts_cache: {}) -> None:
"""Receive a vote via POST """Receive a vote via POST
""" """
first_post_id = '' first_post_id = ''
@ -5172,8 +5190,18 @@ class PubServer(BaseHTTPRequestHandler):
if '&' in answer: if '&' in answer:
answer = answer.split('&')[0] answer = answer.split('&')[0]
self._send_reply_to_question(nickname, message_id, answer, self._send_reply_to_question(base_dir, http_prefix,
curr_session, proxy_type) nickname, domain, domain_full, port,
message_id, answer,
curr_session, proxy_type, city,
person_cache, debug,
system_language,
low_bandwidth,
dm_license_url,
content_license_url,
translate, max_replies,
project_version,
recent_posts_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):
@ -23074,11 +23102,25 @@ class PubServer(BaseHTTPRequestHandler):
self._receive_vote(calling_domain, cookie, self._receive_vote(calling_domain, cookie,
self.path, self.path,
self.server.http_prefix, self.server.http_prefix,
self.server.domain,
self.server.domain_full, self.server.domain_full,
self.server.port,
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
curr_session, curr_session,
proxy_type) proxy_type,
self.server.base_dir,
self.server.city,
self.server.person_cache,
self.server.debug,
self.server.system_language,
self.server.low_bandwidth,
self.server.dm_license_url,
self.server.content_license_url,
self.server.translate,
self.server.max_replies,
self.server.project_version,
self.server.recent_posts_cache)
self.server.postreq_busy = False self.server.postreq_busy = False
return return