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

coremods, plugins, protocols: drop now redundant allowAuthed=False in is_oper() calls

Browse Source
This commit is contained in:
James Lu 2018-06-11 23:56:44 -07:00
parent 2ca9de2ea8
commit 1b68bfadc6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coremods/exttargets.py
View File

@ -74,7 +74,7 @@ def ircop(irc, host, uid):
if len(groups) == 1: if len(groups) == 1:
# 1st scenario. # 1st scenario.
return irc.is_oper(uid, allowAuthed=False) return irc.is_oper(uid)
else: else:
# 2nd scenario. Use match_host (ircmatch) to match the opertype glob to the opertype. # 2nd scenario. Use match_host (ircmatch) to match the opertype glob to the opertype.
return irc.match_host(groups[1], irc.users[uid].opertype) return irc.match_host(groups[1], irc.users[uid].opertype)

2
coremods/login.py
View File

@ -78,7 +78,7 @@ def _irc_try_login(irc, source, username, skip_checks=False):
irc.name, username, irc.get_hostmask(source), ', '.join(network_filter), irc.name) irc.name, username, irc.get_hostmask(source), ', '.join(network_filter), irc.name)
raise utils.NotAuthorizedError("Account is not authorized to login on this network.") raise utils.NotAuthorizedError("Account is not authorized to login on this network.")
elif require_oper and not irc.is_oper(source, allowAuthed=False): elif require_oper and not irc.is_oper(source):
log.warning("(%s) Failed login to %r from %s (needs oper)", irc.name, username, irc.get_hostmask(source)) log.warning("(%s) Failed login to %r from %s (needs oper)", irc.name, username, irc.get_hostmask(source))
raise utils.NotAuthorizedError("You must be opered.") raise utils.NotAuthorizedError("You must be opered.")

2
plugins/antispam.py
View File

@ -19,7 +19,7 @@ def _punish(irc, target, channel, punishment, reason):
if target not in irc.users: if target not in irc.users:
log.warning("(%s) antispam: got target %r that isn't a user?", irc.name, target) log.warning("(%s) antispam: got target %r that isn't a user?", irc.name, target)
return False return False
elif irc.is_oper(target, allowAuthed=False): elif irc.is_oper(target):
log.debug("(%s) antispam: refusing to punish oper %s/%s", irc.name, target, irc.get_friendly_name(target)) log.debug("(%s) antispam: refusing to punish oper %s/%s", irc.name, target, irc.get_friendly_name(target))
return False return False

2
plugins/relay.py
View File

@ -1202,7 +1202,7 @@ def handle_relay_whois(irc, source, command, args):
setting = conf.conf.get('relay', {}).get(infoline, '').lower() setting = conf.conf.get('relay', {}).get(infoline, '').lower()
if setting == 'all': if setting == 'all':
return True return True
elif setting == 'opers' and irc.is_oper(source, allowAuthed=False): elif setting == 'opers' and irc.is_oper(source):
return True return True
return False return False

4
protocols/clientbot.py
View File

@ -800,12 +800,12 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
if self.serverdata.get('track_oper_statuses'): if self.serverdata.get('track_oper_statuses'):
if '*' in status: # Track IRCop status if '*' in status: # Track IRCop status
if not self.is_oper(uid, allowAuthed=False): if not self.is_oper(uid):
# Don't send duplicate oper ups if the target is already oper. # Don't send duplicate oper ups if the target is already oper.
self.apply_modes(uid, [('+o', None)]) self.apply_modes(uid, [('+o', None)])
self.call_hooks([uid, 'MODE', {'target': uid, 'modes': {('+o', None)}}]) self.call_hooks([uid, 'MODE', {'target': uid, 'modes': {('+o', None)}}])
self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'IRC Operator'}]) self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'IRC Operator'}])
elif self.is_oper(uid, allowAuthed=False) and not self.is_internal_client(uid): elif self.is_oper(uid) and not self.is_internal_client(uid):
# Track deopers # Track deopers
self.apply_modes(uid, [('-o', None)]) self.apply_modes(uid, [('-o', None)])
self.call_hooks([uid, 'MODE', {'target': uid, 'modes': {('-o', None)}}]) self.call_hooks([uid, 'MODE', {'target': uid, 'modes': {('-o', None)}}])