paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mattermost: Update references to "private message" and "PM".

Browse Source 
Updates references to "private message" and "PM" in the data import
and related tests for Mattermost to be "direct message" or "DM"
instead.
This commit is contained in:
Lauryn Menard
2023-06-19 16:29:50 +02:00
committed by Tim Abbott
parent d53b854a7c
commit 2eeeda7694
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/data_import/mattermost.py
View File

@@ -546,7 +546,7 @@ def process_posts(
post_data_list = []
for post in post_data:
if "team" not in post:
# Mattermost doesn't specify a team for private messages
# Mattermost doesn't specify a team for direct messages
# in its export format. This line of code requires that
# we only be importing data from a single team (checked
# elsewhere) -- we just assume it's the target team.
@@ -579,9 +579,9 @@ def process_posts(
if "channel" in post_dict:
message_dict["channel_name"] = post_dict["channel"]
elif "channel_members" in post_dict:
# This case is for handling posts from PMs and huddles, not channels.
# PMs and huddles are known as direct_channels in Slack and hence
# the name channel_members.
# This case is for handling posts from direct messages and huddles,
# not channels. Direct messages and huddles are known as direct_channels
# in Slack and hence the name channel_members.
channel_members = post_dict["channel_members"]
if len(channel_members) > 2:
message_dict["huddle_name"] = generate_huddle_name(channel_members)
@@ -685,7 +685,7 @@ def write_message_data(
else:
post_types = ["channel_post"]
logging.warning(
"Skipping importing huddles and PMs since there are multiple teams in the export"
"Skipping importing huddles and DMs since there are multiple teams in the export"
)
for post_type in post_types:

14
zerver/tests/test_mattermost_importer.py
View File

@@ -427,7 +427,7 @@ class MatterMostImporter(ZulipTestCase):
self.assertEqual(
user_handler.get_user(zerver_attachments[0]["owner"])["email"], "ron@zulip.com"
)
# TODO: Assert this for False after fixing the file permissions in PMs
# TODO: Assert this for False after fixing the file permissions in direct messages
self.assertTrue(zerver_attachments[0]["is_realm_public"])
self.assert_length(uploads_list, 1)
@@ -635,8 +635,8 @@ class MatterMostImporter(ZulipTestCase):
self.assertEqual(
warn_log.output,
[
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
],
)
@@ -870,8 +870,8 @@ class MatterMostImporter(ZulipTestCase):
self.assertEqual(
warn_log.output,
[
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
],
)
@@ -897,8 +897,8 @@ class MatterMostImporter(ZulipTestCase):
self.assertEqual(
warn_log.output,
[
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and PMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
"WARNING:root:Skipping importing huddles and DMs since there are multiple teams in the export",
],
)