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

relay: rename 'link --force' to 'link --force-ts' to better reflect its purpose

Browse Source 
Also mention explicitly that this option does not bypass LINKACL and other channel restrictions (e.g. the Clientbot one)
This commit is contained in:
James Lu 2018-06-07 13:44:45 -07:00
parent d4bf407c5d
commit 06d57a5b28
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/relay.py
View File

@ -2234,15 +2234,16 @@ link_parser = utils.IRCParser()
link_parser.add_argument('remotenet') link_parser.add_argument('remotenet')
link_parser.add_argument('channel') link_parser.add_argument('channel')
link_parser.add_argument('localchannel', nargs='?') link_parser.add_argument('localchannel', nargs='?')
link_parser.add_argument("-f", "--force", action='store_true') link_parser.add_argument("-f", "--force-ts", action='store_true')
def link(irc, source, args): def link(irc, source, args):
"""<remotenet> <channel> [<local channel>] [-f/--force] """<remotenet> <channel> [<local channel>] [-f/--force-ts]
Links the specified channel on \x02remotenet\x02 over PyLink Relay as \x02local channel\x02. Links the specified channel on \x02remotenet\x02 over PyLink Relay as \x02local channel\x02.
If \x02local channel\x02 is not specified, it defaults to the same name as \x02channel\x02. If \x02local channel\x02 is not specified, it defaults to the same name as \x02channel\x02.
If the --force option is given, this command will bypass checks for TS and whether the target If the --force-ts option is given, this command will bypass checks for TS and whether the target
network is alive, and link the channel anyways.""" network is alive, and link the channel anyways. It will not bypass other link restrictions like
those imposed by LINKACL."""
args = link_parser.parse_args(args) args = link_parser.parse_args(args)
@ -2312,7 +2313,7 @@ def link(irc, source, args):
"as %r." % (remotenet, args.channel, link[1])) "as %r." % (remotenet, args.channel, link[1]))
return return
if args.force: if args.force_ts:
permissions.check_permissions(irc, source, ['relay.link.force']) permissions.check_permissions(irc, source, ['relay.link.force'])
log.info("(%s) relay: Forcing link %s%s -> %s%s", irc.name, irc.name, localchan, remotenet, log.info("(%s) relay: Forcing link %s%s -> %s%s", irc.name, irc.name, localchan, remotenet,
args.channel) args.channel)