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

Import blocks later

merge-requests/30/head
Bob Mottram 2023-02-10 19:10:50 +00:00
parent 489082a100
commit fe5c4070cf
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon.py
View File

@ -6422,16 +6422,6 @@ class PubServer(BaseHTTPRequestHandler):
actor_skills_ctr: actor_skills_ctr:
actor_changed = True actor_changed = True
if fields.get('importBlocks'):
blocks_str = fields['importBlocks']
while blocks_str.startswith('\n'):
blocks_str = blocks_str[1:]
blocks_lines = blocks_str.split('\n')
if import_blocking_file(base_dir, nickname, domain,
blocks_lines):
print('blocks imported for ' + nickname)
else:
print('blocks not imported for ' + nickname)
# change password # change password
if fields.get('password') and \ if fields.get('password') and \
fields.get('passwordconfirm'): fields.get('passwordconfirm'):
@ -7830,6 +7820,17 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
add_account_blocks(base_dir, add_account_blocks(base_dir,
nickname, domain, '') nickname, domain, '')
# import blocks from csv file
if fields.get('importBlocks'):
blocks_str = fields['importBlocks']
while blocks_str.startswith('\n'):
blocks_str = blocks_str[1:]
blocks_lines = blocks_str.split('\n')
if import_blocking_file(base_dir, nickname, domain,
blocks_lines):
print('blocks imported for ' + nickname)
else:
print('blocks not imported for ' + nickname)
# Save DM allowed instances list. # Save DM allowed instances list.
# The allow list for incoming DMs, # The allow list for incoming DMs,