3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-30 14:49:28 +01:00

Merge branch 'master' into devel

This commit is contained in:
James Lu 2016-08-04 10:29:17 -07:00
commit e50684e367

View File

@ -58,8 +58,11 @@ def spawn_service(irc, source, command, args):
channels = set(irc.serverdata.get('channels', [])) | sbot.extra_channels.get(irc.name, set()) channels = set(irc.serverdata.get('channels', [])) | sbot.extra_channels.get(irc.name, set())
for chan in channels: for chan in channels:
irc.proto.join(u, chan) if utils.isChannel(chan):
irc.callHooks([irc.sid, 'PYLINK_SERVICE_JOIN', {'channel': chan, 'users': [u]}]) irc.proto.join(u, chan)
irc.callHooks([irc.sid, 'PYLINK_SERVICE_JOIN', {'channel': chan, 'users': [u]}])
else:
log.warning('(%s) Ignoring invalid autojoin channel %r.', irc.name, chan)
utils.add_hook(spawn_service, 'PYLINK_NEW_SERVICE') utils.add_hook(spawn_service, 'PYLINK_NEW_SERVICE')