Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 11:42:52 +01:00
Code Issues Projects Releases Wiki Activity

Services: fix problem with some channels being mixed up between networks on startup, when noJoinsUntilIdentified is true.

Browse Source 
When noJoinsUntilIdentified config is true, the bot holds join messages in a 'waitingJoins' list, and processes them
once nickserv identification comes through. The problem was that when the bot is configured to join multiple networks,
join messages from different networks would get appended to the same list, without any differentiation by which message
belongs to which network. Thus, if there are messages waiting for multiple networks, it would often be the case that
whichever network got identification done first, would 'pick up' other network's join messages.

This fix stores the network name along with the join messages in the list, and has each network pick out only its own
join messages.

Conflicts:

	src/version.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Services/plugin.py
This commit is contained in:
Daniel Folkinshteyn 2011-03-13 14:21:46 -04:00 committed by Valentin Lorentz
parent 7e05510faa
commit 8c3304c520
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Services/plugin.py
View File

@ -325,10 +325,7 @@ class Services(callbacks.Plugin):
for netname, m in tmp_wj: for netname, m in tmp_wj:
if netname == irc.network: if netname == irc.network:
irc.sendMsg(m) irc.sendMsg(m)
try:
self.waitingJoins.remove((netname, m,)) self.waitingJoins.remove((netname, m,))
except ValueError:
pass # weird stuff happen sometimes
elif 'not yet authenticated' in s: elif 'not yet authenticated' in s:
# zirc.org has this, it requires an auth code. # zirc.org has this, it requires an auth code.
email = s.split()[-1] email = s.split()[-1]