From a8bf3c93007503ec411d0d23fef021f386127fa5 Mon Sep 17 00:00:00 2001 From: jesopo Date: Fri, 28 Sep 2018 16:51:36 +0100 Subject: Remove cyclical references to IRCBot --- modules/coins.py | 4 ++-- modules/database_backup.py | 4 ++-- modules/in.py | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/coins.py b/modules/coins.py index 5ec1c728..86c334e2 100644 --- a/modules/coins.py +++ b/modules/coins.py @@ -33,8 +33,8 @@ class Module(object): until_next_hour = 60-now.second until_next_hour += ((60-(now.minute+1))*60) - bot.add_timer("coin-interest", INTEREST_INTERVAL, persist=False, - next_due=time.time()+until_next_hour) + bot.timers.add("coin-interest", INTEREST_INTERVAL, + time.time()+until_next_hour) @Utils.hook("received.command.coins") def coins(self, event): diff --git a/modules/database_backup.py b/modules/database_backup.py index e4a4ceb4..ab8dc194 100644 --- a/modules/database_backup.py +++ b/modules/database_backup.py @@ -11,8 +11,8 @@ class Module(object): until_next_hour = 60-now.second until_next_hour += ((60-(now.minute+1))*60) - bot.add_timer("database-backup", BACKUP_INTERVAL, persist=False, - next_due=time.time()+until_next_hour) + bot.timers.add("database-backup", BACKUP_INTERVAL, + time.time()+until_next_hour) @Utils.hook("timer.database-backup") def backup(self, event): diff --git a/modules/in.py b/modules/in.py index 36b84f28..7fb7d7ea 100644 --- a/modules/in.py +++ b/modules/in.py @@ -16,10 +16,9 @@ class Module(ModuleManager.BaseModule): if seconds <= SECONDS_MAX: due_time = int(time.time())+seconds - self.bot.add_timer("in", seconds, - target=event["target"].name, due_time=due_time, - server_id=event["server"].id, nickname=event["user"].nickname, - message=message) + self.bot.timers.add_persistent("in", seconds, due_time=due_time, + target=event["target"].name, server_id=event["server"].id, + nickname=event["user"].nickname, message=message) event["stdout"].write("Saved") else: event["stderr"].write( -- cgit v1.3.1-10-gc9f91