mirror of
https://github.com/SpiceBot/SpiceBot.git
synced 2026-11-13 15:09:54 -05:00
test ID
This commit is contained in:
parent
5095780390
commit
dac8673607
@ -237,6 +237,14 @@ def letters_in_string(text):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def is_number(n):
|
||||||
|
try:
|
||||||
|
float(n)
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
"""Channel Functions"""
|
"""Channel Functions"""
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -4,39 +4,45 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
|||||||
|
|
||||||
from sopel.tools import Identifier
|
from sopel.tools import Identifier
|
||||||
|
|
||||||
from .Database import db as botdb
|
from .Database import db as botdb,
|
||||||
|
from .Tools import is_number
|
||||||
|
|
||||||
|
# TODO timestamp for new .seen
|
||||||
|
|
||||||
|
|
||||||
class BotUsers():
|
class BotUsers():
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# TODO timestamp for new .seen
|
self.dict = {
|
||||||
self.all = botdb.get_bot_value('users') or dict()
|
"all": botdb.get_bot_value('users') or {},
|
||||||
self.online = []
|
"online": [],
|
||||||
self.offline = []
|
"offline": [],
|
||||||
for user_id in list(self.all.keys()):
|
"current": {},
|
||||||
self.offline.append(int(user_id))
|
}
|
||||||
self.current = {}
|
"""during setup, all users from database are offline until marked online"""
|
||||||
|
self.dict["offline"] = list(self.dict["all"].keys())
|
||||||
|
|
||||||
def whois(self, nick):
|
def __getattr__(self, name):
|
||||||
nick_id = self.whois_ident(nick)
|
''' will only get called for undefined attributes '''
|
||||||
self.add_to_all(nick, nick_id)
|
"""We will try to find a dict value, or return None"""
|
||||||
self.add_to_current(nick, nick_id)
|
if name.lower() in list(self.dict.keys()):
|
||||||
return self.current[nick_id]["nick"]
|
return self.dict[str(name).lower()]
|
||||||
|
|
||||||
def whois_id(self, nick_id):
|
|
||||||
if nick_id in list(self.current.keys()):
|
|
||||||
return self.current[nick_id]["nick"]
|
|
||||||
elif nick_id in list(self.all.keys()) and len(self.all[nick_id]):
|
|
||||||
return self.all[nick_id][0]
|
|
||||||
else:
|
else:
|
||||||
return None
|
raise Exception('User dict does not contain a function or key ' + name.lower())
|
||||||
|
|
||||||
def whois_nick(self, nick):
|
def ID(self, nick):
|
||||||
|
if is_number(nick):
|
||||||
|
if nick in list(self.dict["current"].keys()):
|
||||||
|
return self.dict["current"][nick]["nick"]
|
||||||
|
elif nick in list(self.dict["all"].keys()) and len(self.dict["all"][nick]):
|
||||||
|
return self.dict["all"][nick][0]
|
||||||
|
else:
|
||||||
|
raise Exception('ID ' + nick + ' does not appear to be associated with a nick')
|
||||||
|
else:
|
||||||
nick_id = self.whois_ident(nick)
|
nick_id = self.whois_ident(nick)
|
||||||
self.add_to_all(nick, nick_id)
|
self.add_to_all(nick, nick_id)
|
||||||
self.add_to_current(nick, nick_id)
|
self.add_to_current(nick, nick_id)
|
||||||
return nick_id
|
return self.dict["current"][nick_id]["nick"]
|
||||||
|
|
||||||
def whois_ident(self, nick):
|
def whois_ident(self, nick):
|
||||||
nick = Identifier(nick)
|
nick = Identifier(nick)
|
||||||
@ -44,25 +50,26 @@ class BotUsers():
|
|||||||
return int(nick_id)
|
return int(nick_id)
|
||||||
|
|
||||||
def save_user_db(self):
|
def save_user_db(self):
|
||||||
botdb.set_bot_value('users', self.all)
|
botdb.set_bot_value('users', self.dict["all"])
|
||||||
|
|
||||||
def add_to_all(self, nick, nick_id=None):
|
def add_to_all(self, nick, nick_id=None):
|
||||||
if not nick_id:
|
if not nick_id:
|
||||||
nick_id = self.whois_ident(nick)
|
nick_id = self.ID(nick)
|
||||||
# add to all if not there
|
# add to all if not there
|
||||||
if nick_id not in list(self.all.keys()):
|
if nick_id not in list(self.dict["all"].keys()):
|
||||||
self.all[nick_id] = []
|
self.dict["all"][nick_id] = []
|
||||||
# add nick alias
|
# add nick alias as index 0
|
||||||
if nick not in self.all[nick_id]:
|
if nick in self.dict["all"][nick_id]:
|
||||||
self.all[nick_id].append(nick)
|
self.dict["all"][nick_id].remove(nick)
|
||||||
|
self.dict["all"][nick_id].insert(0, nick)
|
||||||
self.save_user_db()
|
self.save_user_db()
|
||||||
|
|
||||||
def add_to_current(self, nick, nick_id=None):
|
def add_to_current(self, nick, nick_id=None):
|
||||||
if not nick_id:
|
if not nick_id:
|
||||||
nick_id = self.whois_ident(nick)
|
nick_id = self.whois_ident(nick)
|
||||||
# add to current if not there
|
# add to current if not there
|
||||||
if nick_id not in list(self.current.keys()):
|
if nick_id not in list(self.dict["current"].keys()):
|
||||||
self.current[nick_id] = {"channels": [], "nick": nick}
|
self.dict["current"][nick_id] = {"channels": [], "nick": nick}
|
||||||
|
|
||||||
def channel_scan(self, bot):
|
def channel_scan(self, bot):
|
||||||
for channel in list(bot.channels.keys()):
|
for channel in list(bot.channels.keys()):
|
||||||
@ -74,15 +81,15 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(user, nick_id)
|
self.add_to_current(user, nick_id)
|
||||||
# set current nick
|
# set current nick
|
||||||
self.current[nick_id]["nick"] = user
|
self.dict["current"][nick_id]["nick"] = user
|
||||||
# add joined channel to nick list
|
# add joined channel to nick list
|
||||||
if channel not in self.current[nick_id]["channels"]:
|
if channel not in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].append(channel)
|
self.dict["current"][nick_id]["channels"].append(channel)
|
||||||
# mark user as online
|
# mark user as online
|
||||||
if nick_id not in self.online:
|
if nick_id not in self.dict["online"]:
|
||||||
self.online.append(int(nick_id))
|
self.dict["online"].append(int(nick_id))
|
||||||
if nick_id in self.offline:
|
if nick_id in self.dict["offline"]:
|
||||||
self.offline.remove(nick_id)
|
self.dict["offline"].remove(nick_id)
|
||||||
|
|
||||||
def join(self, bot, trigger):
|
def join(self, bot, trigger):
|
||||||
if trigger.nick == bot.nick:
|
if trigger.nick == bot.nick:
|
||||||
@ -94,15 +101,15 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(user, nick_id)
|
self.add_to_current(user, nick_id)
|
||||||
# set current nick
|
# set current nick
|
||||||
self.current[nick_id]["nick"] = user
|
self.dict["current"][nick_id]["nick"] = user
|
||||||
# add joined channel to nick list
|
# add joined channel to nick list
|
||||||
if trigger.sender not in self.current[nick_id]["channels"]:
|
if trigger.sender not in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].append(trigger.sender)
|
self.dict["current"][nick_id]["channels"].append(trigger.sender)
|
||||||
# mark user as online
|
# mark user as online
|
||||||
if nick_id not in self.online:
|
if nick_id not in self.dict["online"]:
|
||||||
self.online.append(int(nick_id))
|
self.dict["online"].append(int(nick_id))
|
||||||
if nick_id in self.offline:
|
if nick_id in self.dict["offline"]:
|
||||||
self.offline.remove(nick_id)
|
self.dict["offline"].remove(nick_id)
|
||||||
return
|
return
|
||||||
# Identify
|
# Identify
|
||||||
nick_id = self.whois_ident(trigger.nick)
|
nick_id = self.whois_ident(trigger.nick)
|
||||||
@ -111,15 +118,15 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(trigger.nick, nick_id)
|
self.add_to_current(trigger.nick, nick_id)
|
||||||
# set current nick
|
# set current nick
|
||||||
self.current[nick_id]["nick"] = trigger.nick
|
self.dict["current"][nick_id]["nick"] = trigger.nick
|
||||||
# add joined channel to nick list
|
# add joined channel to nick list
|
||||||
if trigger.sender not in self.current[nick_id]["channels"]:
|
if trigger.sender not in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].append(trigger.sender)
|
self.dict["current"][nick_id]["channels"].append(trigger.sender)
|
||||||
# mark user as online
|
# mark user as online
|
||||||
if nick_id not in self.online:
|
if nick_id not in self.dict["online"]:
|
||||||
self.online.append(int(nick_id))
|
self.dict["online"].append(int(nick_id))
|
||||||
if nick_id in self.offline:
|
if nick_id in self.dict["offline"]:
|
||||||
self.offline.remove(nick_id)
|
self.dict["offline"].remove(nick_id)
|
||||||
|
|
||||||
def quit(self, bot, trigger):
|
def quit(self, bot, trigger):
|
||||||
if trigger.nick == bot.nick:
|
if trigger.nick == bot.nick:
|
||||||
@ -131,25 +138,25 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(trigger.nick, nick_id)
|
self.add_to_current(trigger.nick, nick_id)
|
||||||
# empty nicks channel list
|
# empty nicks channel list
|
||||||
if trigger.sender in self.current[nick_id]["channels"]:
|
if trigger.sender in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].remove(trigger.sender)
|
self.dict["current"][nick_id]["channels"].remove(trigger.sender)
|
||||||
self.current[nick_id]["channels"] = []
|
self.dict["current"][nick_id]["channels"] = []
|
||||||
# mark user as offline
|
# mark user as offline
|
||||||
if nick_id in self.online:
|
if nick_id in self.dict["online"]:
|
||||||
self.online.remove(nick_id)
|
self.dict["online"].remove(nick_id)
|
||||||
if nick_id not in self.offline:
|
if nick_id not in self.dict["offline"]:
|
||||||
self.offline.append(int(nick_id))
|
self.dict["offline"].append(int(nick_id))
|
||||||
|
|
||||||
def part(self, bot, trigger):
|
def part(self, bot, trigger):
|
||||||
if trigger.nick == bot.nick:
|
if trigger.nick == bot.nick:
|
||||||
for nick_id in list(self.current.keys()):
|
for nick_id in list(self.dict["current"].keys()):
|
||||||
if trigger.sender in self.current[nick_id]["channels"]:
|
if trigger.sender in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].remove(trigger.sender)
|
self.dict["current"][nick_id]["channels"].remove(trigger.sender)
|
||||||
# mark offline
|
# mark offline
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id in self.online:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id in self.dict["online"]:
|
||||||
self.online.remove(nick_id)
|
self.dict["online"].remove(nick_id)
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id not in self.offline:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id not in self.dict["offline"]:
|
||||||
self.offline.append(int(nick_id))
|
self.dict["offline"].append(int(nick_id))
|
||||||
return
|
return
|
||||||
# Identify
|
# Identify
|
||||||
nick_id = self.whois_ident(trigger.nick)
|
nick_id = self.whois_ident(trigger.nick)
|
||||||
@ -158,25 +165,25 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(trigger.nick, nick_id)
|
self.add_to_current(trigger.nick, nick_id)
|
||||||
# remove channel from nick list
|
# remove channel from nick list
|
||||||
if trigger.sender in self.current[nick_id]["channels"]:
|
if trigger.sender in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].remove(trigger.sender)
|
self.dict["current"][nick_id]["channels"].remove(trigger.sender)
|
||||||
# mark offline
|
# mark offline
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id in self.online:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id in self.dict["online"]:
|
||||||
self.online.remove(nick_id)
|
self.dict["online"].remove(nick_id)
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id not in self.offline:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id not in self.dict["offline"]:
|
||||||
self.offline.append(int(nick_id))
|
self.dict["offline"].append(int(nick_id))
|
||||||
|
|
||||||
def kick(self, bot, trigger):
|
def kick(self, bot, trigger):
|
||||||
targetnick = Identifier(str(trigger.args[1]))
|
targetnick = Identifier(str(trigger.args[1]))
|
||||||
if targetnick == bot.nick:
|
if targetnick == bot.nick:
|
||||||
for nick_id in list(self.current.keys()):
|
for nick_id in list(self.dict["current"].keys()):
|
||||||
if trigger.sender in self.current[nick_id]["channels"]:
|
if trigger.sender in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].remove(trigger.sender)
|
self.dict["current"][nick_id]["channels"].remove(trigger.sender)
|
||||||
# mark offline
|
# mark offline
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id in self.online:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id in self.dict["online"]:
|
||||||
self.online.remove(nick_id)
|
self.dict["online"].remove(nick_id)
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id not in self.offline:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id not in self.dict["offline"]:
|
||||||
self.offline.append(int(nick_id))
|
self.dict["offline"].append(int(nick_id))
|
||||||
return
|
return
|
||||||
# Identify
|
# Identify
|
||||||
nick_id = self.whois_ident(targetnick)
|
nick_id = self.whois_ident(targetnick)
|
||||||
@ -185,13 +192,13 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(targetnick, nick_id)
|
self.add_to_current(targetnick, nick_id)
|
||||||
# remove channel from nick list
|
# remove channel from nick list
|
||||||
if trigger.sender in self.current[nick_id]["channels"]:
|
if trigger.sender in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].remove(trigger.sender)
|
self.dict["current"][nick_id]["channels"].remove(trigger.sender)
|
||||||
# mark offline
|
# mark offline
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id in self.online:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id in self.dict["online"]:
|
||||||
self.online.remove(nick_id)
|
self.dict["online"].remove(nick_id)
|
||||||
if not len(self.current[nick_id]["channels"]) and nick_id not in self.offline:
|
if not len(self.dict["current"][nick_id]["channels"]) and nick_id not in self.dict["offline"]:
|
||||||
self.offline.append(int(nick_id))
|
self.dict["offline"].append(int(nick_id))
|
||||||
|
|
||||||
def nick(self, bot, trigger):
|
def nick(self, bot, trigger):
|
||||||
newnick = Identifier(trigger)
|
newnick = Identifier(trigger)
|
||||||
@ -207,15 +214,15 @@ class BotUsers():
|
|||||||
# Verify nick is in the all list
|
# Verify nick is in the all list
|
||||||
self.add_to_current(newnick, nick_id)
|
self.add_to_current(newnick, nick_id)
|
||||||
# set current nick
|
# set current nick
|
||||||
self.current[nick_id]["nick"] = newnick
|
self.dict["current"][nick_id]["nick"] = newnick
|
||||||
# add joined channel to nick list
|
# add joined channel to nick list
|
||||||
if trigger.sender not in self.current[nick_id]["channels"]:
|
if trigger.sender not in self.dict["current"][nick_id]["channels"]:
|
||||||
self.current[nick_id]["channels"].append(trigger.sender)
|
self.dict["current"][nick_id]["channels"].append(trigger.sender)
|
||||||
# mark user as online
|
# mark user as online
|
||||||
if nick_id not in self.online:
|
if nick_id not in self.dict["online"]:
|
||||||
self.online.append(int(nick_id))
|
self.dict["online"].append(int(nick_id))
|
||||||
if nick_id in self.offline:
|
if nick_id in self.dict["offline"]:
|
||||||
self.offline.remove(nick_id)
|
self.dict["offline"].remove(nick_id)
|
||||||
|
|
||||||
def mode(self, bot, trigger):
|
def mode(self, bot, trigger):
|
||||||
return
|
return
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user