From 0a88202763e5eb2bc0c3f68fbae3a584df6e7ee0 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Thu, 16 Jul 2020 17:23:03 +0000 Subject: [PATCH] webhooks: Ignore short_name to guess user. The short_name field isn't super reliable, and we are about to eliminate it. --- zerver/webhooks/harbor/view.py | 1 - zerver/webhooks/jira/view.py | 1 - zerver/webhooks/teamcity/view.py | 1 - 3 files changed, 3 deletions(-) diff --git a/zerver/webhooks/harbor/view.py b/zerver/webhooks/harbor/view.py index 3dd7a35c05..39cdd5bf1e 100644 --- a/zerver/webhooks/harbor/view.py +++ b/zerver/webhooks/harbor/view.py @@ -27,7 +27,6 @@ def guess_zulip_user_from_harbor(harbor_username: str, realm: Realm) -> Optional # and beginning of email address user = UserProfile.objects.filter( Q(full_name__iexact=harbor_username) | - Q(short_name__iexact=harbor_username) | Q(email__istartswith=harbor_username), is_active=True, realm=realm).order_by("id")[0] diff --git a/zerver/webhooks/jira/view.py b/zerver/webhooks/jira/view.py index ab095687df..d9d8ad5f24 100644 --- a/zerver/webhooks/jira/view.py +++ b/zerver/webhooks/jira/view.py @@ -29,7 +29,6 @@ def guess_zulip_user_from_jira(jira_username: str, realm: Realm) -> Optional[Use # and beginning of email address user = UserProfile.objects.filter( Q(full_name__iexact=jira_username) | - Q(short_name__iexact=jira_username) | Q(email__istartswith=jira_username), is_active=True, realm=realm).order_by("id")[0] diff --git a/zerver/webhooks/teamcity/view.py b/zerver/webhooks/teamcity/view.py index b83cfb0c82..3b926043a6 100644 --- a/zerver/webhooks/teamcity/view.py +++ b/zerver/webhooks/teamcity/view.py @@ -32,7 +32,6 @@ def guess_zulip_user_from_teamcity(teamcity_username: str, realm: Realm) -> Opti # and beginning of email address user = UserProfile.objects.filter( Q(full_name__iexact=teamcity_username) | - Q(short_name__iexact=teamcity_username) | Q(email__istartswith=teamcity_username), is_active=True, realm=realm).order_by("id")[0]