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

Merge branch 'conf-host' of https://github.com/cooper/PyLink into devel

Browse Source
This commit is contained in:
James Lu 2017-07-14 05:38:45 -07:00
commit a164924ce5
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coremods/service_support.py
View File

@ -28,11 +28,15 @@ def spawn_service(irc, source, command, args):
# 3) The preferred nick/ident combination defined by the plugin (sbot.nick / sbot.ident)
# 4) The literal service name.
# settings, and then falling back to the literal service 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
sbconf = conf.conf.get(name, {})
nick = irc.serverdata.get("%s_nick" % name) or sbconf.get('nick') or sbot.nick or name
ident = irc.serverdata.get("%s_ident" % name) or sbconf.get('ident') or sbot.ident or name
# TODO: make this configurable?
host = irc.hostname()
# Determine host the same way as above, except fall back to server hostname.
host = irc.serverdata.get("%s_host" % name) or sbconf.get('host') or irc.hostname()
# Determine realname the same way as above, except fall back to pylink:realname.
realname = irc.serverdata.get("%s_realname" % name) or sbconf.get('realname') or conf.conf['bot']['realname']
# Spawning service clients with these umodes where supported. servprotect usage is a
# configuration option.
@ -56,7 +60,7 @@ def spawn_service(irc, source, command, args):
else:
log.debug('(%s) spawn_service: Spawning new client %s', irc.name, nick)
userobj = irc.spawn_client(nick, ident, host, modes=modes, opertype="PyLink Service",
manipulatable=sbot.manipulatable)
realname=realname, manipulatable=sbot.manipulatable)
# Store the service name in the User object for easier access.
userobj.service = name

13
example-conf.yml
View File

@ -273,12 +273,16 @@ servers:
protocol: "unreal"
autoconnect: 5
# You can also define network-specific nicks and idents for various service
# bots, using the configuration options "servicename_nick" and "servicename_ident".
# You can also define network-specific nicks, idents, and hosts for various service
# bots, using the configuration options "servicename_nick", etc.
#pylink_nick: MagicServ
#pylink_ident: magicserv
#pylink_host: magicserv.mynet.net
#pylink_realname: Magic Link Service
#games_nick: MagicGames
#games_ident: magicgames
#games_host: games.mynet.net
#games_realname: Magic Games Service
nefarious:
ip: somenet.ddns.local
@ -719,6 +723,11 @@ games:
# Sets the nick of the Games service, if you're using it. This defaults to "games" if not defined.
nick: Games
# Ident, host, and realname can also be specified here, but they may be overriden per-network.
#ident: games
#host: play.games
#realname: Games Service
# Defines a fantasy prefix for the Games bot.
prefix: "./"