more arguments added for WHOX, to avoid external plugins recall same requests

This commit is contained in:
Nicolas Coevoet 2018-01-16 16:21:41 +01:00 committed by Valentin Lorentz
parent d521a5cdc8
commit 2b030ac178
1 changed files with 4 additions and 4 deletions

View File

@ -515,10 +515,10 @@ class IrcState(IrcCommandDispatcher, log.Firewalled):
def do354(self, irc, msg): def do354(self, irc, msg):
# WHOX reply. # WHOX reply.
if len(msg.args) != 6 or msg.args[1] != '1': if len(msg.args) != 9 or msg.args[1] != '1':
return return
# irc.nick 1 user ip host nick status account gecos
(__, ___, user, host, nick, ___) = msg.args (n, t, user, ip, host, nick, status, account, gecos) = msg.args
hostmask = '%s!%s@%s' % (nick, user, host) hostmask = '%s!%s@%s' % (nick, user, host)
self.nicksToHostmasks[nick] = hostmask self.nicksToHostmasks[nick] = hostmask
@ -1443,7 +1443,7 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
def doJoin(self, msg): def doJoin(self, msg):
if msg.nick == self.nick: if msg.nick == self.nick:
channel = msg.args[0] channel = msg.args[0]
self.queueMsg(ircmsgs.who(channel, args=('%tuhna,1',))) # Ends with 315. self.queueMsg(ircmsgs.who(channel, args=('%tuhnairf,1',))) # Ends with 315.
self.queueMsg(ircmsgs.mode(channel)) # Ends with 329. self.queueMsg(ircmsgs.mode(channel)) # Ends with 329.
for channel in msg.args[0].split(','): for channel in msg.args[0].split(','):
self.queueMsg(ircmsgs.mode(channel, '+b')) self.queueMsg(ircmsgs.mode(channel, '+b'))