xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

jira: Use display_url in output.

Browse source
This commit is contained in:
pemontto 2020-04-27 15:12:36 +01:00 committed by Tim Abbott
parent 3ca336246d
commit b0c2b1b9c8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zulip_bots/zulip_bots/bots/jira/jira.conf
View file

@ -2,3 +2,4 @@
username = <your Jira email address> username = <your Jira email address>
password = <your Jira password> password = <your Jira password>
domain = <your Jira domain> domain = <your Jira domain>
# display_url = [optional] <your front facing Jira URL to use in links>

11
zulip_bots/zulip_bots/bots/jira/jira.py
View file

@ -134,6 +134,11 @@ class JiraHandler:
else: else:
self.domain_with_protocol = 'https://' + domain self.domain_with_protocol = 'https://' + domain
# Use the front facing URL in output
self.display_url = config.get('display_url')
if not self.display_url:
self.display_url = self.domain_with_protocol
def handle_message(self, message: Dict[str, str], bot_handler: Any) -> None: def handle_message(self, message: Dict[str, str], bot_handler: Any) -> None:
content = message.get('content') content = message.get('content')
response = '' response = ''
@ -153,7 +158,7 @@ class JiraHandler:
headers={'Authorization': self.auth}, headers={'Authorization': self.auth},
).json() ).json()
url = self.domain_with_protocol + '/browse/' + key url = self.display_url + '/browse/' + key
errors = jira_response.get('errorMessages', []) errors = jira_response.get('errorMessages', [])
fields = jira_response.get('fields', {}) fields = jira_response.get('fields', {})
@ -196,7 +201,7 @@ class JiraHandler:
jira_response_json = jira_response.json() if jira_response.text else {} jira_response_json = jira_response.json() if jira_response.text else {}
key = jira_response_json.get('key', '') key = jira_response_json.get('key', '')
url = self.domain_with_protocol + '/browse/' + key url = self.display_url + '/browse/' + key
errors = list(jira_response_json.get('errors', {}).values()) errors = list(jira_response_json.get('errors', {}).values())
if errors: if errors:
response = 'Oh no! Jira raised an error:\n > ' + ', '.join(errors) response = 'Oh no! Jira raised an error:\n > ' + ', '.join(errors)
@ -220,7 +225,7 @@ class JiraHandler:
jira_response_json = jira_response.json() if jira_response.text else {} jira_response_json = jira_response.json() if jira_response.text else {}
url = self.domain_with_protocol + '/browse/' + key url = self.display_url + '/browse/' + key
errors = list(jira_response_json.get('errors', {}).values()) errors = list(jira_response_json.get('errors', {}).values())
if errors: if errors:
response = 'Oh no! Jira raised an error:\n > ' + ', '.join(errors) response = 'Oh no! Jira raised an error:\n > ' + ', '.join(errors)