matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix breakage with webhook tokens being missing.

Browse Source
This commit is contained in:
Rapptz 2019-07-22 20:55:43 -04:00
parent da41cceb41
commit 45375364b7
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
discord/webhook.py
View File

@ -397,8 +397,9 @@ class Webhook:
------------ ------------
id: :class:`int` id: :class:`int`
The webhook's ID The webhook's ID
token: :class:`str` token: Optional[:class:`str`]
The authentication token of the webhook. The authentication token of the webhook. If this is ``None``
then the webhook cannot be used to make requests.
guild_id: Optional[:class:`int`] guild_id: Optional[:class:`int`]
The guild ID this webhook is for. The guild ID this webhook is for.
channel_id: Optional[:class:`int`] channel_id: Optional[:class:`int`]
@ -421,7 +422,7 @@ class Webhook:
self.guild_id = utils._get_as_snowflake(data, 'guild_id') self.guild_id = utils._get_as_snowflake(data, 'guild_id')
self.name = data.get('name') self.name = data.get('name')
self.avatar = data.get('avatar') self.avatar = data.get('avatar')
self.token = data['token'] self.token = data.get('token')
self._state = state or _PartialWebhookState(adapter) self._state = state or _PartialWebhookState(adapter)
self._adapter = adapter self._adapter = adapter
self._adapter._prepare(self) self._adapter._prepare(self)
@ -591,7 +592,12 @@ class Webhook:
This webhook does not exist. This webhook does not exist.
Forbidden Forbidden
You do not have permissions to delete this webhook. You do not have permissions to delete this webhook.
InvalidArgument
This webhook does not have a token associated with it.
""" """
if self.token is None:
raise InvalidArgument('This webhook does not have a token associated with it')
return self._adapter.delete_webhook() return self._adapter.delete_webhook()
def edit(self, **kwargs): def edit(self, **kwargs):
@ -615,9 +621,12 @@ class Webhook:
Editing the webhook failed. Editing the webhook failed.
NotFound NotFound
This webhook does not exist. This webhook does not exist.
Forbidden InvalidArgument
You do not have permissions to edit this webhook. This webhook does not have a token associated with it.
""" """
if self.token is None:
raise InvalidArgument('This webhook does not have a token associated with it')
payload = {} payload = {}
try: try:
@ -698,7 +707,8 @@ class Webhook:
The authorization token for the webhook is incorrect. The authorization token for the webhook is incorrect.
InvalidArgument InvalidArgument
You specified both ``embed`` and ``embeds`` or the length of You specified both ``embed`` and ``embeds`` or the length of
``embeds`` was invalid. ``embeds`` was invalid or there was no token associated with
this webhook.
Returns Returns
--------- ---------
@ -707,7 +717,8 @@ class Webhook:
""" """
payload = {} payload = {}
if self.token is None:
raise InvalidArgument('This webhook does not have a token associated with it')
if files is not None and file is not None: if files is not None and file is not None:
raise InvalidArgument('Cannot mix file and files keyword arguments.') raise InvalidArgument('Cannot mix file and files keyword arguments.')
if embeds is not None and embed is not None: if embeds is not None and embed is not None: