From c308799133229e3e00dde46f4e014a84bd2da617 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 29 Jun 2022 15:42:51 +0200 Subject: [PATCH] rocketchat: Only set message content if it exists. Not sure where those come from since we discovered this with production data. Signed-off-by: Florian Pritz --- zerver/data_import/rocketchat.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/zerver/data_import/rocketchat.py b/zerver/data_import/rocketchat.py index 21a45fd6f2..7dd5831dfb 100644 --- a/zerver/data_import/rocketchat.py +++ b/zerver/data_import/rocketchat.py @@ -648,7 +648,15 @@ def process_messages( def message_to_dict(message: Dict[str, Any]) -> Dict[str, Any]: rc_sender_id = message["u"]["_id"] sender_id = user_id_mapper.get(rc_sender_id) - content = message["msg"] + if "msg" in message: + content = message["msg"] + else: # nocoverage + content = "This message imported from Rocket.Chat had no body in the data export." + logging.info( + "Message %s contains no message content: %s", + message["_id"], + message, + ) if message.get("reactions"): reactions = list_reactions(message["reactions"])