From b7cf524e9869828ff85954cb731f7fee98bee8d9 Mon Sep 17 00:00:00 2001 From: jesopo Date: Fri, 31 Aug 2018 12:55:52 +0100 Subject: Give modules event objects with "context"s, to facilitate purging all the event hooks for a module --- modules/telegram.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'modules/telegram.py') diff --git a/modules/telegram.py b/modules/telegram.py index cecbd16e..5639666b 100644 --- a/modules/telegram.py +++ b/modules/telegram.py @@ -8,11 +8,12 @@ from threading import Thread class Module(Thread): _name = "telegram" - def __init__(self, dolphin): - key = dolphin.config.get("telegram-api-key") + def __init__(self, bot, events): + key = bot.config.get("telegram-api-key") if not key: return - self.dolphin = dolphin + self.bot = bot + self.events = events self.updater = Updater(key) self.dispatcher = self.updater.dispatcher @@ -23,7 +24,7 @@ class Module(Thread): self.dispatcher.add_handler(command_handler) self.updater.start_polling() - dolphin.events.on("signal").on("interrupt").hook(self.sigint) + events.on("signal").on("interrupt").hook(self.sigint) def start(self, bot, update): bot.send_message(chat_id=update.message.chat_id, text="`Dolphin, but Telegram`", parse_mode="Markdown") @@ -45,7 +46,7 @@ class Module(Thread): "stderr": IOWrapper(bot, message.chat_id, message.message_id), "external": True, } - self.dolphin.events.on("telegram").on("command").on(command).call(**data) + self.events.on("telegram").on("command").on(command).call(**data) def sigint(self, event): self.updater.stop() -- cgit v1.3.1-10-gc9f91