github
/
apprise
mirror of https://github.com/caronc/apprise
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated Discord API Endpoint for Nov 7th, 2020 Deadline (#250)

pull/255/head
Chris Caron 2020-07-19 11:08:41 -04:00 committed by GitHub
parent 200e0fabaa
commit 154839e791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apprise/plugins/NotifyDiscord.py
View File

@ -28,17 +28,17 @@
# here you'll be able to access the Webhooks menu and create a new one. # here you'll be able to access the Webhooks menu and create a new one.
# #
# When you've completed, you'll get a URL that looks a little like this: # When you've completed, you'll get a URL that looks a little like this:
# https://discordapp.com/api/webhooks/417429632418316298/\ # https://discord.com/api/webhooks/417429632418316298/\
# JHZ7lQml277CDHmQKMHI8qBe7bk2ZwO5UKjCiOAF7711o33MyqU344Qpgv7YTpadV_js # JHZ7lQml277CDHmQKMHI8qBe7bk2ZwO5UKjCiOAF7711o33MyqU344Qpgv7YTpadV_js
# #
# Simplified, it looks like this: # Simplified, it looks like this:
# https://discordapp.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN # https://discord.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
# #
# This plugin will simply work using the url of: # This plugin will simply work using the url of:
# discord://WEBHOOK_ID/WEBHOOK_TOKEN # discord://WEBHOOK_ID/WEBHOOK_TOKEN
# #
# API Documentation on Webhooks: # API Documentation on Webhooks:
# - https://discordapp.com/developers/docs/resources/webhook # - https://discord.com/developers/docs/resources/webhook
# #
import re import re
import requests import requests
@ -63,7 +63,7 @@ class NotifyDiscord(NotifyBase):
service_name = 'Discord' service_name = 'Discord'
# The services URL # The services URL
service_url = 'https://discordapp.com/' service_url = 'https://discord.com/'
# The default secure protocol # The default secure protocol
secure_protocol = 'discord' secure_protocol = 'discord'
@ -72,7 +72,7 @@ class NotifyDiscord(NotifyBase):
setup_url = 'https://github.com/caronc/apprise/wiki/Notify_discord' setup_url = 'https://github.com/caronc/apprise/wiki/Notify_discord'
# Discord Webhook # Discord Webhook
notify_url = 'https://discordapp.com/api/webhooks' notify_url = 'https://discord.com/api/webhooks'
# Allows the user to specify the NotifyImageSize object # Allows the user to specify the NotifyImageSize object
image_size = NotifyImageSize.XY_256 image_size = NotifyImageSize.XY_256
@ -494,11 +494,13 @@ class NotifyDiscord(NotifyBase):
@staticmethod @staticmethod
def parse_native_url(url): def parse_native_url(url):
""" """
Support https://discordapp.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN Support https://discord.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
Support Legacy URL as well:
https://discordapp.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
""" """
result = re.match( result = re.match(
r'^https?://discordapp\.com/api/webhooks/' r'^https?://discord(app)?\.com/api/webhooks/'
r'(?P<webhook_id>[0-9]+)/' r'(?P<webhook_id>[0-9]+)/'
r'(?P<webhook_token>[A-Z0-9_-]+)/?' r'(?P<webhook_token>[A-Z0-9_-]+)/?'
r'(?P<args>\?.+)?$', url, re.I) r'(?P<args>\?.+)?$', url, re.I)

10
test/test_rest_plugins.py
View File

@ -309,9 +309,17 @@ TEST_URLS = (
# don't include an image by default # don't include an image by default
'include_image': True, 'include_image': True,
}), }),
('https://discord.com/api/webhooks/{}/{}'.format(
'0' * 10, 'B' * 40), {
# Native URL Support, support the provided discord URL from their
# webpage.
'instance': plugins.NotifyDiscord,
'requests_response_code': requests.codes.no_content,
}),
('https://discordapp.com/api/webhooks/{}/{}'.format( ('https://discordapp.com/api/webhooks/{}/{}'.format(
'0' * 10, 'B' * 40), { '0' * 10, 'B' * 40), {
# Native URL Support, take the discord URL and still build from it # Legacy Native URL Support, support the older URL (to be
# decomissioned on Nov 7th 2020)
'instance': plugins.NotifyDiscord, 'instance': plugins.NotifyDiscord,
'requests_response_code': requests.codes.no_content, 'requests_response_code': requests.codes.no_content,
}), }),