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

Remove @-mentions from jira integration.

Browse Source 
Because of a lot of annoying notifcations we decided to remove
all @-mentions in jira. We replaced it by just login (without @).
This commit is contained in:
Tomasz Kolek
2016-10-19 13:21:07 +02:00
committed by Tim Abbott
parent c3d3288b63
commit 67adf570e7
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/tests/webhooks/test_jira.py
View File

@@ -27,14 +27,14 @@ class JiraHookTests(WebhookTestCase):
stream_name="jira_custom", stream_name="jira_custom",
content_type="application/json") content_type="application/json")
self.assertEqual(msg.topic_name(), "BUG-15: New bug with hook") self.assertEqual(msg.topic_name(), "BUG-15: New bug with hook")
self.assertEqual(msg.content, """Leo Franchi **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to @**no one**: self.assertEqual(msg.content, """Leo Franchi **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to **no one**:
> New bug with hook""") > New bug with hook""")
def test_created(self): def test_created(self):
# type: () -> None # type: () -> None
expected_subject = "BUG-15: New bug with hook" expected_subject = "BUG-15: New bug with hook"
expected_message = """Leo Franchi **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to @**no one**: expected_message = """Leo Franchi **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to **no one**:
> New bug with hook""" > New bug with hook"""
self.send_and_test_stream_message('created', expected_subject, expected_message) self.send_and_test_stream_message('created', expected_subject, expected_message)
@@ -42,7 +42,7 @@ class JiraHookTests(WebhookTestCase):
def test_created_assignee(self): def test_created_assignee(self):
# type: () -> None # type: () -> None
expected_subject = "TEST-4: Test Created Assignee" expected_subject = "TEST-4: Test Created Assignee"
expected_message = """Leonardo Franchi [Administrator] **created** [TEST-4](https://zulipp.atlassian.net/browse/TEST-4) priority Major, assigned to @**Leonardo Franchi [Administrator]**: expected_message = """Leonardo Franchi [Administrator] **created** [TEST-4](https://zulipp.atlassian.net/browse/TEST-4) priority Major, assigned to **Leonardo Franchi [Administrator]**:
> Test Created Assignee""" > Test Created Assignee"""
self.send_and_test_stream_message('created_assignee', expected_subject, expected_message) self.send_and_test_stream_message('created_assignee', expected_subject, expected_message)
@@ -50,7 +50,7 @@ class JiraHookTests(WebhookTestCase):
def test_commented(self): def test_commented(self):
# type: () -> None # type: () -> None
expected_subject = "BUG-15: New bug with hook" expected_subject = "BUG-15: New bug with hook"
expected_message = """Leo Franchi **updated** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) (assigned to @**Othello, the Moor of Venice**): expected_message = """Leo Franchi **updated** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) (assigned to **Othello, the Moor of Venice**):
Adding a comment. Oh, what a comment it is! Adding a comment. Oh, what a comment it is!
@@ -72,16 +72,16 @@ Adding a comment. Oh, what a comment it is!
def test_reassigned(self): def test_reassigned(self):
# type: () -> None # type: () -> None
expected_subject = "BUG-15: New bug with hook" expected_subject = "BUG-15: New bug with hook"
expected_message = """Leo Franchi **updated** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) (assigned to @**Othello, the Moor of Venice**): expected_message = """Leo Franchi **updated** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) (assigned to **Othello, the Moor of Venice**):
* Changed assignee from **None** to @**Othello, the Moor of Venice** * Changed assignee from **None** to **Othello, the Moor of Venice**
""" """
self.send_and_test_stream_message('reassigned', expected_subject, expected_message) self.send_and_test_stream_message('reassigned', expected_subject, expected_message)
def test_reopened(self): def test_reopened(self):
# type: () -> None # type: () -> None
expected_subject = "BUG-7: More cowbell polease" expected_subject = "BUG-7: More cowbell polease"
expected_message = """Leo Franchi **updated** [BUG-7](http://lfranchi.com:8080/browse/BUG-7) (assigned to @**Othello, the Moor of Venice**): expected_message = """Leo Franchi **updated** [BUG-7](http://lfranchi.com:8080/browse/BUG-7) (assigned to **Othello, the Moor of Venice**):
* Changed resolution from **Fixed** to **None** * Changed resolution from **Fixed** to **None**
* Changed status from **Resolved** to **Reopened** * Changed status from **Resolved** to **Reopened**
@@ -93,10 +93,10 @@ Re-opened yeah!
def test_resolved(self): def test_resolved(self):
# type: () -> None # type: () -> None
expected_subject = "BUG-13: Refreshing the page loses the user's current posi..." expected_subject = "BUG-13: Refreshing the page loses the user's current posi..."
expected_message = """Leo Franchi **updated** [BUG-13](http://lfranchi.com:8080/browse/BUG-13) (assigned to @**Othello, the Moor of Venice**): expected_message = """Leo Franchi **updated** [BUG-13](http://lfranchi.com:8080/browse/BUG-13) (assigned to **Othello, the Moor of Venice**):
* Changed status from **Open** to **Resolved** * Changed status from **Open** to **Resolved**
* Changed assignee from **None** to @**Othello, the Moor of Venice** * Changed assignee from **None** to **Othello, the Moor of Venice**
* Changed resolution from **None** to **Fixed** * Changed resolution from **None** to **Fixed**
Fixed it, finally! Fixed it, finally!
@@ -130,10 +130,10 @@ Fixed it, finally!
def test_mention(self): def test_mention(self):
# type: () -> None # type: () -> None
expected_subject = "TEST-5: Lunch Decision Needed" expected_subject = "TEST-5: Lunch Decision Needed"
expected_message = """Leonardo Franchi [Administrator] **updated** [TEST-5](https://zulipp.atlassian.net/browse/TEST-5) (assigned to @**Othello, the Moor of Venice**): expected_message = """Leonardo Franchi [Administrator] **updated** [TEST-5](https://zulipp.atlassian.net/browse/TEST-5) (assigned to **Othello, the Moor of Venice**):
Making a comment, @**Othello, the Moor of Venice** is watching this issue Making a comment, **Othello, the Moor of Venice** is watching this issue
""" """
self.send_and_test_stream_message('watch_mention_updated', expected_subject, expected_message) self.send_and_test_stream_message('watch_mention_updated', expected_subject, expected_message)

6
zerver/views/webhooks/jira.py
View File

@@ -79,7 +79,7 @@ def convert_jira_markup(content, realm):
# Try to look up username # Try to look up username
user_profile = guess_zulip_user_from_jira(username, realm) user_profile = guess_zulip_user_from_jira(username, realm)
if user_profile: if user_profile:
replacement = "@**%s**" % (user_profile.full_name,) replacement = "**%s**" % (user_profile.full_name,)
else: else:
replacement = "**%s**" % (username,) replacement = "**%s**" % (username,)
@@ -121,14 +121,14 @@ def api_jira_webhook(request, user_profile, client,
if assignee_email != '': if assignee_email != '':
try: try:
assignee_profile = get_user_profile_by_email(assignee_email) assignee_profile = get_user_profile_by_email(assignee_email)
assignee_mention = "@**%s**" % (assignee_profile.full_name,) assignee_mention = "**%s**" % (assignee_profile.full_name,)
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
assignee_mention = "**%s**" % (assignee_email,) assignee_mention = "**%s**" % (assignee_email,)
subject = "%s: %s" % (issueId, title) subject = "%s: %s" % (issueId, title)
if event == 'jira:issue_created': if event == 'jira:issue_created':
content = "%s **created** %s priority %s, assigned to @**%s**:\n\n> %s" % \ content = "%s **created** %s priority %s, assigned to **%s**:\n\n> %s" % \
(author, issue, priority, assignee, title) (author, issue, priority, assignee, title)
elif event == 'jira:issue_deleted': elif event == 'jira:issue_deleted':
content = "%s **deleted** %s!" % \ content = "%s **deleted** %s!" % \