GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-28 05:29:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'server-service-channels' of https://github.com/IotaSpencer/PyLink into devel

Browse Source 
Closes #423.
This commit is contained in:
James Lu 2017-02-26 18:12:34 -08:00
commit 21c0c617c1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coremods/service_support.py
View File

@ -62,9 +62,8 @@ def spawn_service(irc, source, command, args):
log.debug('(%s) irc.pseudoclient set to UID %s', irc.name, u) log.debug('(%s) irc.pseudoclient set to UID %s', irc.name, u)
irc.pseudoclient = userobj irc.pseudoclient = userobj
# TODO: channels should be tracked in a central database, not hardcoded channels = set(irc.serverdata.get(name+'_channels', [])) | set(irc.serverdata.get('channels', [])) | \
# in conf. sbot.extra_channels.get(irc.name, set())
channels = set(irc.serverdata.get('channels', [])) | sbot.extra_channels.get(irc.name, set())
sbot.join(irc, channels) sbot.join(irc, channels)
utils.add_hook(spawn_service, 'PYLINK_NEW_SERVICE') utils.add_hook(spawn_service, 'PYLINK_NEW_SERVICE')