Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-25 04:02:46 +01:00
Code Issues Projects Releases Wiki Activity

Mega r0x0r update.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-16 07:40:18 +00:00
parent 96e8f32999
commit 16c4150d1c
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/Services.py
View File

@ -138,6 +138,13 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
irc.sendMsg(ircmsgs.privmsg(nickserv, ghost)) irc.sendMsg(ircmsgs.privmsg(nickserv, ghost))
self.sentGhost = True self.sentGhost = True
def __call__(self, irc, msg):
callbacks.Privmsg.__call__(self, irc, msg)
nick = self.registryValue('nick')
if nick and irc.nick != nick:
if irc.afterConnect and not self.sentGhost:
self._doGhost(irc)
def do001(self, irc, msg): def do001(self, irc, msg):
# New connection, make sure sentGhost is False. # New connection, make sure sentGhost is False.
self.sentGhost = False self.sentGhost = False
@ -162,10 +169,7 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
def do433(self, irc, msg): def do433(self, irc, msg):
if irc.afterConnect: if irc.afterConnect:
nickserv = self.registryValue('NickServ') nickserv = self.registryValue('NickServ')
if nickserv: self._doGhost(irc)
self._doGhost(irc)
else:
self.log.warning('do433 called without NickServ being set.')
def do515(self, irc, msg): def do515(self, irc, msg):
# Can't join this channel, it's +r (we must be identified). # Can't join this channel, it's +r (we must be identified).
@ -176,10 +180,10 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
if msg.args[0] == nick: if msg.args[0] == nick:
self._doIdentify(irc) self._doIdentify(irc)
def _ghosted(self, irc, s): def _ghosted(self, s):
r = re.compile(r'(Ghost|%s).*killed' % nick = self.registryValue('nick')
self.registryValue('nick')) lowered = s.lower()
return bool(r.search(s)) return bool('killed' in lowered and (nick in s or 'ghost' in lowered))
def doNotice(self, irc, msg): def doNotice(self, irc, msg):
if irc.afterConnect: if irc.afterConnect:
@ -189,17 +193,20 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
nick = self.registryValue('nick') nick = self.registryValue('nick')
self.log.debug('Notice received from NickServ: %r', msg) self.log.debug('Notice received from NickServ: %r', msg)
s = msg.args[1].lower() s = msg.args[1].lower()
if self._ghosted(irc, s): if self._ghosted(s):
self.log.info('Received "GHOST succeeded" from NickServ') self.log.info('Received "GHOST succeeded" from NickServ')
self.sentGhost = False self.sentGhost = False
irc.queueMsg(ircmsgs.nick(nick)) irc.queueMsg(ircmsgs.nick(nick))
if ('registered' in s or 'protected' in s) and \ elif ('registered' in s or 'protected' in s) and \
('not' not in s and 'isn\'t' not in s): ('not' not in s and 'isn\'t' not in s):
self.log.info('Received "Registered Nick" from NickServ') self.log.info('Received "Registered Nick" from NickServ')
if nick == irc.nick: if nick == irc.nick:
self._doIdentify(irc) self._doIdentify(irc)
else: else:
irc.sendMsg(ircmsgs.nick(nick)) irc.sendMsg(ircmsgs.nick(nick))
elif '/msg' in s and 'identify' in s and 'password' in s:
# Usage info for identify command; ignore.
self.log.debug('Got usage info for identify command.')
elif 'now recognized' in s: elif 'now recognized' in s:
self.log.info('Received "Password accepted" from NickServ') self.log.info('Received "Password accepted" from NickServ')
self.identified = True self.identified = True