mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-27 13:09:23 +01:00
core: Drop fake ServiceBot client stubs on Clientbot (#403)
This commit is contained in:
parent
f188b29911
commit
feb9cce4ee
@ -14,6 +14,11 @@ def spawn_service(irc, source, command, args):
|
|||||||
# Service name
|
# Service name
|
||||||
name = args['name']
|
name = args['name']
|
||||||
|
|
||||||
|
if name != 'pylink' and not irc.proto.hasCap('can-spawn-clients'):
|
||||||
|
log.debug("(%s) Not spawning service %s because the server doesn't support spawning clients",
|
||||||
|
irc.name, name)
|
||||||
|
return
|
||||||
|
|
||||||
# Get the ServiceBot object.
|
# Get the ServiceBot object.
|
||||||
sbot = world.services[name]
|
sbot = world.services[name]
|
||||||
|
|
||||||
@ -26,10 +31,6 @@ def spawn_service(irc, source, command, args):
|
|||||||
nick = irc.serverdata.get("%s_nick" % name) or conf.conf.get(name, {}).get('nick') or sbot.nick or name
|
nick = irc.serverdata.get("%s_nick" % name) or conf.conf.get(name, {}).get('nick') or sbot.nick or name
|
||||||
ident = irc.serverdata.get("%s_ident" % name) or conf.conf.get(name, {}).get('ident') or sbot.ident or name
|
ident = irc.serverdata.get("%s_ident" % name) or conf.conf.get(name, {}).get('ident') or sbot.ident or name
|
||||||
|
|
||||||
if name != 'pylink' and irc.protoname == 'clientbot':
|
|
||||||
# Prefix service bots spawned on Clientbot to prevent possible nick collisions.
|
|
||||||
nick = 'PyLinkService@' + nick
|
|
||||||
|
|
||||||
# TODO: make this configurable?
|
# TODO: make this configurable?
|
||||||
host = irc.hostname()
|
host = irc.hostname()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user