Removed a useless variable and changed a response to use conf.replyRequiresPrivacy

This commit is contained in:
Jeremy Fincher 2003-03-28 02:34:31 +00:00
parent 042f4555a0
commit 0863a95919

View File

@ -40,6 +40,7 @@ from baseplugin import *
import re import re
import conf
import ircdb import ircdb
import ircmsgs import ircmsgs
import privmsgs import privmsgs
@ -54,13 +55,13 @@ class NickServ(callbacks.Privmsg):
def startnickserv(self, irc, msg, args): def startnickserv(self, irc, msg, args):
"<bot's nick> <password> <NickServ's nick (defaults to NickServ)>" "<bot's nick> <password> <NickServ's nick (defaults to NickServ)>"
if ircutils.isChannel(msg.args[0]): if ircutils.isChannel(msg.args[0]):
irc.error(msg, 'Command must not be done in a channel.') irc.error(msg, conf.replyRequiresPrivacy)
return
if ircdb.checkCapability(msg.prefix, 'owner'): if ircdb.checkCapability(msg.prefix, 'owner'):
(self.nick, self.password, nickserv) = privmsgs.getArgs(args, (self.nick, self.password, nickserv) = privmsgs.getArgs(args,
needed=2, needed=2,
optional=1) optional=1)
self.nickserv = nickserv or 'NickServ' self.nickserv = nickserv or 'NickServ'
self.sentGhost = 0
self._ghosted = re.compile('%s.*killed' % self.nick) self._ghosted = re.compile('%s.*killed' % self.nick)
irc.reply(msg, conf.replySuccess) irc.reply(msg, conf.replySuccess)
else: else: