GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-26 20:24:34 +01:00
Code Issues Projects Releases Wiki Activity

automode: simplify join routines to use ServiceBot.join() (#326)

Browse Source
This commit is contained in:
James Lu 2016-09-23 23:42:41 -07:00
parent a040c3c7d2
commit d59732f6dd
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/automode.py
View File

@ -78,18 +78,8 @@ def main(irc=None):
netname, channel = entry.split('#', 1) netname, channel = entry.split('#', 1)
channel = '#' + channel channel = '#' + channel
log.debug('automode: auto-joining %s on %s', channel, netname) log.debug('automode: auto-joining %s on %s', channel, netname)
modebot.extra_channels[netname].add(channel) if netname in world.networkobjects:
modebot.join(world.networkobjects[netname], channel)
# This explicitly forces a join to connected networks (on plugin load, etc.).
mb_uid = modebot.uids.get(netname)
if netname in world.networkobjects and mb_uid in world.networkobjects[netname].users:
remoteirc = world.networkobjects[netname]
remoteirc.proto.join(mb_uid, channel)
# Call a join hook manually so other plugins like relay can understand it.
remoteirc.callHooks([mb_uid, 'PYLINK_AUTOMODE_JOIN', {'channel': channel, 'users': [mb_uid],
'modes': remoteirc.channels[channel].modes,
'parse_as': 'JOIN'}])
def die(sourceirc): def die(sourceirc):
"""Saves the Automode database and quit.""" """Saves the Automode database and quit."""
@ -233,10 +223,7 @@ def setacc(irc, source, args):
reply(irc, "Done. \x02%s\x02 now has modes \x02%s\x02 in \x02%s\x02." % (mask, modes, channel)) reply(irc, "Done. \x02%s\x02 now has modes \x02%s\x02 in \x02%s\x02." % (mask, modes, channel))
# Join the Automode bot to the channel if not explicitly told to. # Join the Automode bot to the channel if not explicitly told to.
modebot.extra_channels[irc.name].add(channel) modebot.join(irc, channel)
mbuid = modebot.uids.get(irc.name)
if mbuid and mbuid not in irc.channels[channel].users:
irc.proto.join(mbuid, channel)
modebot.add_cmd(setacc, 'setaccess') modebot.add_cmd(setacc, 'setaccess')
modebot.add_cmd(setacc, 'set') modebot.add_cmd(setacc, 'set')