Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

slack: Pass convert_slack_threads=True in self-serve flow.

Mateusz Mandera2dceabf8d35b
diff --git a/zerver/actions/data_import.py b/zerver/actions/data_import.py
index 7f1ef8157e5..9093db6b3e9 100644
--- a/zerver/actions/data_import.py
+++ b/zerver/actions/data_import.py
@@ -112,6 +112,7 @@ def import_slack_data(event: dict[str, Any]) -> None:
fh.name,
output_dir,
event["slack_access_token"],
+ convert_slack_threads=True,
)
attachment_size = sum(
os.path.getsize(os.path.join(dirpath, filename))
diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py
index 56a9317dcc4..07de67f3bb5 100644
--- a/zerver/tests/test_slack_importer.py
+++ b/zerver/tests/test_slack_importer.py
@@ -2899,7 +2899,7 @@ To Do
mock_save_attachment_contents.assert_called_once()
mock_do_convert_zipfile.assert_called_once_with(
- mock.ANY, mock.ANY, event["slack_access_token"]
+ mock.ANY, mock.ANY, event["slack_access_token"], convert_slack_threads=True
)
mock_do_import_realm.assert_called_once_with(
mock.ANY, prereg_realm.string_id, on_realm_created=mock.ANY
@@ -3067,7 +3067,7 @@ To Do
mock_save_attachment_contents.assert_called_once()
mock_do_convert_zipfile.assert_called_once_with(
- mock.ANY, mock.ANY, event["slack_access_token"]
+ mock.ANY, mock.ANY, event["slack_access_token"], convert_slack_threads=True
)
mock_do_import_realm.assert_called_once_with(
mock.ANY, prereg_realm.string_id, on_realm_created=mock.ANY