From 514b0126f25fd7948150ec7fcae1d1856497d671 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Fri, 27 Sep 2019 16:16:50 +0100
Subject: Revert "add !msg"

This reverts commit ddaf8a38905bfba2e076f9d5c564e5a1e2e2e90f.
---
 external_modules/.keep | 0
 modules/echo.py        | 9 ---------
 start.py               | 9 ++-------
 3 files changed, 2 insertions(+), 16 deletions(-)
 create mode 100644 external_modules/.keep

diff --git a/external_modules/.keep b/external_modules/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/echo.py b/modules/echo.py
index ee27cc2b..087f6413 100644
--- a/modules/echo.py
+++ b/modules/echo.py
@@ -13,12 +13,3 @@ class Module(ModuleManager.BaseModule):
     @utils.kwarg("expect_output", False)
     def action(self, event):
         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:]))
diff --git a/start.py b/start.py
index 19c85719..c6d518a5 100755
--- a/start.py
+++ b/start.py
@@ -42,7 +42,6 @@ arg_parser.add_argument("--module", "-m",
     help="Execute an action against a specific module")
 arg_parser.add_argument("--module-args", "-M",
     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",
     help="Tolerate failed connections on startup", action="store_true")
@@ -88,12 +87,8 @@ events = EventManager.EventRoot(log).wrap()
 exports = Exports.Exports()
 timers = Timers.Timers(database, events, log)
 
-module_directories = [os.path.join(directory, "modules")]
-if args.external:
-    module_directories.append(os.path.abspath(args.external))
-if "external-modules" in config:
-    module_directories.append(os.path.abspath(config["external-modules"]))
-
+module_directories = [os.path.join(directory, "modules"),
+    os.path.join(directory, "external_modules")]
 modules = ModuleManager.ModuleManager(events, exports, timers, config, log,
     module_directories)
 
-- 
cgit v1.3.1-10-gc9f91