mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-12-24 19:52:54 +01:00
Changed some nick != othernick to not ircutils.strEqual.
This commit is contained in:
parent
bad2bb12f2
commit
9efe550b52
@ -191,7 +191,8 @@ class Enforcer(callbacks.Privmsg):
|
||||
def doTopic(self, irc, msg):
|
||||
channel = msg.args[0]
|
||||
topic = msg.args[1]
|
||||
if msg.nick != irc.nick and channel in self.topics and \
|
||||
if channel in self.topics and \
|
||||
not ircutils.strEqual(msg.nick, irc.nick) and \
|
||||
not ircdb.checkCapabilities(msg.prefix,
|
||||
(_chanCap(channel, 'op'),
|
||||
_chanCap(channel, 'topic'))):
|
||||
@ -232,7 +233,7 @@ class Enforcer(callbacks.Privmsg):
|
||||
if self._isPowerful(irc, channel, hostmask) and \
|
||||
not self.registryValue('takeRevenge.onOps', channel):
|
||||
return
|
||||
if irc.nick != nick:
|
||||
if not ircutils.strEqual(irc.nick, nick):
|
||||
self._doBan(irc, channel, hostmask)
|
||||
else:
|
||||
# This can happen if takeRevenge.onOps is True.
|
||||
@ -313,7 +314,7 @@ class Enforcer(callbacks.Privmsg):
|
||||
self.log.info('Not cycling %s: it\'s +i or +k.', channel)
|
||||
|
||||
def doPart(self, irc, msg):
|
||||
if msg.prefix != irc.prefix:
|
||||
if not ircutils.strEqual(msg.nick, irc.nick):
|
||||
channel = msg.args[0]
|
||||
c = irc.state.channels[channel]
|
||||
if len(c.users) == 1:
|
||||
@ -337,7 +338,7 @@ class Enforcer(callbacks.Privmsg):
|
||||
chanserv = self.registryValue('ChanServ', irc.network)
|
||||
if chanserv:
|
||||
if ircutils.isUserHostmask(msg.prefix):
|
||||
if msg.nick != chanserv:
|
||||
if not ircutils.strEqual(msg.nick, chanserv):
|
||||
callbacks.Privmsg.__call__(self, irc, msg)
|
||||
else:
|
||||
callbacks.Privmsg.__call__(self, irc, msg)
|
||||
|
@ -212,7 +212,8 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
|
||||
return
|
||||
nickserv = self.registryValue('NickServ')
|
||||
password = self._getNickServPassword(nick)
|
||||
if nick and irc.nick != nick and nickserv and password:
|
||||
if nick and nickserv and password and \
|
||||
not ircutils.strEqual(nick, irc.nick):
|
||||
if irc.afterConnect and not self.sentGhost:
|
||||
if nick in irc.state.nicksToHostmasks:
|
||||
self._doGhost(irc)
|
||||
|
Loading…
Reference in New Issue
Block a user