wayfinderak/morpheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug when commands have no body

Browse Source
This commit is contained in:
Dusty Pianalto 2019-11-05 20:42:47 -09:00
parent 1d8b16add0
commit 2abee4572d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
morpheus/exts/bot.py
View File

@ -62,7 +62,9 @@ class Bot(Client):
if not raw_body.startswith(prefix): if not raw_body.startswith(prefix):
return None return None
raw_body = raw_body.lstrip(prefix) raw_body = raw_body.lstrip(prefix)
called_with, body = raw_body.split(' ', 1) body_list = raw_body.split(' ', 1)
called_with = body_list[0]
body = body_list[1] if len(body_list) > 1 else None
return Context.get_context(event, prefix, called_with, body) return Context.get_context(event, prefix, called_with, body)
async def process_command(self, event): async def process_command(self, event):
@ -73,7 +75,7 @@ class Bot(Client):
command = self.commands.get(ctx.called_with) command = self.commands.get(ctx.called_with)
if not command: if not command:
return return
await command.invoke(ctx, ctx.body.split(' ')) await command.invoke(ctx, ctx.body.split(' ') if ctx.body else None)
def listener(self, name=None): def listener(self, name=None):
def decorator(func): def decorator(func):

3
morpheus/exts/command.py
View File

@ -69,6 +69,7 @@ class Command:
args = [] args = []
kwargs = {} kwargs = {}
if args_list:
params = self.parser.parse_args(args_list) params = self.parser.parse_args(args_list)
for key, value in iterator: for key, value in iterator:
@ -79,3 +80,5 @@ class Command:
kwargs[key] = params.__dict__[key] kwargs[key] = params.__dict__[key]
await self.function(ctx, *args, **kwargs) await self.function(ctx, *args, **kwargs)
else:
await self.function(ctx)