mirror of
				https://github.com/jlu5/PyLink.git
				synced 2025-11-04 00:47:21 +01:00 
			
		
		
		
	Merge branch 'server-service-channels' of https://github.com/IotaSpencer/PyLink into devel
Closes #423.
This commit is contained in:
		
						commit
						21c0c617c1
					
				@ -62,9 +62,8 @@ def spawn_service(irc, source, command, args):
 | 
			
		||||
        log.debug('(%s) irc.pseudoclient set to UID %s', irc.name, u)
 | 
			
		||||
        irc.pseudoclient = userobj
 | 
			
		||||
 | 
			
		||||
    # TODO: channels should be tracked in a central database, not hardcoded
 | 
			
		||||
    # in conf.
 | 
			
		||||
    channels = set(irc.serverdata.get('channels', [])) | sbot.extra_channels.get(irc.name, set())
 | 
			
		||||
    channels = set(irc.serverdata.get(name+'_channels', [])) | set(irc.serverdata.get('channels', [])) | \
 | 
			
		||||
               sbot.extra_channels.get(irc.name, set())
 | 
			
		||||
    sbot.join(irc, channels)
 | 
			
		||||
 | 
			
		||||
utils.add_hook(spawn_service, 'PYLINK_NEW_SERVICE')
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user