From 22ee129ca68db97fe8c72a6754e438dff79f8d78 Mon Sep 17 00:00:00 2001 From: jesopo Date: Sat, 8 Sep 2018 22:01:47 +0100 Subject: [PATCH] Clean up combining new.channel and __init__ channel bootstrapping --- modules/ducks.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/ducks.py b/modules/ducks.py index 3881aaf8..bfa676fc 100644 --- a/modules/ducks.py +++ b/modules/ducks.py @@ -51,24 +51,19 @@ class Module(object): "duck?", "validate": Utils.bool_or_none}) - events.on("new.channel").hook(self.bootstrap) + events.on("new.channel").hook(self.new_channel) events.on("received").on("message").on("channel").hook( self.channel_message, priority=2) - self.bootstrap_lazy(events) - - def bootstrap_lazy(self, event): - servers = self.bot.servers - - for server in servers.values(): + for server in self.bot.servers.values(): for channel in server.channels.values(): self.bootstrap(channel) - def bootstrap(self, event): - channel = event["channel"] if hasattr(event, "channel") else event - + def new_channel(self, event): + self.bootstrap(event["channel"]) + def bootstrap(self, channel): self.init_game_var(channel) # getset ducks_enabled = channel.get_setting("ducks-enabled", False)