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

Remove inbox ending

main
Bob Mottram 2023-08-29 12:12:41 +01:00
parent 253a85523d
commit 73cc5443f0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
posts.py
View File

@ -2545,21 +2545,25 @@ def _add_send_block(base_dir: str, nickname: str, domain: str,
send_block_filename = \ send_block_filename = \
acct_dir(base_dir, nickname, domain) + '/send_blocks.txt' acct_dir(base_dir, nickname, domain) + '/send_blocks.txt'
inbox_url = inbox_url + '\n'
if inbox_url.endswith('/inbox\n'):
inbox_url = inbox_url.replace('/inbox\n', '\n')
if not os.path.isfile(send_block_filename): if not os.path.isfile(send_block_filename):
try: try:
with open(send_block_filename, 'w+', with open(send_block_filename, 'w+',
encoding='utf-8') as fp_blocks: encoding='utf-8') as fp_blocks:
fp_blocks.write(inbox_url + '\n') fp_blocks.write(inbox_url)
except OSError: except OSError:
print('EX: _add_send_block unable to create ' + print('EX: _add_send_block unable to create ' +
send_block_filename) send_block_filename)
return return
if not text_in_file(inbox_url + '\n', send_block_filename, False): if not text_in_file(inbox_url, send_block_filename, False):
try: try:
with open(send_block_filename, 'a+', with open(send_block_filename, 'a+',
encoding='utf-8') as fp_blocks: encoding='utf-8') as fp_blocks:
fp_blocks.write(inbox_url + '\n') fp_blocks.write(inbox_url)
except OSError: except OSError:
print('EX: _add_send_block unable to write ' + print('EX: _add_send_block unable to write ' +
send_block_filename) send_block_filename)
@ -2572,10 +2576,14 @@ def _remove_send_block(base_dir: str, nickname: str, domain: str,
send_block_filename = \ send_block_filename = \
acct_dir(base_dir, nickname, domain) + '/send_blocks.txt' acct_dir(base_dir, nickname, domain) + '/send_blocks.txt'
inbox_url = inbox_url + '\n'
if inbox_url.endswith('/inbox\n'):
inbox_url = inbox_url.replace('/inbox\n', '\n')
if not os.path.isfile(send_block_filename): if not os.path.isfile(send_block_filename):
return return
if text_in_file(inbox_url + '\n', send_block_filename, False): if text_in_file(inbox_url, send_block_filename, False):
send_blocks_str = '' send_blocks_str = ''
try: try:
with open(send_block_filename, 'r', with open(send_block_filename, 'r',
@ -2584,7 +2592,7 @@ def _remove_send_block(base_dir: str, nickname: str, domain: str,
except OSError: except OSError:
print('EX: _remove_send_block unable to read ' + print('EX: _remove_send_block unable to read ' +
send_block_filename) send_block_filename)
send_blocks_str = send_blocks_str.replace(inbox_url + '\n', '') send_blocks_str = send_blocks_str.replace(inbox_url, '')
try: try:
with open(send_block_filename, 'w+', with open(send_block_filename, 'w+',
encoding='utf-8') as fp_blocks: encoding='utf-8') as fp_blocks: