Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-02 17:29:22 +01:00
Code Issues Projects Releases Wiki Activity

Updated, adding some logging, adding style dots to some others, etc.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-07-27 05:17:31 +00:00
parent 50c650ace3
commit 01e3cbad9e
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/Services.py
View File

@ -206,15 +206,15 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
if not nickserv or msg.nick != nickserv: if not nickserv or msg.nick != nickserv:
return return
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(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))
elif ('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:
@ -223,7 +223,7 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
# Usage info for identify command; ignore. # Usage info for identify command; ignore.
self.log.debug('Got usage info for identify command.') 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
for channel in irc.state.channels.keys(): for channel in irc.state.channels.keys():
self.checkPrivileges(irc, channel) self.checkPrivileges(irc, channel)
@ -233,25 +233,40 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
log = 'Received "Password Incorrect" from NickServ.' log = 'Received "Password Incorrect" from NickServ.'
self.log.warning(log) self.log.warning(log)
else: else:
self.log.debug('Unexpected notice from NickServ: %r', s) self.log.debug('Unexpected notice from NickServ: %r.', s)
def checkPrivileges(self, irc, channel): def checkPrivileges(self, irc, channel):
chanserv = self.registryValue('ChanServ') chanserv = self.registryValue('ChanServ')
if chanserv and self.registryValue('ChanServ.op', channel): if chanserv and self.registryValue('ChanServ.op', channel):
if irc.nick not in irc.state.channels[channel].ops: if irc.nick not in irc.state.channels[channel].ops:
self.log.info('Requesting op from %s in %s', chanserv, channel) self.log.info('Requesting op from %s in %s.', chanserv, channel)
irc.sendMsg(ircmsgs.privmsg(chanserv, 'op %s' % channel)) irc.sendMsg(ircmsgs.privmsg(chanserv, 'op %s' % channel))
if chanserv and self.registryValue('ChanServ.halfop', channel): if chanserv and self.registryValue('ChanServ.halfop', channel):
if irc.nick not in irc.state.channels[channel].halfops: if irc.nick not in irc.state.channels[channel].halfops:
self.log.info('Requesting halfop from %s in %s', self.log.info('Requesting halfop from %s in %s.',
chanserv, channel) chanserv, channel)
irc.sendMsg(ircmsgs.privmsg(chanserv, 'halfop %s' % channel)) irc.sendMsg(ircmsgs.privmsg(chanserv, 'halfop %s' % channel))
if chanserv and self.registryValue('ChanServ.voice', channel): if chanserv and self.registryValue('ChanServ.voice', channel):
if irc.nick not in irc.state.channels[channel].voices: if irc.nick not in irc.state.channels[channel].voices:
self.log.info('Requesting voice from %s in %s', self.log.info('Requesting voice from %s in %s.',
chanserv, channel) chanserv, channel)
irc.sendMsg(ircmsgs.privmsg(chanserv, 'voice %s' % channel)) irc.sendMsg(ircmsgs.privmsg(chanserv, 'voice %s' % channel))
def doMode(self, irc, msg):
chanserv = self.registryValue('ChanServ')
if msg.nick == chanserv:
channel = msg.args[0]
if len(msg.args) == 3:
if msg.args[2] == irc.nick:
mode = msg.args[1]
info = self.log.info
if mode == '+o':
info('Received op from ChanServ in %s.', channel)
elif mode == '+h':
info('Received halfop from ChanServ in %s.', channel)
elif mode == '+v':
info('Received voice from ChanServ in %s.', channel)
def do366(self, irc, msg): # End of /NAMES list; finished joining a channel def do366(self, irc, msg): # End of /NAMES list; finished joining a channel
if self.identified: if self.identified:
channel = msg.args[1] # nick is msg.args[0]. channel = msg.args[1] # nick is msg.args[0].