mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-25 19:44:13 +01:00
Channel: Allow kick to accept multiple nicks.
Closes: Sf patch #1813467 Signed-off-by: James Vega <jamessan@users.sourceforge.net>
This commit is contained in:
parent
aa2337791a
commit
c376b8e796
@ -248,15 +248,15 @@ class Channel(callbacks.Plugin):
|
|||||||
self._sendMsg(irc, networkGroup.channels.join(channel))
|
self._sendMsg(irc, networkGroup.channels.join(channel))
|
||||||
cycle = wrap(cycle, ['op'])
|
cycle = wrap(cycle, ['op'])
|
||||||
|
|
||||||
def kick(self, irc, msg, args, channel, nick, reason):
|
def kick(self, irc, msg, args, channel, nicks, reason):
|
||||||
"""[<channel>] <nick> [<reason>]
|
"""[<channel>] <nick>[, <nick>, ...] [<reason>]
|
||||||
|
|
||||||
Kicks <nick> from <channel> for <reason>. If <reason> isn't given,
|
Kicks <nick>(s) from <channel> for <reason>. If <reason> isn't given,
|
||||||
uses the nick of the person making the command as the reason.
|
uses the nick of the person making the command as the reason.
|
||||||
<channel> is only necessary if the message isn't sent in the channel
|
<channel> is only necessary if the message isn't sent in the channel
|
||||||
itself.
|
itself.
|
||||||
"""
|
"""
|
||||||
if ircutils.strEqual(nick, irc.nick):
|
if utils.iter.any(lambda n: ircutils.strEqual(n, irc.nick), nicks):
|
||||||
irc.error('I cowardly refuse to kick myself.', Raise=True)
|
irc.error('I cowardly refuse to kick myself.', Raise=True)
|
||||||
if not reason:
|
if not reason:
|
||||||
reason = msg.nick
|
reason = msg.nick
|
||||||
@ -265,9 +265,10 @@ class Channel(callbacks.Plugin):
|
|||||||
irc.error('The reason you gave is longer than the allowed '
|
irc.error('The reason you gave is longer than the allowed '
|
||||||
'length for a KICK reason on this server.',
|
'length for a KICK reason on this server.',
|
||||||
Raise=True)
|
Raise=True)
|
||||||
self._sendMsg(irc, ircmsgs.kick(channel, nick, reason))
|
for nick in nicks:
|
||||||
|
self._sendMsg(irc, ircmsgs.kick(channel, nick, reason))
|
||||||
kick = wrap(kick, ['op', ('haveOp', 'kick someone'),
|
kick = wrap(kick, ['op', ('haveOp', 'kick someone'),
|
||||||
'nickInChannel', additional('text')])
|
commalist('nickInChannel'), additional('text')])
|
||||||
|
|
||||||
def kban(self, irc, msg, args,
|
def kban(self, irc, msg, args,
|
||||||
channel, optlist, bannedNick, expiry, reason):
|
channel, optlist, bannedNick, expiry, reason):
|
||||||
|
Loading…
Reference in New Issue
Block a user