paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 07:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhooks: Ignore short_name to guess user.

Browse Source 
The short_name field isn't super reliable, and
we are about to eliminate it.
This commit is contained in:
Steve Howell
2020-07-16 17:23:03 +00:00
committed by Tim Abbott
parent 7d9f24c58c
commit 0a88202763
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/webhooks/harbor/view.py
View File

@@ -27,7 +27,6 @@ def guess_zulip_user_from_harbor(harbor_username: str, realm: Realm) -> Optional
# and beginning of email address # and beginning of email address
user = UserProfile.objects.filter( user = UserProfile.objects.filter(
Q(full_name__iexact=harbor_username) | Q(full_name__iexact=harbor_username) |
Q(short_name__iexact=harbor_username) |
Q(email__istartswith=harbor_username), Q(email__istartswith=harbor_username),
is_active=True, is_active=True,
realm=realm).order_by("id")[0] realm=realm).order_by("id")[0]

1
zerver/webhooks/jira/view.py
View File

@@ -29,7 +29,6 @@ def guess_zulip_user_from_jira(jira_username: str, realm: Realm) -> Optional[Use
# and beginning of email address # and beginning of email address
user = UserProfile.objects.filter( user = UserProfile.objects.filter(
Q(full_name__iexact=jira_username) | Q(full_name__iexact=jira_username) |
Q(short_name__iexact=jira_username) |
Q(email__istartswith=jira_username), Q(email__istartswith=jira_username),
is_active=True, is_active=True,
realm=realm).order_by("id")[0] realm=realm).order_by("id")[0]

1
zerver/webhooks/teamcity/view.py
View File

@@ -32,7 +32,6 @@ def guess_zulip_user_from_teamcity(teamcity_username: str, realm: Realm) -> Opti
# and beginning of email address # and beginning of email address
user = UserProfile.objects.filter( user = UserProfile.objects.filter(
Q(full_name__iexact=teamcity_username) | Q(full_name__iexact=teamcity_username) |
Q(short_name__iexact=teamcity_username) |
Q(email__istartswith=teamcity_username), Q(email__istartswith=teamcity_username),
is_active=True, is_active=True,
realm=realm).order_by("id")[0] realm=realm).order_by("id")[0]