Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Revert "add !msg"

Browse source 
This reverts commit ddaf8a3890.
This commit is contained in:
jesopo 2019-09-27 16:16:50 +01:00
parent ddaf8a3890
commit 514b0126f2
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
external_modules/.keep Normal file
View file

9
modules/echo.py
View file

@ -13,12 +13,3 @@ class Module(ModuleManager.BaseModule):
@utils.kwarg("expect_output", False) @utils.kwarg("expect_output", False)
def action(self, event): def action(self, event):
event["target"].send_message("\x01ACTION %s\x01" % event["args"]) event["target"].send_message("\x01ACTION %s\x01" % event["args"])
@utils.hook("received.command.msg")
@utils.kwarg("min_args", 2)
@utils.kwarg("permission", "say")
@utils.kwarg("remove_empty", False)
@utils.kwarg("help", "Send a message to a target")
def msg(self, event):
event["server"].send_message(event["args_split"][0],
" ".join(event["args_split"][1:]))

9
start.py
View file

@ -42,7 +42,6 @@ arg_parser.add_argument("--module", "-m",
help="Execute an action against a specific module") help="Execute an action against a specific module")
arg_parser.add_argument("--module-args", "-M", arg_parser.add_argument("--module-args", "-M",
help="Arguments to give in action against a specific module") help="Arguments to give in action against a specific module")
arg_parser.add_argument("--external", "-e", help="External modules directory")
arg_parser.add_argument("--startup-disconnects", "-D", arg_parser.add_argument("--startup-disconnects", "-D",
help="Tolerate failed connections on startup", action="store_true") help="Tolerate failed connections on startup", action="store_true")
@ -88,12 +87,8 @@ events = EventManager.EventRoot(log).wrap()
exports = Exports.Exports() exports = Exports.Exports()
timers = Timers.Timers(database, events, log) timers = Timers.Timers(database, events, log)
module_directories = [os.path.join(directory, "modules")] module_directories = [os.path.join(directory, "modules"),
if args.external: os.path.join(directory, "external_modules")]
module_directories.append(os.path.abspath(args.external))
if "external-modules" in config:
module_directories.append(os.path.abspath(config["external-modules"]))
modules = ModuleManager.ModuleManager(events, exports, timers, config, log, modules = ModuleManager.ModuleManager(events, exports, timers, config, log,
module_directories) module_directories)