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

Importing follows

merge-requests/30/head
Bob Mottram 2023-02-10 19:30:25 +00:00
parent fe5c4070cf
commit cc4808d8de
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon.py
View File

@ -6176,7 +6176,7 @@ class PubServer(BaseHTTPRequestHandler):
'banner', 'search_banner', 'banner', 'search_banner',
'instanceLogo', 'instanceLogo',
'left_col_image', 'right_col_image', 'left_col_image', 'right_col_image',
'import_follows', 'importFollows',
'import_theme' 'import_theme'
) )
profile_media_types_uploaded = {} profile_media_types_uploaded = {}
@ -6221,7 +6221,7 @@ class PubServer(BaseHTTPRequestHandler):
except OSError: except OSError:
print('EX: _profile_edit unable to delete ' + print('EX: _profile_edit unable to delete ' +
filename_base) filename_base)
elif m_type == 'import_follows': elif m_type == 'importFollows':
filename_base = \ filename_base = \
acct_dir(base_dir, nickname, domain) + \ acct_dir(base_dir, nickname, domain) + \
'/import_following.csv' '/import_following.csv'
@ -6241,7 +6241,7 @@ class PubServer(BaseHTTPRequestHandler):
' media, zip, csv or font filename in POST') ' media, zip, csv or font filename in POST')
continue continue
if m_type == 'import_follows': if m_type == 'importFollows':
if os.path.isfile(filename_base): if os.path.isfile(filename_base):
print(nickname + ' imported follows csv') print(nickname + ' imported follows csv')
else: else:
@ -7832,6 +7832,21 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
print('blocks not imported for ' + nickname) print('blocks not imported for ' + nickname)
if fields.get('importFollows'):
filename_base = \
acct_dir(base_dir, nickname, domain) + \
'/import_following.csv'
follows_str = fields['importFollows']
while follows_str.startswith('\n'):
follows_str = follows_str[1:]
try:
with open(filename_base, 'w+',
encoding='utf-8') as fp_foll:
fp_foll.write(follows_str)
except OSError:
print('EX: unable to write imported follows ' +
filename_base)
# Save DM allowed instances list. # Save DM allowed instances list.
# The allow list for incoming DMs, # The allow list for incoming DMs,
# if the .followDMs flag file exists # if the .followDMs flag file exists

4
webapp_profile.py
View File

@ -2281,8 +2281,8 @@ def _html_edit_profile_import_export(nickname: str, domain: str,
edit_profile_form += \ edit_profile_form += \
'<p><label class="labels">' + \ '<p><label class="labels">' + \
translate['Import Follows'] + '</label>\n' translate['Import Follows'] + '</label>\n'
edit_profile_form += '<input type="file" id="import_follows" ' edit_profile_form += '<input type="file" id="importFollows" '
edit_profile_form += 'name="import_follows" ' edit_profile_form += 'name="importFollows" '
edit_profile_form += 'accept=".csv"></p>\n' edit_profile_form += 'accept=".csv"></p>\n'
edit_profile_form += \ edit_profile_form += \