paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 19:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration: Support reviewer in get_pull_request_event_message.

Browse Source 
This is a prep commit to help make the changes to make changes to pull
event message easier. Our Bitbucket has been using a custom template to
render the reviewers. This means that values are fixed to how the templates
like it. These changes will allow `get_pull_request_event_message` to
support reviewer and allow for a easier and flexible adjustment to these
messages if needed.
This commit is contained in:
Joelute
2023-03-29 02:05:23 -04:00
committed by Tim Abbott
parent 4dc85dddc1
commit 1ddfbc94c3
3 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zerver/lib/webhooks/git.py
View File

@@ -55,6 +55,7 @@ PULL_REQUEST_OR_ISSUE_MESSAGE_TEMPLATE_WITH_TITLE = (
"{user_name} {action} [{type}{id} {title}]({url})"
)
PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE = "(assigned to {assignee})"
PULL_REQUEST_REVIEWER_INFO_TEMPLATE = "(assigned reviewers: {reviewer})"
PULL_REQUEST_BRANCH_INFO_TEMPLATE = "from `{target}` to `{base}`"
CONTENT_MESSAGE_TEMPLATE = "\n~~~ quote\n{message}\n~~~"
@@ -68,6 +69,19 @@ TAG_WITHOUT_URL_TEMPLATE = "{tag_name}"
RELEASE_MESSAGE_TEMPLATE = "{user_name} {action} release [{release_name}]({url}) for tag {tagname}."
def get_assignee_string(assignees: List[Dict[str, Any]]) -> str:
assignees_string = ""
if len(assignees) == 1:
assignees_string = "{username}".format(**assignees[0])
else:
usernames = []
for a in assignees:
usernames.append(a["username"])
assignees_string = ", ".join(usernames[:-1]) + " and " + usernames[-1]
return assignees_string
def get_push_commits_event_message(
user_name: str,
compare_url: Optional[str],
@@ -173,6 +187,7 @@ def get_pull_request_event_message(
message: Optional[str] = None,
assignee: Optional[str] = None,
assignees: Optional[List[Dict[str, Any]]] = None,
reviewer: Optional[str] = None,
type: str = "PR",
title: Optional[str] = None,
) -> str:
@@ -198,23 +213,18 @@ def get_pull_request_event_message(
main_message = f"{main_message} {branch_info}"
if assignees:
assignees_string = ""
if len(assignees) == 1:
assignees_string = "{username}".format(**assignees[0])
else:
usernames = []
for a in assignees:
usernames.append(a["username"])
assignees_string = ", ".join(usernames[:-1]) + " and " + usernames[-1]
assignee_string = get_assignee_string(assignees)
assignee_info = PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE.format(
assignee=assignees_string
assignee=assignee_string
)
main_message = f"{main_message} {assignee_info}"
elif assignee:
assignee_info = PULL_REQUEST_OR_ISSUE_ASSIGNEE_INFO_TEMPLATE.format(assignee=assignee)
elif reviewer:
assignee_info = PULL_REQUEST_REVIEWER_INFO_TEMPLATE.format(reviewer=reviewer)
if assignees or assignee or reviewer:
main_message = f"{main_message} {assignee_info}"
punctuation = ":" if message else "."