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

integrations: Use consistent code boundaries in GitHub notifications.

Browse Source 
In other templates we have used "~~~" to start and end a code block.
This commit is contained in:
Satyam Bansal
2023-07-03 13:47:21 +05:30
committed by Tim Abbott
parent a4d1211ec6
commit 22fa5a7ee3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/webhooks/github/tests.py
View File

@@ -435,9 +435,9 @@ Check [randscape](http://github.com/github/hello-world/runs/4) completed (succes
expected_topic = "team Testing"
expected_message = """\
**Hypro999** changed the team description to:
```quote
\n~~~ quote
A temporary team so that I can get some webhook fixtures!
```"""
~~~"""
self.check_webhook("team__edited_description", expected_topic, expected_message)
def test_team_edited_name(self) -> None:
@@ -575,9 +575,9 @@ A temporary team so that I can get some webhook fixtures!
self.assertTrue(stack_info)
def test_discussion_msg(self) -> None:
expected_message = "Codertocat created [discussion #90](https://github.com/baxterthehacker/public-repo/discussions/90) in General:\n```quote\n### Welcome to discussions!\nWe're glad to have you here!\n```"
expected_message = "Codertocat created [discussion #90](https://github.com/baxterthehacker/public-repo/discussions/90) in General:\n\n~~~ quote\n### Welcome to discussions!\nWe're glad to have you here!\n~~~"
self.check_webhook("discussion", TOPIC_DISCUSSION, expected_message)
def test_discussion_comment_msg(self) -> None:
expected_message = "Codertocat [commented](https://github.com/baxterthehacker/public-repo/discussions/90#discussioncomment-544078) on [discussion #90](https://github.com/baxterthehacker/public-repo/discussions/90):\n```quote\nI have so many questions to ask you!\n```"
expected_message = "Codertocat [commented](https://github.com/baxterthehacker/public-repo/discussions/90#discussioncomment-544078) on [discussion #90](https://github.com/baxterthehacker/public-repo/discussions/90):\n\n~~~ quote\nI have so many questions to ask you!\n~~~"
self.check_webhook("discussion_comment", TOPIC_DISCUSSION, expected_message)

6
zerver/webhooks/github/view.py
View File

@@ -35,8 +35,8 @@ from zerver.models import UserProfile
fixture_to_headers = get_http_headers_from_filename("HTTP_X_GITHUB_EVENT")
TOPIC_FOR_DISCUSSION = "{repo} discussion #{number}: {title}"
DISCUSSION_TEMPLATE = "{author} created [discussion #{discussion_id}]({url}) in {category}:\n```quote\n### {title}\n{body}\n```"
DISCUSSION_COMMENT_TEMPLATE = "{author} [commented]({comment_url}) on [discussion #{discussion_id}]({discussion_url}):\n```quote\n{body}\n```"
DISCUSSION_TEMPLATE = "{author} created [discussion #{discussion_id}]({url}) in {category}:\n\n~~~ quote\n### {title}\n{body}\n~~~"
DISCUSSION_COMMENT_TEMPLATE = "{author} [commented]({comment_url}) on [discussion #{discussion_id}]({discussion_url}):\n\n~~~ quote\n{body}\n~~~"
class Helper:
@@ -396,7 +396,7 @@ def get_team_body(helper: Helper) -> str:
if "description" in changes:
actor = get_sender_name(payload)
new_description = payload["team"]["description"].tame(check_string)
return f"**{actor}** changed the team description to:\n```quote\n{new_description}\n```"
return f"**{actor}** changed the team description to:\n\n~~~ quote\n{new_description}\n~~~"
if "name" in changes:
original_name = changes["name"]["from"].tame(check_string)
new_name = payload["team"]["name"].tame(check_string)