deathbybandaid/SpiceBot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: deathbybandaid:57bcdbf639ed912a336d6a1ce91edd195d907f6b
Branches Tags
deathbybandaid:master
deathbybandaid:dev
..
compare: deathbybandaid:c6fd6d70be96409ebe65939bff5b8cb1d867c385
Branches Tags
deathbybandaid:dev
deathbybandaid:master

No commits in common. "57bcdbf639ed912a336d6a1ce91edd195d907f6b" and "c6fd6d70be96409ebe65939bff5b8cb1d867c385" have entirely different histories.
57bcdbf639 ... c6fd6d70be

2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

3
sopel_SpiceBot_Core_1/SBCore/commands/__init__.py
View File

@ -105,7 +105,9 @@ class Commands():
def get_command_from_trigger(self, trigger): def get_command_from_trigger(self, trigger):
commstring = trigger.args[1] commstring = trigger.args[1]
print(commstring)
if commstring.startswith(tuple(self.config.prefix_list)): if commstring.startswith(tuple(self.config.prefix_list)):
print(commstring[:1])
command = commstring[1:].split(" ")[0] command = commstring[1:].split(" ")[0]
elif commstring.startswith(self.bot.nick): elif commstring.startswith(self.bot.nick):
command = " ".join(commstring.split(" ")[1:]).split(" ")[0] command = " ".join(commstring.split(" ")[1:]).split(" ")[0]
@ -113,6 +115,7 @@ class Commands():
command = commstring.split(" ")[0] command = commstring.split(" ")[0]
else: else:
command = "" command = ""
print(command)
return command return command
def get_commands_split(self, trigger, splitkey): def get_commands_split(self, trigger, splitkey):

7
sopel_SpiceBot_Core_Prerun/__init__.py
View File

@ -31,11 +31,8 @@ def prerun(rulematch=False):
for trigger_dict in commands: for trigger_dict in commands:
sb.commands.dispatch(trigger_dict) sb.commands.dispatch(trigger_dict)
return return
elif sb.commands.get_command_from_trigger(trigger) != commands[0]["trigger_command"]:
trigger_command = sb.commands.get_command_from_trigger(trigger) print(trigger.args[1].split("&&")[0])
if trigger_command != commands[0]["trigger_command"]:
print("compare time")
print(trigger_command)
print(commands[0]["trigger_command"]) print(commands[0]["trigger_command"])
# This is where we rebuild trigger # This is where we rebuild trigger