From f93639e0452d62efbf4d877e4fa1e0371685d053 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 10:37:21 -0400 Subject: [PATCH 1/5] test --- sopel_modules/SpiceBot_Core_Processing/Users.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sopel_modules/SpiceBot_Core_Processing/Users.py b/sopel_modules/SpiceBot_Core_Processing/Users.py index d97fa11..37ffcb1 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Users.py +++ b/sopel_modules/SpiceBot_Core_Processing/Users.py @@ -51,9 +51,11 @@ def bot_channelscan_users(bot, trigger): SpiceBot.users.channel_scan(bot) +""" @sopel.module.rule('.*') def bot_users_chat(bot, trigger): SpiceBot.users.chat(bot, trigger) +""" @sopel.module.event(SpiceBot.events.RPL_NAMREPLY) From 5b7927cdf61ce0ff32c7228a853316a6098a2548 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 10:39:02 -0400 Subject: [PATCH 2/5] test --- sopel_modules/SpiceBot_Core_Processing/Channels.py | 2 ++ sopel_modules/SpiceBot_Core_Processing/Users.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot_Core_Processing/Channels.py b/sopel_modules/SpiceBot_Core_Processing/Channels.py index 94d34c4..a35d9e4 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Channels.py +++ b/sopel_modules/SpiceBot_Core_Processing/Channels.py @@ -141,6 +141,7 @@ def bot_channelscan(bot, trigger): SpiceBot.channels.channel_scan(bot) +""" @sopel.module.event(SpiceBot.events.RPL_NAMREPLY) @sopel.module.rule('(.*)') def handle_names(bot, trigger): @@ -153,3 +154,4 @@ def handle_names(bot, trigger): @sopel.module.unblockable def recv_who(bot, trigger): SpiceBot.channels.rpl_who(bot, trigger) +""" diff --git a/sopel_modules/SpiceBot_Core_Processing/Users.py b/sopel_modules/SpiceBot_Core_Processing/Users.py index 37ffcb1..d7243ad 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Users.py +++ b/sopel_modules/SpiceBot_Core_Processing/Users.py @@ -55,7 +55,6 @@ def bot_channelscan_users(bot, trigger): @sopel.module.rule('.*') def bot_users_chat(bot, trigger): SpiceBot.users.chat(bot, trigger) -""" @sopel.module.event(SpiceBot.events.RPL_NAMREPLY) @@ -82,3 +81,4 @@ def account_notify(bot, trigger): @sopel.module.rule('.*') def track_notify(bot, trigger): SpiceBot.users.track_notify(bot, trigger) +""" From f068c8d7cf110f67bd44f2637a4684f500aaca19 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 10:39:53 -0400 Subject: [PATCH 3/5] test --- sopel_modules/SpiceBot_Core_Processing/Channels.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sopel_modules/SpiceBot_Core_Processing/Channels.py b/sopel_modules/SpiceBot_Core_Processing/Channels.py index a35d9e4..a5358aa 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Channels.py +++ b/sopel_modules/SpiceBot_Core_Processing/Channels.py @@ -137,8 +137,7 @@ def channels_users_mode(bot, trigger): @sopel.module.event(SpiceBot.events.BOT_CONNECTED) @sopel.module.rule('.*') def bot_channelscan(bot, trigger): - while True: - SpiceBot.channels.channel_scan(bot) + SpiceBot.channels.channel_scan(bot) """ From 403887e2e9e9b16b64948f1753c0f23c6b6e4506 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 10:44:39 -0400 Subject: [PATCH 4/5] tweak --- sopel_modules/SpiceBot_Core_Processing/Events.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot_Core_Processing/Events.py b/sopel_modules/SpiceBot_Core_Processing/Events.py index 2b07c3d..be9abfc 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Events.py +++ b/sopel_modules/SpiceBot_Core_Processing/Events.py @@ -31,7 +31,10 @@ def bot_events_connected(bot, trigger): if len(SpiceBot.events.dict["trigger_queue"]): pretriggerdict = SpiceBot.events.dict["trigger_queue"][0] SpiceBot.events.dispatch(bot, pretriggerdict) - del SpiceBot.events.dict["trigger_queue"][0] + try: + del SpiceBot.events.dict["trigger_queue"][0] + except IndexError: + pass @sopel.module.event(SpiceBot.events.BOT_WELCOME) From cc0ba58803234f96a06edc4008cc64481add0f4e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 10:51:40 -0400 Subject: [PATCH 5/5] test --- sopel_modules/SpiceBot/Users.py | 21 +++++++++---------- .../SpiceBot_Core_Processing/Channels.py | 2 -- .../SpiceBot_Core_Processing/Users.py | 2 -- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sopel_modules/SpiceBot/Users.py b/sopel_modules/SpiceBot/Users.py index b51e900..560596f 100644 --- a/sopel_modules/SpiceBot/Users.py +++ b/sopel_modules/SpiceBot/Users.py @@ -20,18 +20,17 @@ class BotUsers(): def __init__(self): self.lock = threading.Lock() + # TODO AWAY self.dict = { "all": botdb.get_bot_value('users') or {}, "online": [], "offline": [], - "away": [], # TODO + "away": [], "current": {}, } """during setup, all users from database are offline until marked online""" for user_id in list(self.dict["all"].keys()): - self.lock.acquire() - self.dict["offline"].append(int(user_id)) - self.lock.release() + self.mark_user_offline(user_id) def __getattr__(self, name): ''' will only get called for undefined attributes ''' @@ -42,20 +41,20 @@ class BotUsers(): raise Exception('User dict does not contain a function or key ' + str(name.lower())) def ID(self, nickinput): - self.lock.acquire() if is_number(nickinput): nick_id = nickinput - if nick_id in list(self.dict["current"].keys()): - nick = self.dict["current"][nick_id]["nick"] - elif nick_id in list(self.dict["all"].keys()) and len(self.dict["all"][int(nick_id)]): + self.lock.acquire() + if int(nick_id) in list(self.dict["current"].keys()): + nick = self.dict["current"][int(nick_id)]["nick"] + self.lock.release() + elif int(nick_id) in list(self.dict["all"].keys()) and len(self.dict["all"][int(nick_id)]): nick = self.dict["all"][int(nick_id)][0] + self.lock.release() else: raise Exception('ID ' + str(nickinput) + ' does not appear to be associated with a nick') - self.lock.release() return nick else: nick_id = self.whois_ident(nickinput) - self.lock.release() return int(nick_id) def whois_ident(self, nick, usercreate=True): @@ -65,7 +64,7 @@ class BotUsers(): except Exception as e: nick_id = e nick_id = None - if usercreate: + if usercreate and nick_id: self.add_to_all(nick, nick_id) return int(nick_id) diff --git a/sopel_modules/SpiceBot_Core_Processing/Channels.py b/sopel_modules/SpiceBot_Core_Processing/Channels.py index a5358aa..92b4a66 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Channels.py +++ b/sopel_modules/SpiceBot_Core_Processing/Channels.py @@ -140,7 +140,6 @@ def bot_channelscan(bot, trigger): SpiceBot.channels.channel_scan(bot) -""" @sopel.module.event(SpiceBot.events.RPL_NAMREPLY) @sopel.module.rule('(.*)') def handle_names(bot, trigger): @@ -153,4 +152,3 @@ def handle_names(bot, trigger): @sopel.module.unblockable def recv_who(bot, trigger): SpiceBot.channels.rpl_who(bot, trigger) -""" diff --git a/sopel_modules/SpiceBot_Core_Processing/Users.py b/sopel_modules/SpiceBot_Core_Processing/Users.py index d7243ad..d97fa11 100644 --- a/sopel_modules/SpiceBot_Core_Processing/Users.py +++ b/sopel_modules/SpiceBot_Core_Processing/Users.py @@ -51,7 +51,6 @@ def bot_channelscan_users(bot, trigger): SpiceBot.users.channel_scan(bot) -""" @sopel.module.rule('.*') def bot_users_chat(bot, trigger): SpiceBot.users.chat(bot, trigger) @@ -81,4 +80,3 @@ def account_notify(bot, trigger): @sopel.module.rule('.*') def track_notify(bot, trigger): SpiceBot.users.track_notify(bot, trigger) -"""