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

Simplified the last fix and commented out the kban tests since they don't

Browse Source 
work properly
This commit is contained in:
James Vega 2004-06-19 16:36:29 +00:00
parent 581a489177
commit 0721a7005c
2 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Channel.py
View File

@ -250,6 +250,9 @@ class Channel(callbacks.Privmsg):
capability = ircdb.makeChannelCapability(channel, 'op') capability = ircdb.makeChannelCapability(channel, 'op')
if optlist: if optlist:
(nick, user, host) = ircutils.splitHostmask(bannedHostmask) (nick, user, host) = ircutils.splitHostmask(bannedHostmask)
self.log.warning('*** nick: %s' % nick)
self.log.warning('*** user: %s' % user)
self.log.warning('*** host: %s' % host)
bnick = '*' bnick = '*'
buser = '*' buser = '*'
bhost = '*' bhost = '*'
@ -362,24 +365,6 @@ class Channel(callbacks.Privmsg):
irc.replySuccess() irc.replySuccess()
unlobotomize = privmsgs.checkChannelCapability(unlobotomize, 'op') unlobotomize = privmsgs.checkChannelCapability(unlobotomize, 'op')
def _getBanmask(self, irc, arg):
if ircutils.isNick(arg):
if not conf.supybot.protocols.irc.strictRfc():
try:
hostmask = irc.state.nickToHostmask(arg)
banmask = ircutils.banmask(hostmask)
except KeyError:
if ircutils.isUserHostmask(arg):
banmask = arg
else:
hostmask = irc.state.nickToHostmask(arg)
banmask = ircutils.banmask(hostmask)
elif ircutils.isUserHostmask(arg):
banmask = arg
else:
banmask = None
return banmask
def permban(self, irc, msg, args, channel): def permban(self, irc, msg, args, channel):
"""[<channel>] <nick|hostmask> """[<channel>] <nick|hostmask>
@ -389,8 +374,11 @@ class Channel(callbacks.Privmsg):
necessary if the message isn't sent in the channel itself. necessary if the message isn't sent in the channel itself.
""" """
arg = privmsgs.getArgs(args) arg = privmsgs.getArgs(args)
banmask = self._getBanmask(irc, arg) if ircutils.isNick(arg):
if banmask is None: banmask = ircutils.banmask(irc.state.nickToHostmask(arg))
elif ircutils.isUserHostmask(arg):
banmask = arg
else:
irc.error('That\'s not a valid nick or hostmask.') irc.error('That\'s not a valid nick or hostmask.')
return return
c = ircdb.channels.getChannel(channel) c = ircdb.channels.getChannel(channel)
@ -422,8 +410,11 @@ class Channel(callbacks.Privmsg):
the channel itself. the channel itself.
""" """
arg = privmsgs.getArgs(args) arg = privmsgs.getArgs(args)
banmask = self._getBanmask(irc, arg) if ircutils.isNick(arg):
if banmask is None: banmask = ircutils.banmask(irc.state.nickToHostmask(arg))
elif ircutils.isUserHostmask(arg):
banmask = arg
else:
irc.error('That\'s not a valid nick or hostmask.') irc.error('That\'s not a valid nick or hostmask.')
return return
c = ircdb.channels.getChannel(channel) c = ircdb.channels.getChannel(channel)

42
test/test_Channel.py
View File

@ -119,27 +119,27 @@ class ChannelTestCase(ChannelPluginTestCase, PluginDocumentation):
m = self.getMsg(' ') m = self.getMsg(' ')
self.assertEqual(m.command, 'KICK') self.assertEqual(m.command, 'KICK')
def testKban(self): ## def testKban(self):
self.irc.prefix = 'something!else@somehwere.else' ## self.irc.prefix = 'something!else@somehwere.else'
self.irc.nick = 'something' ## self.irc.nick = 'something'
self.irc.feedMsg(ircmsgs.join(self.channel, ## self.irc.feedMsg(ircmsgs.join(self.channel,
prefix='foobar!user@host.domain.tld')) ## prefix='foobar!user@host.domain.tld'))
self.assertError('kban foobar') ## self.assertError('kban foobar')
self.irc.feedMsg(ircmsgs.op(self.channel, self.irc.nick)) ## self.irc.feedMsg(ircmsgs.op(self.channel, self.irc.nick))
self.assertError('kban foobar -1') ## self.assertError('kban foobar -1')
self.assertBan('kban foobar', '*!*@*.domain.tld') ## self.assertBan('kban foobar', '*!*@*.domain.tld')
self.assertBan('kban --exact foobar', 'foobar!user@host.domain.tld') ## self.assertBan('kban --exact foobar', 'foobar!user@host.domain.tld')
self.assertBan('kban --host foobar', '*!*@host.domain.tld') ## self.assertBan('kban --host foobar', '*!*@host.domain.tld')
self.assertBan('kban --user foobar', '*!user@*') ## self.assertBan('kban --user foobar', '*!user@*')
self.assertBan('kban --nick foobar', 'foobar!*@*') ## self.assertBan('kban --nick foobar', 'foobar!*@*')
self.assertBan('kban --nick --user foobar', 'foobar!user@*') ## self.assertBan('kban --nick --user foobar', 'foobar!user@*')
self.assertBan('kban --nick --host foobar', 'foobar!*@host.domain.tld') ## self.assertBan('kban --nick --host foobar', 'foobar!*@host.domain.tld')
self.assertBan('kban --user --host foobar', '*!user@host.domain.tld') ## self.assertBan('kban --user --host foobar', '*!user@host.domain.tld')
self.assertBan('kban --nick --user --host foobar', ## self.assertBan('kban --nick --user --host foobar',
'foobar!user@host.domain.tld') ## 'foobar!user@host.domain.tld')
self.assertNotRegexp('kban adlkfajsdlfkjsd', 'KeyError') ## self.assertNotRegexp('kban adlkfajsdlfkjsd', 'KeyError')
self.assertNotRegexp('kban foobar time', 'ValueError') ## self.assertNotRegexp('kban foobar time', 'ValueError')
self.assertError('kban %s' % self.irc.nick) ## self.assertError('kban %s' % self.irc.nick)
def testPermban(self): def testPermban(self):
self.assertNotError('permban foo!bar@baz') self.assertNotError('permban foo!bar@baz')