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: capitalize constants related to modes

Browse Source
This commit is contained in:
James Lu 2017-12-18 13:23:16 -08:00
parent 0104462782
commit 954f4f9886
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/relay.py
View File

@ -616,7 +616,7 @@ def get_supported_umodes(irc, remoteirc, modes):
# in the supported modes list for the TARGET network, and set that # in the supported modes list for the TARGET network, and set that
# mode character as the one we're setting, if it exists. # mode character as the one we're setting, if it exists.
if modechar == m: if modechar == m:
if name not in whitelisted_umodes: if name not in WHITELISTED_UMODES:
log.debug("(%s) relay.get_supported_umodes: skipping mode (%r, %r) because " log.debug("(%s) relay.get_supported_umodes: skipping mode (%r, %r) because "
"it isn't a whitelisted (safe) mode for relay.", "it isn't a whitelisted (safe) mode for relay.",
irc.name, modechar, arg) irc.name, modechar, arg)
@ -811,7 +811,7 @@ def relay_part(irc, *args, **kwargs):
iterate_all(irc, _relay_part_loop, extra_args=args, kwargs=kwargs) iterate_all(irc, _relay_part_loop, extra_args=args, kwargs=kwargs)
whitelisted_cmodes = { WHITELISTED_CMODES = {
'admin', 'admin',
'adminonly', 'adminonly',
'allowinvite', 'allowinvite',
@ -863,7 +863,7 @@ whitelisted_cmodes = {
'topiclock', 'topiclock',
'voice' 'voice'
} }
whitelisted_umodes = { WHITELISTED_UMODES = {
'bot', 'bot',
'hidechans', 'hidechans',
'hideidle', 'hideidle',
@ -875,8 +875,8 @@ whitelisted_umodes = {
'stripcolor', 'stripcolor',
'wallops' 'wallops'
} }
clientbot_whitelisted_cmodes = {'admin', 'ban', 'banexception', 'halfop', 'invex', 'op', 'owner', 'voice'} CLIENTBOT_WHITELISTED_UMODES = {'admin', 'ban', 'banexception', 'halfop', 'invex', 'op', 'owner', 'voice'}
modesync_options = ('none', 'half', 'full') CLIENTBOT_MODESYNC_OPTIONS = ('none', 'half', 'full')
def get_supported_cmodes(irc, remoteirc, channel, modes): def get_supported_cmodes(irc, remoteirc, channel, modes):
""" """
Filters a channel mode change to the modes supported by the target IRCd. Filters a channel mode change to the modes supported by the target IRCd.
@ -886,18 +886,18 @@ def get_supported_cmodes(irc, remoteirc, channel, modes):
return [] return []
# Handle Clientbot-specific mode whitelist settings # Handle Clientbot-specific mode whitelist settings
whitelist = whitelisted_cmodes whitelist = WHITELISTED_CMODES
if remoteirc.protoname == 'clientbot' or irc.protoname == 'clientbot': if remoteirc.protoname == 'clientbot' or irc.protoname == 'clientbot':
modesync = conf.conf.get('relay', {}).get('clientbot_modesync', 'none').lower() modesync = conf.conf.get('relay', {}).get('clientbot_modesync', 'none').lower()
if modesync not in modesync_options: if modesync not in CLIENTBOT_MODESYNC_OPTIONS:
modesync = 'none' modesync = 'none'
log.warning('relay: Bad clientbot_modesync option %s: valid values are %s', log.warning('relay: Bad clientbot_modesync option %s: valid values are %s',
modesync, modesync_options) modesync, CLIENTBOT_MODESYNC_OPTIONS)
if modesync == 'none': if modesync == 'none':
return [] # Do nothing return [] # Do nothing
elif modesync == 'half': elif modesync == 'half':
whitelist = clientbot_whitelisted_cmodes whitelist = CLIENTBOT_WHITELISTED_UMODES
supported_modes = [] supported_modes = []
for modepair in modes: for modepair in modes:
@ -2545,7 +2545,7 @@ def modedelta(irc, source, args):
# Sanity check: you shouldn't be allowed to lock things like op or redirects # Sanity check: you shouldn't be allowed to lock things like op or redirects
# because one misconfiguration can cause serious desyncs. # because one misconfiguration can cause serious desyncs.
if m[0] not in whitelisted_cmodes: if m[0] not in WHITELISTED_CMODES:
irc.error('Setting mode %r is not supported for modedelta (case sensitive).' % m[0]) irc.error('Setting mode %r is not supported for modedelta (case sensitive).' % m[0])
return return