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

service_support: allow specifying modes to join with for each service (#326)

Browse Source 
This updates the example config to, by default, join Automode bots as op in channels.
This commit is contained in:
James Lu 2016-09-23 23:07:42 -07:00
parent 3900833458
commit 0cce6ca488
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
coremods/service_support.py
View File

@ -26,6 +26,10 @@ 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
# Specify modes to join the services bot with.
joinmodes = irc.serverdata.get("%s_joinmodes" % name) or conf.conf.get(name, {}).get('joinmodes') or ''
joinmodes = ''.join([m for m in joinmodes if m in irc.prefixmodes])
if name != 'pylink' and irc.protoname == 'clientbot': if name != 'pylink' and irc.protoname == 'clientbot':
# Prefix service bots spawned on Clientbot to prevent possible nick collisions. # Prefix service bots spawned on Clientbot to prevent possible nick collisions.
nick = 'PyLinkService@' + nick nick = 'PyLinkService@' + nick
@ -65,7 +69,12 @@ def spawn_service(irc, source, command, args):
for chan in channels: for chan in channels:
if utils.isChannel(chan): if utils.isChannel(chan):
irc.proto.join(u, chan) log.debug('(%s) Joining services %s to channel %s with modes %r', irc.name, name, chan, joinmodes)
if joinmodes: # Modes on join were specified; use SJOIN to burst our service
irc.proto.sjoin(irc.sid, chan, [(joinmodes, u)])
else:
irc.proto.join(u, chan)
irc.callHooks([irc.sid, 'PYLINK_SERVICE_JOIN', {'channel': chan, 'users': [u]}]) irc.callHooks([irc.sid, 'PYLINK_SERVICE_JOIN', {'channel': chan, 'users': [u]}])
else: else:
log.warning('(%s) Ignoring invalid autojoin channel %r.', irc.name, chan) log.warning('(%s) Ignoring invalid autojoin channel %r.', irc.name, chan)

5
example-conf.yml
View File

@ -488,3 +488,8 @@ games:
automode: automode:
# Sets the nick of the Automode service, if you're using it. This defaults to "automode" if not defined. # Sets the nick of the Automode service, if you're using it. This defaults to "automode" if not defined.
nick: Automode nick: Automode
# For each service, you can also specify what prefix modes you want the service bot to join channels with.
# Setting this to op (+o) for Automode makes it appear more like a standard IRC service, and lessens
# the risk of mode overrides being dropped.
joinmodes: 'o'