Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-12 13:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run checklist and cooldowns on commands

Browse Source
This commit is contained in:
Ben 2020-05-17 03:27:40 +01:00
parent 69fde9b21a
commit 03a22a28b7
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
houdini/commands.py
View File

@ -2,7 +2,8 @@ import inspect
from houdini import _AbstractManager, handlers, plugins from houdini import _AbstractManager, handlers, plugins
from houdini.constants import ConflictResolution from houdini.constants import ConflictResolution
from houdini.converters import _ArgumentDeserializer, _listener from houdini.converters import _ArgumentDeserializer, _listener, ChecklistError
from houdini.cooldown import CooldownError
class UnknownCommandException(Exception): class UnknownCommandException(Exception):
@ -17,6 +18,17 @@ class _Command(_ArgumentDeserializer):
self.alias = kwargs.get('alias', []) self.alias = kwargs.get('alias', [])
self.parent = kwargs.get('parent', None) self.parent = kwargs.get('parent', None)
async def __call__(self, p, data):
try:
await super()._check_cooldown(p)
super()._check_list(p)
await super().__call__(p, data)
except CooldownError:
p.logger.debug(f'{p} tried to send a command during a cooldown')
except ChecklistError:
p.logger.debug(f'{p} sent a command without meeting checklist requirements')
class _CommandGroup(_Command): class _CommandGroup(_Command):
__slots__ = ['commands'] __slots__ = ['commands']
@ -28,9 +40,17 @@ class _CommandGroup(_Command):
async def __call__(self, p, data): async def __call__(self, p, data):
if not data: if not data:
if self.instance: try:
return await self.callback(self.instance, p) await super()._check_cooldown(p)
return await self.callback(p) super()._check_list(p)
if self.instance:
return await self.callback(self.instance, p)
return await self.callback(p)
except CooldownError:
p.logger.debug(f'{p} tried to send a command during a cooldown')
except ChecklistError:
p.logger.debug(f'{p} sent a command without meeting checklist requirements')
await invoke_command_objects(self.commands, p, data) await invoke_command_objects(self.commands, p, data)