mirror of https://github.com/Mikaela/Limnoria.git
Merge remote-tracking branch 'progval/testing' into testing
This commit is contained in:
commit
618200ca50
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
|
import copy
|
||||||
|
|
||||||
import config
|
import config
|
||||||
|
|
||||||
|
@ -78,7 +79,7 @@ class Services(callbacks.Plugin):
|
||||||
if self.registryValue('noJoinsUntilIdentified'):
|
if self.registryValue('noJoinsUntilIdentified'):
|
||||||
self.log.info('Holding JOIN to %s until identified.',
|
self.log.info('Holding JOIN to %s until identified.',
|
||||||
msg.args[0])
|
msg.args[0])
|
||||||
self.waitingJoins.append(msg)
|
self.waitingJoins.append((irc.network, msg,))
|
||||||
return None
|
return None
|
||||||
return msg
|
return msg
|
||||||
|
|
||||||
|
@ -316,9 +317,14 @@ class Services(callbacks.Plugin):
|
||||||
for channel in self.channels:
|
for channel in self.channels:
|
||||||
irc.queueMsg(networkGroup.channels.join(channel))
|
irc.queueMsg(networkGroup.channels.join(channel))
|
||||||
if self.waitingJoins:
|
if self.waitingJoins:
|
||||||
for m in self.waitingJoins:
|
tmp_wj = copy.deepcopy(self.waitingJoins) # can't iterate over list if we're modifying it
|
||||||
irc.sendMsg(m)
|
for netname, m in tmp_wj:
|
||||||
self.waitingJoins = []
|
if netname == irc.network:
|
||||||
|
irc.sendMsg(m)
|
||||||
|
try:
|
||||||
|
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]
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
"""stick the various versioning attributes in here, so we only have to change
|
"""stick the various versioning attributes in here, so we only have to change
|
||||||
them once."""
|
them once."""
|
||||||
version = '0.83.4.1+limnoria (2011-08-10T11:48:07+0200)'
|
version = '0.83.4.1+limnoria (2011-08-10T12:00:42+0200)'
|
||||||
|
|
Loading…
Reference in New Issue