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-28 14:17:55 -04:00
parent 40bfccfef2
commit cb0e66211b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sopel_modules/SpiceBot/Users.py
View File

@ -101,6 +101,7 @@ class BotUsers():
self.dict["offline"].remove(nick_id) self.dict["offline"].remove(nick_id)
def join(self, bot, trigger): def join(self, bot, trigger):
bot.osd("JOIN", "deathbybandaid", "notice")
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
for user in list(bot.channels[trigger.sender].privileges.keys()): for user in list(bot.channels[trigger.sender].privileges.keys()):
# Identify # Identify
@ -138,6 +139,7 @@ class BotUsers():
self.dict["offline"].remove(nick_id) self.dict["offline"].remove(nick_id)
def quit(self, bot, trigger): def quit(self, bot, trigger):
bot.osd("QUIT", "deathbybandaid", "notice")
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
return return
# Identify # Identify
@ -157,6 +159,7 @@ class BotUsers():
self.dict["offline"].append(int(nick_id)) self.dict["offline"].append(int(nick_id))
def part(self, bot, trigger): def part(self, bot, trigger):
bot.osd("PART", "deathbybandaid", "notice")
if trigger.nick == bot.nick: if trigger.nick == bot.nick:
for nick_id in list(self.dict["current"].keys()): for nick_id in list(self.dict["current"].keys()):
if str(trigger.sender).lower() in self.dict["current"][nick_id]["channels"]: if str(trigger.sender).lower() in self.dict["current"][nick_id]["channels"]:
@ -183,6 +186,7 @@ class BotUsers():
self.dict["offline"].append(int(nick_id)) self.dict["offline"].append(int(nick_id))
def kick(self, bot, trigger): def kick(self, bot, trigger):
bot.osd("KICK", "deathbybandaid", "notice")
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.dict["current"].keys()): for nick_id in list(self.dict["current"].keys()):
@ -210,6 +214,7 @@ class BotUsers():
self.dict["offline"].append(int(nick_id)) self.dict["offline"].append(int(nick_id))
def nick(self, bot, trigger): def nick(self, bot, trigger):
bot.osd("NICK", "deathbybandaid", "notice")
newnick = Identifier(trigger) newnick = Identifier(trigger)
if trigger.nick == bot.nick or newnick == bot.nick: if trigger.nick == bot.nick or newnick == bot.nick:
return return
@ -236,11 +241,11 @@ class BotUsers():
def mode(self, bot, trigger): def mode(self, bot, trigger):
return return
def targetcheck(self, posstarget): def targetcheck(self, target):
return True return True
# idk whois # idk whois
if not botdb.check_nick_id(posstarget): if not botdb.check_nick_id(target):
return return
def nick_actual(self, nick, altlist=None): def nick_actual(self, nick, altlist=None):
@ -279,11 +284,9 @@ class BotUsers():
if inlist(target, bot.nick): if inlist(target, bot.nick):
return {"targetgood": False, "error": self.nick_actual(target) + " is a bot and cannot be targeted.", "reason": "bots"} return {"targetgood": False, "error": self.nick_actual(target) + " is a bot and cannot be targeted.", "reason": "bots"}
nick_id = self.whois_ident(target, usercreate=False)
# Not a valid user # Not a valid user
if "unknown" not in targetbypass: if "unknown" not in targetbypass:
if not nick_id: if not botdb.check_nick_id(target):
sim_user, sim_num = [], [] sim_user, sim_num = [], []
for nick_id in list(self.dict["all"].keys()): for nick_id in list(self.dict["all"].keys()):
nick_list = self.dict["all"][nick_id] nick_list = self.dict["all"][nick_id]
@ -306,6 +309,8 @@ class BotUsers():
targetgooderror = "I am not sure who that is." targetgooderror = "I am not sure who that is."
return {"targetgood": False, "error": targetgooderror, "reason": "unknown"} return {"targetgood": False, "error": targetgooderror, "reason": "unknown"}
nick_id = self.whois_ident(target, usercreate=False)
# User offline # User offline
if "offline" not in targetbypass: if "offline" not in targetbypass:
if not self.target_online(target, nick_id): if not self.target_online(target, nick_id):

1
sopel_modules/SpiceBot_Core_Processing/Users.py
View File

@ -48,5 +48,4 @@ def users_mode(bot, trigger):
@sopel.module.event(SpiceBot.events.BOT_CONNECTED) @sopel.module.event(SpiceBot.events.BOT_CONNECTED)
@sopel.module.rule('.*') @sopel.module.rule('.*')
def bot_channelscan_users(bot, trigger): def bot_channelscan_users(bot, trigger):
while True:
SpiceBot.users.channel_scan(bot) SpiceBot.users.channel_scan(bot)