deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 06:59:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

users

Browse Source
This commit is contained in:
deathbybandaid 2019-09-18 13:41:42 -04:00
parent 5e53e650f3
commit 70fcf7d1f4
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sopel_modules/SpiceBot/Users.py
View File

@ -34,8 +34,11 @@ class BotUsers():
"identified": [], "identified": [],
} }
"""during setup, all users from database are offline until marked online""" """during setup, all users from database are offline until marked online"""
for user_id in list(self.dict["all"].keys()): # for user_id in list(self.dict["all"].keys()):
self.mark_user_offline(user_id) # self.mark_user_offline(user_id)
self.lock.acquire()
self.dict["offline"] = list(self.dict["all"].keys())
self.lock.release()
def __getattr__(self, name): def __getattr__(self, name):
''' will only get called for undefined attributes ''' ''' will only get called for undefined attributes '''
@ -151,6 +154,7 @@ class BotUsers():
if int(nick_id) not in self.dict["offline"]: if int(nick_id) not in self.dict["offline"]:
self.dict["offline"].append(int(nick_id)) self.dict["offline"].append(int(nick_id))
self.lock.release() self.lock.release()
self.whois_identify_forget(nick_id)
def join(self, bot, trigger): def join(self, bot, trigger):
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
@ -349,27 +353,47 @@ class BotUsers():
if not bot.config.SpiceBot_regnick.regnick: if not bot.config.SpiceBot_regnick.regnick:
return return
nick = trigger.args[1] nick = trigger.args[1]
if str(nick).lower() in [x.lower() for x in self.dict["registered"]]:
return
self.whois_handle(nick) self.whois_handle(nick)
def whois_handle(self, nick): def whois_handle(self, nick):
nick_id = self.whois_ident(nick)
self.lock.acquire() self.lock.acquire()
# identified
if int(nick_id) not in self.dict["identified"]:
self.dict["identified"].append(int(nick_id))
# registered
if str(nick).lower() not in [x.lower() for x in self.dict["registered"]]: if str(nick).lower() not in [x.lower() for x in self.dict["registered"]]:
self.dict["registered"].append(str(nick)) self.dict["registered"].append(str(nick))
else:
self.dict["register_check"][str(nick).lower()] = time.time()
self.lock.release() self.lock.release()
def whois_send(self, bot, nick): def whois_send(self, bot, nick):
if not bot.config.SpiceBot_regnick.regnick: if not bot.config.SpiceBot_regnick.regnick:
return return
if str(nick).lower() in [x.lower() for x in list(self.dict["register_check"].keys())]: check_whois = False
nick_id = self.whois_ident(nick)
# No registered check
if str(nick).lower() not in [x.lower() for x in list(self.dict["register_check"].keys())]:
check_whois = True
elif nick_id in self.dict["identified"]:
timestamp = self.dict["register_check"][str(nick).lower()] timestamp = self.dict["register_check"][str(nick).lower()]
if time.time() - timestamp < 240: if time.time() - timestamp >= 1800:
return check_whois = True
if str(nick).lower() not in [x.lower() for x in self.dict["registered"]]: else:
timestamp = self.dict["register_check"][str(nick).lower()]
if time.time() - timestamp >= 240:
check_whois = True
if check_whois:
bot.write(['WHOIS', str(nick)]) bot.write(['WHOIS', str(nick)])
self.lock.acquire()
self.dict["register_check"][str(nick).lower()] = time.time()
self.lock.release()
def whois_identify_forget(self, nick_id):
self.lock.acquire()
if int(nick_id) in self.dict["identified"]:
self.dict["identified"].remove(int(nick_id))
self.lock.release()
def account(self, bot, trigger): def account(self, bot, trigger):
# Identify # Identify
@ -480,6 +504,7 @@ class BotUsers():
# if bot.config.SpiceBot_regnick.regnick: # if bot.config.SpiceBot_regnick.regnick:
# if str(target).lower() not in [x.lower() for x in self.dict["registered"]]: # if str(target).lower() not in [x.lower() for x in self.dict["registered"]]:
# return {"targetgood": False, "error": "It looks like " + self.nick_actual(target) + " is not a registered nick.", "reason": "unregged"} # return {"targetgood": False, "error": "It looks like " + self.nick_actual(target) + " is not a registered nick.", "reason": "unregged"}
# TODO identified
return targetgood return targetgood