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

add id to nick function

Browse Source
This commit is contained in:
deathbybandaid 2019-06-07 20:42:00 -04:00
parent dfbc80cac7
commit 90b797c59c
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sopel_modules/SpiceBot/Channels.py
View File

@ -97,14 +97,14 @@ class BotChannels():
else: else:
bot.part(channel) bot.part(channel)
def whois_id(self, nick): def whois_ident(self, nick):
nick = Identifier(nick) nick = Identifier(nick)
nick_id = botdb.db.get_nick_id(nick, create=True) nick_id = botdb.db.get_nick_id(nick, create=True)
return nick_id return nick_id
def add_to_channel(self, channel, nick, nick_id=None): def add_to_channel(self, channel, nick, nick_id=None):
if not nick_id: if not nick_id:
nick_id = self.whois_id(nick) nick_id = self.whois_ident(nick)
if channel.lower() not in self.dict['list'].keys(): if channel.lower() not in self.dict['list'].keys():
self.dict['list'][channel.lower()] = dict() self.dict['list'][channel.lower()] = dict()
if 'users' not in self.dict['list'][channel.lower()]: if 'users' not in self.dict['list'][channel.lower()]:
@ -114,7 +114,7 @@ class BotChannels():
def remove_from_channel(self, channel, nick, nick_id=None): def remove_from_channel(self, channel, nick, nick_id=None):
if not nick_id: if not nick_id:
nick_id = self.whois_id(nick) nick_id = self.whois_ident(nick)
if channel.lower() not in self.dict['list'].keys(): if channel.lower() not in self.dict['list'].keys():
self.dict['list'][channel.lower()] = dict() self.dict['list'][channel.lower()] = dict()
if 'users' not in self.dict['list'][channel.lower()]: if 'users' not in self.dict['list'][channel.lower()]:
@ -141,7 +141,7 @@ class BotChannels():
self.add_to_channel(trigger.sender, user) self.add_to_channel(trigger.sender, user)
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is in the channel list # Verify nick is in the channel list
self.add_to_channel(trigger.sender, trigger.nick, nick_id) self.add_to_channel(trigger.sender, trigger.nick, nick_id)
@ -151,7 +151,7 @@ class BotChannels():
self.remove_all_from_channel(trigger.sender) self.remove_all_from_channel(trigger.sender)
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(trigger.sender, trigger.nick, nick_id) self.remove_from_channel(trigger.sender, trigger.nick, nick_id)
@ -161,7 +161,7 @@ class BotChannels():
self.remove_all_from_channel(trigger.sender) self.remove_all_from_channel(trigger.sender)
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(trigger.sender, trigger.nick, nick_id) self.remove_from_channel(trigger.sender, trigger.nick, nick_id)
@ -172,7 +172,7 @@ class BotChannels():
self.remove_all_from_channel(trigger.sender) self.remove_all_from_channel(trigger.sender)
return return
# Identify # Identify
nick_id = self.whois_id(targetnick) nick_id = self.whois_ident(targetnick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(trigger.sender, targetnick, nick_id) self.remove_from_channel(trigger.sender, targetnick, nick_id)
@ -185,7 +185,7 @@ class BotChannels():
if not botdb.check_nick_id(newnick): if not botdb.check_nick_id(newnick):
botdb.alias_nick(trigger.nick, newnick) botdb.alias_nick(trigger.nick, newnick)
# Identify # Identify
nick_id = self.whois_id(newnick) nick_id = self.whois_ident(newnick)
# Verify nick is in the channel list # Verify nick is in the channel list
self.add_to_channel(trigger.sender, trigger.nick, nick_id) self.add_to_channel(trigger.sender, trigger.nick, nick_id)

30
sopel_modules/SpiceBot/Users.py
View File

@ -19,12 +19,20 @@ class BotUsers():
self.current = {} self.current = {}
def whois(self, nick): def whois(self, nick):
nick_id = self.whois_id(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 self.current[nick_id]["nick"] return self.current[nick_id]["nick"]
def whois_id(self, nick): def whois_id(self, nick_id):
if nick_id in self.current.keys():
return self.current[nick_id]["nick"]
elif int(nick_id) in self.all.keys() and len(self.all[nick_id]):
return self.all[nick_id][0]
else:
return None
def whois_ident(self, nick):
nick = Identifier(nick) nick = Identifier(nick)
nick_id = botdb.db.get_nick_id(nick, create=True) nick_id = botdb.db.get_nick_id(nick, create=True)
return int(nick_id) return int(nick_id)
@ -34,7 +42,7 @@ class BotUsers():
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_id(nick) nick_id = self.whois_ident(nick)
# add to all if not there # add to all if not there
if nick_id not in self.all.keys(): if nick_id not in self.all.keys():
self.all[nick_id] = [] self.all[nick_id] = []
@ -45,7 +53,7 @@ class BotUsers():
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_id(nick) nick_id = self.whois_ident(nick)
# add to current if not there # add to current if not there
if nick_id not in self.current.keys(): if nick_id not in self.current.keys():
self.current[nick_id] = {"channels": [], "nick": nick} self.current[nick_id] = {"channels": [], "nick": nick}
@ -54,7 +62,7 @@ class BotUsers():
for channel in bot.channels.keys(): for channel in bot.channels.keys():
for user in bot.channels[channel].privileges.keys(): for user in bot.channels[channel].privileges.keys():
# Identify # Identify
nick_id = self.whois_id(user) nick_id = self.whois_ident(user)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(user, nick_id) self.add_to_all(user, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -74,7 +82,7 @@ class BotUsers():
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
for user in bot.channels[trigger.sender].privileges.keys(): for user in bot.channels[trigger.sender].privileges.keys():
# Identify # Identify
nick_id = self.whois_id(user) nick_id = self.whois_ident(user)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(user, nick_id) self.add_to_all(user, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -91,7 +99,7 @@ class BotUsers():
self.offline.remove(nick_id) self.offline.remove(nick_id)
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(trigger.nick, nick_id) self.add_to_all(trigger.nick, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -111,7 +119,7 @@ class BotUsers():
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(trigger.nick, nick_id) self.add_to_all(trigger.nick, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -138,7 +146,7 @@ class BotUsers():
self.offline.append(int(nick_id)) self.offline.append(int(nick_id))
return return
# Identify # Identify
nick_id = self.whois_id(trigger.nick) nick_id = self.whois_ident(trigger.nick)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(trigger.nick, nick_id) self.add_to_all(trigger.nick, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -165,7 +173,7 @@ class BotUsers():
self.offline.append(int(nick_id)) self.offline.append(int(nick_id))
return return
# Identify # Identify
nick_id = self.whois_id(targetnick) nick_id = self.whois_ident(targetnick)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(targetnick, nick_id) self.add_to_all(targetnick, nick_id)
# Verify nick is in the all list # Verify nick is in the all list
@ -187,7 +195,7 @@ class BotUsers():
if not botdb.check_nick_id(newnick): if not botdb.check_nick_id(newnick):
botdb.alias_nick(trigger.nick, newnick) botdb.alias_nick(trigger.nick, newnick)
# Identify # Identify
nick_id = self.whois_id(newnick) nick_id = self.whois_ident(newnick)
# Verify nick is in the all list # Verify nick is in the all list
self.add_to_all(newnick, nick_id) self.add_to_all(newnick, nick_id)
# Verify nick is in the all list # Verify nick is in the all list