extern/apprise
1
0
Fork 0
mirror of https://github.com/caronc/apprise.git synced 2025-01-23 22:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slack <!channel|desc> & <!channel> support added (#856)

Browse Source
This commit is contained in:
Chris Caron 2023-03-24 06:00:34 -04:00 committed by GitHub
parent 6144a79513
commit be174c374f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apprise/plugins/NotifySlack.py
View File

@ -354,6 +354,13 @@ class NotifySlack(NotifyBase):
r'>': '&gt;', r'>': '&gt;',
} }
# To notify a channel, one uses <!channel|channel>
self._re_channel_support = re.compile(
r'(?P<match>(?:<|\&lt;)?[ \t]*'
r'!(?P<channel>[^| \n]+)'
r'(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)'
r'|(?:>|\&gt;)))', re.IGNORECASE)
# The markdown in slack isn't [desc](url), it's <url|desc> # The markdown in slack isn't [desc](url), it's <url|desc>
# #
# To accomodate this, we need to ensure we don't escape URLs that match # To accomodate this, we need to ensure we don't escape URLs that match
@ -455,6 +462,21 @@ class NotifySlack(NotifyBase):
lambda x: self._re_formatting_map[x.group()], body, lambda x: self._re_formatting_map[x.group()], body,
) )
# Support <!channel|desc>, <!channel> entries
for match in self._re_channel_support.findall(body):
# Swap back any ampersands previously updaated
channel = match[1].strip()
desc = match[2].strip()
# Update our string
body = re.sub(
re.escape(match[0]),
'<!{channel}|{desc}>'.format(
channel=channel, desc=desc)
if desc else '<!{channel}>'.format(channel=channel),
body,
re.IGNORECASE)
# Support <url|desc>, <url> entries # Support <url|desc>, <url> entries
for match in self._re_url_support.findall(body): for match in self._re_url_support.findall(body):
# Swap back any ampersands previously updaated # Swap back any ampersands previously updaated

7
test/test_plugin_slack.py
View File

@ -680,6 +680,10 @@ def test_plugin_slack_markdown(mock_get, mock_post):
<https://slack.com?arg=val&arg2=val2|Slack Link>. <https://slack.com?arg=val&arg2=val2|Slack Link>.
We also want to be able to support <https://slack.com> links without the We also want to be able to support <https://slack.com> links without the
description. description.
Channel Testing
<!channelA>
<!channelA|Description>
""") """)
# Send our notification # Send our notification
@ -700,4 +704,5 @@ def test_plugin_slack_markdown(mock_get, mock_post):
"of it's\nmarkdown.\n\nThis one has arguments we want to preserve:"\ "of it's\nmarkdown.\n\nThis one has arguments we want to preserve:"\
"\n <https://slack.com?arg=val&arg2=val2|Slack Link>.\n"\ "\n <https://slack.com?arg=val&arg2=val2|Slack Link>.\n"\
"We also want to be able to support <https://slack.com> "\ "We also want to be able to support <https://slack.com> "\
"links without the\ndescription." "links without the\ndescription."\
"\n\nChannel Testing\n<!channelA>\n<!channelA|Description>"