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

[commands] Fix exception raised in Command invoke hooks.

Browse Source
This commit is contained in:
Josh
2020-09-10 09:47:05 +10:00
committed by GitHub
parent 15f51113c3
commit f8a7d3fc54
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
discord/ext/commands/core.py
View File

@@ -724,18 +724,14 @@ class Command(_BaseCommand):
# first, call the command local hook:
cog = self.cog
if self._before_invoke is not None:
try:
instance = self._before_invoke.__self__
# should be cog if @commands.before_invoke is used
except AttributeError:
instance = getattr(self._before_invoke, '__self__', cog)
# __self__ only exists for methods, not functions
# however, if @command.before_invoke is used, it will be a function
if self.cog:
await self._before_invoke(cog, ctx)
if instance:
await self._before_invoke(instance, ctx)
else:
await self._before_invoke(ctx)
else:
await self._before_invoke(instance, ctx)
# call the cog local hook if applicable:
if cog is not None:
@@ -751,15 +747,11 @@ class Command(_BaseCommand):
async def call_after_hooks(self, ctx):
cog = self.cog
if self._after_invoke is not None:
try:
instance = self._after_invoke.__self__
except AttributeError:
if self.cog:
await self._after_invoke(cog, ctx)
instance = getattr(self._after_invoke, '__self__', cog)
if instance:
await self._after_invoke(instance, ctx)
else:
await self._after_invoke(ctx)
else:
await self._after_invoke(instance, ctx)
# call the cog local hook if applicable:
if cog is not None: