diff options
| author |  jesopo | 2018-07-15 15:15:52 +0100 |
|---|---|---|
| committer | jesopo | 2018-07-15 15:15:52 +0100 |
| commit | 68298bbccf715fb4d8c82e45a74c309a74d0c77e (patch) | |
| tree | a6332b25e75f7093ae963f9d74db747e86ea2fd5 /modules | |
| parent | Move quit quotes to it's own module (diff) | |
| signature | ||
Added EventHook.call_for_result to get a result or default from an event
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bitly.py | 4 | ||||
| -rw-r--r-- | modules/signals.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/bitly.py b/modules/bitly.py index ac7835a1..f31ca347 100644 --- a/modules/bitly.py +++ b/modules/bitly.py @@ -25,8 +25,8 @@ class Module(object): return data["data"]["url"] def shorten(self, event): - link = self.bot.events.on("get").on("shortlink").call( - url=event["args"])[0] + link = self.bot.events.on("get").on("shortlink" + ).call_for_result(url=event["args"]) if link: event["stdout"].write("Short URL: %s" % link) else: diff --git a/modules/signals.py b/modules/signals.py index 79eab553..8f556e23 100644 --- a/modules/signals.py +++ b/modules/signals.py @@ -9,10 +9,13 @@ class Module(object): def SIGINT(self, signum, frame): print() self.bot.events.on("signal").on("interrupt").call(signum=signum, frame=frame) + for server in self.bot.servers.values(): - quote = self.bot.events.on("get.quit-quote").call()[0] + quote = self.bot.events.on("get.quit-quote" + ).call_for_result(default="Leaving") server.send_quit(quote) self.bot.register_write(server) + self.bot.running = False def SIGUSR1(self, signum, frame): |