Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix previous commit.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-03-27 17:01:42 +01:00
parent 23e84cfff9
commit 8e1929d1b4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf.py
View File

@ -289,8 +289,7 @@ class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf):
channels_with_key.append(channel) channels_with_key.append(channel)
else: else:
channels.append(channel) channels.append(channel)
return ircmsgs.join(','.join(channels_with_key + channels), return ircmsgs.joins(channels_with_key + channels, keys)
','.join(keys))
def registerNetwork(name, password='', ssl=False, sasl_username='', def registerNetwork(name, password='', ssl=False, sasl_username='',
sasl_password=''): sasl_password=''):

2
src/ircmsgs.py
View File

@ -615,7 +615,7 @@ def notice(recipient, s, prefix='', msg=None):
def join(channel, key=None, prefix='', msg=None): def join(channel, key=None, prefix='', msg=None):
"""Returns a JOIN to a channel""" """Returns a JOIN to a channel"""
if conf.supybot.protocols.irc.strictRfc(): if conf.supybot.protocols.irc.strictRfc():
assert areChannels(channel), repr(channel) assert isChannels(channel), repr(channel)
if msg and not prefix: if msg and not prefix:
prefix = msg.prefix prefix = msg.prefix
if key is None: if key is None: