Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

slack import: Improve algorithm and formatting for attachments. 

The previous system would crash with some files (because for some
reason the comment count was 1 but there was no "initial comment") and
also the file comment and file name were sorta redundant.
This commit is contained in:
Tim Abbott 2018-03-12 16:33:42 -07:00
parent 06071166c7
commit 99bae7fa5d
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/slack_data_to_zulip_data.py
View File

@ -671,14 +671,7 @@ def get_attachment_path_and_content(fileinfo: ZerverFieldsT, realm_id: int) -> T
sanitize_name(fileinfo['name'])
])
attachment_path = ('/user_uploads/%s' % (s3_path))
# change the default upload message: 'uploaded this file: <file_name>' in Slack
# to '<file_comment> <file_name>'
if fileinfo['comments_count'] != 0:
file_comment = fileinfo['initial_comment'].get("comment", '')
else:
file_comment = ''
content = '%s [%s](%s)' % (file_comment, fileinfo['name'], attachment_path)
content = '[%s](%s)' % (fileinfo['title'], attachment_path)
return s3_path, content