Refactor everything to use delimited events

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/nr.py b/modules/nr.py
index 92b9b929..490c6c1d 100644
--- a/modules/nr.py
+++ b/modules/nr.py
@@ -23,26 +23,26 @@ class Module(object):
     def __init__(self, bot, events, exports):
         self.bot = bot
         self._client = None
-        events.on("received").on("command").on("nrtrains"
+        events.on("received.command.nrtrains"
             ).hook(self.trains, min_args=1,
             help="Get train/bus services for a station (Powered by NRE)",
             usage="<crs_id>")
-        events.on("received").on("command").on("nrservice"
+        events.on("received.command.nrservice"
             ).hook(self.service, min_args=1,
             help="Get train service information for a UID, headcode or RID (Powered by NRE)",
             usage="<service_id>")
-        events.on("received").on("command").on("nrhead"
+        events.on("received.command.nrhead"
             ).hook(self.head, min_args=1,
             help="Get information for a given headcode/UID/RID (Powered by NRE)",
             usage="<headcode>")
-        events.on("received").on("command").on("nrcode"
+        events.on("received.command.nrcode"
             ).hook(self.service_code, min_args=1,
             help="Get the text for a given delay/cancellation code (Powered by NRE)",
             usage="<code>")
-        events.on("telegram").on("command").on("nrtrains").hook(self.trains)
-        events.on("telegram").on("command").on("nrcode").hook(self.service_code)
-        events.on("telegram").on("command").on("nrhead").hook(self.head)
-        events.on("telegram").on("command").on("nrservice").hook(self.service)
+        events.on("telegram.command.nrtrains").hook(self.trains)
+        events.on("telegram.command.nrcode").hook(self.service_code)
+        events.on("telegram.command.nrhead").hook(self.head)
+        events.on("telegram.command.nrservice").hook(self.service)
 
     @property
     def client(self):
@@ -54,7 +54,7 @@ class Module(object):
             header_token.TokenValue = token
             client.set_options(soapheaders=header_token)
             self._client = client
-        except:
+        except Exception as e:
             pass
         return self._client