From ef645c338a8a5f201adc907ba8fff623df23cf1c Mon Sep 17 00:00:00 2001 From: jesopo Date: Sat, 1 Sep 2018 12:24:00 +0100 Subject: [PATCH] BitBot is single threaded! --- modules/ducks.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/ducks.py b/modules/ducks.py index 44b03d00..8ca562c7 100644 --- a/modules/ducks.py +++ b/modules/ducks.py @@ -52,12 +52,14 @@ class Module(object): events.on("raw").on("376").hook(self.duck_loop_entry) + events.on("timer").on("duck-decoy").hook(self.duck_decoy) + events.on("timer").on("show-duck").hook(self.show_duck) + def duck_loop_entry(self, event): wait = self.get_random_duck_time() - self.timer = Timer(wait, self.show_duck, [event]) self.bot.log.info("Sending out a wave of ducks in %s seconds", [wait]) - self.timer.start() + self.bot.add_timer("show-duck", wait) def bootstrap(self, event): for server in self.bot.servers.values(): @@ -269,18 +271,5 @@ class Module(object): next_decoy_time = self.decoy_time() - if self.decoy_hooked == 0: - self.events.on("timer").on("duck-decoy").hook(self.duck_decoy) - self.decoy_hooked = 1 - self.bot.add_timer("duck-decoy", next_decoy_time, None, None, False, channel=channel) - -# def coins(self, event): -# if event["args_split"]: -# target = event["server"].get_user(event["args_split"][0]) -# else: -# target = event["user"] -# coins = decimal.Decimal(target.get_setting("coins", "0.0")) -# event["stdout"].write("%s has %s coin%s" % (target.nickname, -# "{0:.2f}".format(coins), "" if coins == 1 else "s"))