Make sure to call the specific hook we've decided is valid (commands.py)
This commit is contained in:
parent
8ac989fa96
commit
72072bbd3d
2 changed files with 12 additions and 5 deletions
|
@ -216,12 +216,17 @@ class Module(ModuleManager.BaseModule):
|
||||||
args = " ".join(args_split)
|
args = " ".join(args_split)
|
||||||
server = event["server"]
|
server = event["server"]
|
||||||
user = event["user"]
|
user = event["user"]
|
||||||
|
|
||||||
|
new_event = self.events.on("received.command").on(command
|
||||||
|
).make_event(user=user, server=server, target=target,
|
||||||
|
args=args, tags=event["tags"], args_split=args_split,
|
||||||
|
stdout=stdout, stderr=stderr, command=command.lower(),
|
||||||
|
is_channel=is_channel)
|
||||||
|
|
||||||
|
self.log.trace("calling command '%s': %s" % (command,
|
||||||
|
new_event.kwargs))
|
||||||
try:
|
try:
|
||||||
self.events.on("received.command").on(command
|
hook.call(new_event)
|
||||||
).call_unsafe_limited(1, user=user, server=server,
|
|
||||||
target=target, args=args, tags=event["tags"],
|
|
||||||
args_split=args_split, stdout=stdout, stderr=stderr,
|
|
||||||
command=command.lower(), is_channel=is_channel)
|
|
||||||
except utils.EventError as e:
|
except utils.EventError as e:
|
||||||
stderr.write(str(e))
|
stderr.write(str(e))
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,8 @@ class EventHook(object):
|
||||||
|
|
||||||
def _make_event(self, kwargs: dict) -> Event:
|
def _make_event(self, kwargs: dict) -> Event:
|
||||||
return Event(self._get_path(), **kwargs)
|
return Event(self._get_path(), **kwargs)
|
||||||
|
def make_event(self, **kwargs):
|
||||||
|
return self._make_event(kwargs)
|
||||||
|
|
||||||
def _get_path(self) -> str:
|
def _get_path(self) -> str:
|
||||||
path = []
|
path = []
|
||||||
|
|
Loading…
Reference in a new issue