From 36fe1fa0d590ddd024e344585711934e4c389c50 Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 13 Sep 2018 10:25:33 +0100 Subject: Specific "n%" for WHOX as to only return nicks. --- IRCLineHandler.py | 2 +- IRCServer.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/IRCLineHandler.py b/IRCLineHandler.py index 944d19b1..d452264d 100644 --- a/IRCLineHandler.py +++ b/IRCLineHandler.py @@ -214,7 +214,7 @@ class LineHandler(object): # on-join user list has finished def handle_366(self, event): - event["server"].send_whox(event["args"][1], "ahnrtu", "111") + event["server"].send_whox(event["args"][1], "n", "ahnrtu", "111") # on user joining channel def join(self, event): diff --git a/IRCServer.py b/IRCServer.py index 906ba572..77c4e7fb 100644 --- a/IRCServer.py +++ b/IRCServer.py @@ -389,7 +389,6 @@ class Server(object): "" if server == None else " :%s" % server)) def send_who(self, filter=None): self.send("WHO%s" % ("" if filter == None else " %s" % filter)) - def send_whox(self, filter, flags, label=None): - self.send("WHO %s %s%s" % (filter, - "%"+flags if flags else "", + def send_whox(self, mask, filter, fields, label=None): + self.send("WHO %s %s%%%%s%s" % (mask, filter, fields, ","+label if label else "")) -- cgit v1.3.1-10-gc9f91