Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug #847032.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-11-22 03:50:45 +00:00
parent 37c6516693
commit 0b9d7bd0bb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Services.py
View File

@ -47,14 +47,14 @@ import callbacks
def configure(onStart, afterConnect, advanced): def configure(onStart, afterConnect, advanced):
from questions import expect, anything, something, yn from questions import expect, anything, something, yn
nick = anything('What is your registered nick?') nick = something('What is your registered nick?')
password = anything('What is your password for that nick?') password = something('What is your password for that nick?')
chanserv = 'ChanServ' chanserv = 'ChanServ'
if yn('Is your ChanServ named something other than ChanServ?') == 'y': if yn('Is your ChanServ named something other than ChanServ?') == 'y':
chanserv = anything('What is your ChanServ named?') chanserv = something('What is your ChanServ named?')
nickserv = 'NickServ' nickserv = 'NickServ'
if yn('Is your NickServ named something other than NickServ?') == 'y': if yn('Is your NickServ named something other than NickServ?') == 'y':
nickserv = anything('What is your NickServ named?') nickserv = something('What is your NickServ named?')
onStart.append('load Services') onStart.append('load Services')
onStart.append('services start %s %s %s %s' % \ onStart.append('services start %s %s %s %s' % \
(nick, password, nickserv, chanserv)) (nick, password, nickserv, chanserv))
@ -79,6 +79,9 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
return return
(self.nick, self.password, nickserv, chanserv) = \ (self.nick, self.password, nickserv, chanserv) = \
privmsgs.getArgs(args, required=2, optional=2) privmsgs.getArgs(args, required=2, optional=2)
if not self.nick:
irc.error(msg, 'The registered nick cannot be blank.')
return
self.nick = ircutils.IrcString(self.nick) self.nick = ircutils.IrcString(self.nick)
self.nickserv = ircutils.IrcString(nickserv or 'NickServ') self.nickserv = ircutils.IrcString(nickserv or 'NickServ')
self.chanserv = ircutils.IrcString(chanserv or 'ChanServ') self.chanserv = ircutils.IrcString(chanserv or 'ChanServ')
@ -88,6 +91,7 @@ class Services(privmsgs.CapabilityCheckingPrivmsg):
def do376(self, irc, msg): def do376(self, irc, msg):
if self.nickserv: if self.nickserv:
assert self.nick, 'Services: Nick must not be empty.'
identify = 'IDENTIFY %s' % self.password identify = 'IDENTIFY %s' % self.password
# It's important that this next statement is irc.sendMsg, not # It's important that this next statement is irc.sendMsg, not
# irc.queueMsg. We want this message to get through before any # irc.queueMsg. We want this message to get through before any

2
test/test_Services.py
View File

@ -33,6 +33,8 @@ from test import *
class ServicesTestCase(PluginTestCase, PluginDocumentation): class ServicesTestCase(PluginTestCase, PluginDocumentation):
plugins = ('Services',) plugins = ('Services',)
def testNoEmptyNick(self):
self.assertError('start "" "foobar"')
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: