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

fix nick_actual

Browse Source
This commit is contained in:
deathbybandaid 2019-06-28 13:46:02 -04:00
parent ee313ea83a
commit 3a215b4975
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sopel_modules/SpiceBot/Users.py
View File

@ -275,7 +275,7 @@ class BotUsers():
return {"targetgood": False, "error": "I am a bot and cannot be targeted.", "reason": "bot"} return {"targetgood": False, "error": "I am a bot and cannot be targeted.", "reason": "bot"}
if "bots" not in targetbypass: if "bots" not in targetbypass:
if inlist(target, bot.nick): if inlist(target, bot.nick):
return {"targetgood": False, "error": self.nick_actual(bot, 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) nick_id = self.whois_ident(target, usercreate=False)
@ -307,18 +307,18 @@ class BotUsers():
# 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):
return {"targetgood": False, "error": "It looks like " + self.nick_actual(bot, target) + " is offline right now!", "reason": "offline"} return {"targetgood": False, "error": "It looks like " + self.nick_actual(target) + " is offline right now!", "reason": "offline"}
# Private Message # Private Message
if "privmsg" not in targetbypass: if "privmsg" not in targetbypass:
if trigger.is_privmsg and not inlist(target, trigger.nick): if trigger.is_privmsg and not inlist(target, trigger.nick):
return {"targetgood": False, "error": "Leave " + self.nick_actual(bot, target) + " out of this private conversation!", "reason": "privmsg"} return {"targetgood": False, "error": "Leave " + self.nick_actual(target) + " out of this private conversation!", "reason": "privmsg"}
# not in the same channel # not in the same channel
if "diffchannel" not in targetbypass: if "diffchannel" not in targetbypass:
if not trigger.is_privmsg and self.target_online(target, nick_id): if not trigger.is_privmsg and self.target_online(target, nick_id):
if str(trigger.sender).lower() not in self.dict["current"][nick_id]["channels"]: if str(trigger.sender).lower() not in self.dict["current"][nick_id]["channels"]:
return {"targetgood": False, "error": "It looks like " + self.nick_actual(bot, target) + " is online right now, but in a different channel.", "reason": "diffchannel"} return {"targetgood": False, "error": "It looks like " + self.nick_actual(target) + " is online right now, but in a different channel.", "reason": "diffchannel"}
return targetgood return targetgood