Commented out isOn() and reverted chumroll change.
It causes the client to fail to send out GETMOOD at launch.
This commit is contained in:
parent
ca5631b048
commit
2f4759b0e4
1 changed files with 33 additions and 27 deletions
60
irc.py
60
irc.py
|
@ -501,16 +501,16 @@ class PesterHandler(DefaultCommandHandler):
|
||||||
if channel not in self.channelnames:
|
if channel not in self.channelnames:
|
||||||
self.channelnames[channel] = []
|
self.channelnames[channel] = []
|
||||||
self.channelnames[channel].extend(namelist)
|
self.channelnames[channel].extend(namelist)
|
||||||
def ison(self, server, nick, nicks):
|
#def ison(self, server, nick, nicks):
|
||||||
nicklist = nicks.split(" ")
|
# nicklist = nicks.split(" ")
|
||||||
getglub = "GETMOOD "
|
# getglub = "GETMOOD "
|
||||||
logging.info("---> recv \"ISON :%s\"" % nicks)
|
# logging.info("---> recv \"ISON :%s\"" % nicks)
|
||||||
for nick_it in nicklist:
|
# for nick_it in nicklist:
|
||||||
self.parent.moodUpdated.emit(nick_it, Mood(0))
|
# self.parent.moodUpdated.emit(nick_it, Mood(0))
|
||||||
if nick_it in self.parent.mainwindow.namesdb["#pesterchum"]:
|
# if nick_it in self.parent.mainwindow.namesdb["#pesterchum"]:
|
||||||
getglub += nick_it
|
# getglub += nick_it
|
||||||
if getglub != "GETMOOD ":
|
# if getglub != "GETMOOD ":
|
||||||
helpers.msg(self.client, "#pesterchum", getglub)
|
# helpers.msg(self.client, "#pesterchum", getglub)
|
||||||
|
|
||||||
def endofnames(self, server, nick, channel, msg):
|
def endofnames(self, server, nick, channel, msg):
|
||||||
namelist = self.channelnames[channel]
|
namelist = self.channelnames[channel]
|
||||||
|
@ -521,7 +521,13 @@ class PesterHandler(DefaultCommandHandler):
|
||||||
self.joined = True
|
self.joined = True
|
||||||
self.parent.mainwindow.randhandler.setRunning(self.parent.mainwindow.randhandler.randNick in namelist)
|
self.parent.mainwindow.randhandler.setRunning(self.parent.mainwindow.randhandler.randNick in namelist)
|
||||||
chums = self.mainwindow.chumList.chums
|
chums = self.mainwindow.chumList.chums
|
||||||
self.isOn(*chums)
|
#self.isOn(*chums)
|
||||||
|
lesschums = []
|
||||||
|
for c in chums:
|
||||||
|
chandle = c.handle
|
||||||
|
if chandle in namelist:
|
||||||
|
lesschums.append(c)
|
||||||
|
self.getMood(*lesschums)
|
||||||
|
|
||||||
def liststart(self, server, handle, *info):
|
def liststart(self, server, handle, *info):
|
||||||
self.channel_list = []
|
self.channel_list = []
|
||||||
|
@ -575,19 +581,19 @@ class PesterHandler(DefaultCommandHandler):
|
||||||
except socket.error:
|
except socket.error:
|
||||||
self.parent.setConnectionBroken()
|
self.parent.setConnectionBroken()
|
||||||
|
|
||||||
def isOn(self, *chums):
|
#def isOn(self, *chums):
|
||||||
isonNicks = ""
|
# isonNicks = ""
|
||||||
for c in chums:
|
# for c in chums:
|
||||||
chandle = c.handle
|
# chandle = c.handle
|
||||||
if len(chandle) >= 200:
|
# if len(chandle) >= 200:
|
||||||
try:
|
# try:
|
||||||
self.client.send("ISON", ":%s" % (isonNicks))
|
# self.client.send("ISON", ":%s" % (isonNicks))
|
||||||
except socket.error:
|
# except socket.error:
|
||||||
self.parent.setConnectionBroken()
|
# self.parent.setConnectionBroken()
|
||||||
isonNicks = ""
|
# isonNicks = ""
|
||||||
isonNicks += " " + chandle
|
# isonNicks += " " + chandle
|
||||||
if isonNicks != "":
|
# if isonNicks != "":
|
||||||
try:
|
# try:
|
||||||
self.client.send("ISON", ":%s" % (isonNicks))
|
# self.client.send("ISON", ":%s" % (isonNicks))
|
||||||
except socket.error:
|
# except socket.error:
|
||||||
self.parent.setConnectionBroken()
|
# self.parent.setConnectionBroken()
|
||||||
|
|
Loading…
Reference in a new issue