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

test

Browse Source
This commit is contained in:
deathbybandaid 2019-06-07 16:09:20 -04:00
parent 4727c3d102
commit 84bbad5fff
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sopel_modules/SpiceBot/Channels.py
View File

@ -97,20 +97,20 @@ class BotChannels():
else: else:
bot.part(channel) bot.part(channel)
def whois(self, nick): def whois_id(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(nick) nick_id = self.whois_id(nick)
if nick_id not in self.dict['list'][channel.lower()]['users']: if nick_id not in self.dict['list'][channel.lower()]['users']:
self.dict['list'][channel.lower()]['users'].append(nick_id) self.dict['list'][channel.lower()]['users'].append(nick_id)
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(nick) nick_id = self.whois_id(nick)
if nick_id in self.dict['list'][channel.lower()]['users']: if nick_id in self.dict['list'][channel.lower()]['users']:
self.dict['list'][channel.lower()]['users'].remove(nick_id) self.dict['list'][channel.lower()]['users'].remove(nick_id)
@ -124,7 +124,7 @@ class BotChannels():
self.add_to_channel(self, trigger.sender, user) self.add_to_channel(self, trigger.sender, user)
return return
# Identify # Identify
nick_id = self.whois(trigger.nick) nick_id = self.whois_id(trigger.nick)
# Verify nick is in the channel list # Verify nick is in the channel list
self.add_to_channel(self, trigger.sender, trigger.nick, nick_id) self.add_to_channel(self, trigger.sender, trigger.nick, nick_id)
@ -134,7 +134,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(trigger.nick) nick_id = self.whois_id(trigger.nick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id) self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id)
@ -144,7 +144,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(trigger.nick) nick_id = self.whois_id(trigger.nick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id) self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id)
@ -155,7 +155,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(targetnick) nick_id = self.whois_id(targetnick)
# Verify nick is not in the channel list # Verify nick is not in the channel list
self.remove_from_channel(self, trigger.sender, targetnick, nick_id) self.remove_from_channel(self, trigger.sender, targetnick, nick_id)
@ -168,7 +168,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(newnick) nick_id = self.whois_id(newnick)
# Verify nick is in the channel list # Verify nick is in the channel list
self.add_to_channel(self, trigger.sender, trigger.nick, nick_id) self.add_to_channel(self, trigger.sender, trigger.nick, nick_id)

22
sopel_modules/SpiceBot/Users.py
View File

@ -19,6 +19,12 @@ class BotUsers():
self.current = {} self.current = {}
def whois(self, nick): def whois(self, nick):
nick_id = self.whois_id(nick)
self.add_to_all(nick, nick_id)
self.add_to_current(nick, nick_id)
return self.current[nick_id]["nick"]
def whois_id(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
@ -28,7 +34,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(nick) nick_id = self.whois_id(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] = []
@ -39,7 +45,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(nick) nick_id = self.whois_id(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}
@ -49,7 +55,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(user) nick_id = self.whois_id(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
@ -66,7 +72,7 @@ class BotUsers():
self.offline.remove(nick_id) self.offline.remove(nick_id)
return return
# Identify # Identify
nick_id = self.whois(trigger.nick) nick_id = self.whois_id(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
@ -87,7 +93,7 @@ class BotUsers():
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
return return
# Identify # Identify
nick_id = self.whois(trigger.nick) nick_id = self.whois_id(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
@ -115,7 +121,7 @@ class BotUsers():
self.offline.append(nick_id) self.offline.append(nick_id)
return return
# Identify # Identify
nick_id = self.whois(trigger.nick) nick_id = self.whois_id(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
@ -143,7 +149,7 @@ class BotUsers():
self.offline.append(nick_id) self.offline.append(nick_id)
return return
# Identify # Identify
nick_id = self.whois(targetnick) nick_id = self.whois_id(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
@ -166,7 +172,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(newnick) nick_id = self.whois_id(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