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

Write a file to indicate that a post was delivered via a third party

main
Bob Mottram 2022-03-14 17:37:46 +00:00
parent 2f58bade3a
commit b08acd0cf0
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inbox.py
View File

@ -3297,7 +3297,8 @@ def _inbox_after_initial(server,
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
cw_lists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
content_license_url: str, content_license_url: str,
languages_understood: []) -> bool: languages_understood: [],
mitm: bool) -> bool:
""" Anything which needs to be done after initial checks have passed """ Anything which needs to be done after initial checks have passed
""" """
# if this is a clearnet instance then replace any onion/i2p # if this is a clearnet instance then replace any onion/i2p
@ -3634,6 +3635,16 @@ def _inbox_after_initial(server,
# save the post to file # save the post to file
if save_json(post_json_object, destination_filename): if save_json(post_json_object, destination_filename):
if mitm:
# write a file to indicate that this post was delivered
# via a third party
destination_filename_mitm = destination_filename + '.mitm'
try:
with open(destination_filename_mitm, 'w+') as mitm_file:
mitm_file.write('\n')
except OSError:
print('EX: unable to write ' + destination_filename_mitm)
_low_frequency_post_notification(base_dir, http_prefix, _low_frequency_post_notification(base_dir, http_prefix,
nickname, domain, port, nickname, domain, port,
handle, post_is_dm, json_obj) handle, post_is_dm, json_obj)
@ -4728,6 +4739,9 @@ def run_inbox_queue(server,
destination = \ destination = \
queue_json['destination'].replace(inbox_handle, handle) queue_json['destination'].replace(inbox_handle, handle)
languages_understood = [] languages_understood = []
mitm = False
if queue_json.get('mitm'):
mitm = True
_inbox_after_initial(server, _inbox_after_initial(server,
recent_posts_cache, recent_posts_cache,
max_recent_posts, max_recent_posts,
@ -4759,7 +4773,7 @@ def run_inbox_queue(server,
default_reply_interval_hrs, default_reply_interval_hrs,
cw_lists, lists_enabled, cw_lists, lists_enabled,
content_license_url, content_license_url,
languages_understood) languages_understood, mitm)
if debug: if debug:
pprint(queue_json['post']) pprint(queue_json['post'])
print('Queue: Queue post accepted') print('Queue: Queue post accepted')

2
utils.py
View File

@ -1788,7 +1788,7 @@ def delete_post(base_dir: str, http_prefix: str,
# remove any attachment # remove any attachment
_remove_attachment(base_dir, http_prefix, domain, post_json_object) _remove_attachment(base_dir, http_prefix, domain, post_json_object)
extensions = ('votes', 'arrived', 'muted', 'tts', 'reject') extensions = ('votes', 'arrived', 'muted', 'tts', 'reject', 'mitm')
for ext in extensions: for ext in extensions:
ext_filename = post_filename + '.' + ext ext_filename = post_filename + '.' + ext
if os.path.isfile(ext_filename): if os.path.isfile(ext_filename):