From e9900b2bdf4e41acbf67e5169630a7abc6af0bb4 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 12 Dec 2018 10:07:52 -0800 Subject: [PATCH] gitter: Do something reasonable with invalid fullnames. --- zerver/data_import/gitter.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zerver/data_import/gitter.py b/zerver/data_import/gitter.py index 99252aaf77..b2e0cfab02 100644 --- a/zerver/data_import/gitter.py +++ b/zerver/data_import/gitter.py @@ -217,8 +217,13 @@ def get_usermentions(message: Dict[str, Any], user_map: Dict[str, int], for mention in message['mentions']: if mention.get('userId') in user_map: gitter_mention = '@%s' % (mention['screenName']) - zulip_mention = ('@**%s**' % - (user_short_name_to_full_name[mention['screenName']])) + if mention['screenName'] not in user_short_name_to_full_name: + logging.info("Mentioned user %s never sent any messages, so has no full name data" % + mention['screenName']) + full_name = mention['screenName'] + else: + full_name = user_short_name_to_full_name[mention['screenName']] + zulip_mention = ('@**%s**' % (full_name,)) message['text'] = message['text'].replace(gitter_mention, zulip_mention) mentioned_user_ids.append(user_map[mention['userId']])