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

protocols: add _check_oper_status_change abstraction

Browse Source 
This condenses a large chunk of the code checking for oper ups, and adds support for the servprotect/admin umodes in an IRCd-independent manner. Closes #451.
This commit is contained in:
James Lu 2017-07-07 20:02:37 -07:00
parent 3bcf0092e9
commit 3a42c8e835
6 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/hybrid.py
View File

@ -185,8 +185,7 @@ class HybridProtocol(TS6Protocol):
self.servers[numeric].users.add(uid)
# Call the OPERED UP hook if +o is being added to the mode list.
if ('+o', None) in parsedmodes:
self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'IRC_Operator'}])
self._check_oper_status_change(uid, parsedmodes)
# Set the account name if present
if account:

5
protocols/inspircd.py
View File

@ -562,10 +562,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
parsedmodes = self.parse_modes(uid, [args[8], args[9]])
self.apply_modes(uid, parsedmodes)
if (self.umodes.get('servprotect'), None) in userobj.modes:
# Services are usually given a "Network Service" WHOIS, so
# set that as the opertype.
self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'Network Service'}])
self._check_oper_status_change(uid, parsedmodes)
self.servers[numeric].users.add(uid)
return {'uid': uid, 'ts': ts, 'nick': nick, 'realhost': realhost, 'host': host, 'ident': ident, 'ip': ip}

19
protocols/ircs2s_common.py
View File

@ -571,6 +571,19 @@ class IRCS2SProtocol(IRCCommonProtocol):
# This sets a dummy away reason of "Away" because no actual text is provided.
self.call_hooks([uid, 'AWAY', {'text': 'Away' if away_status else ''}])
def _check_oper_status_change(self, uid, modes):
if uid in self.users:
u = self.users[uid]
if 'admin' in self.umodes and (self.umodes['admin'], None) in u.modes:
opertype = 'Server Administrator'
elif 'servprotect' in self.umodes and (self.umodes['servprotect'], None) in u.modes:
opertype = 'Network Service'
else:
opertype = 'IRC Operator'
if ('+o', None) in modes:
self.call_hooks([uid, 'CLIENT_OPERED', {'text': opertype}])
def handle_mode(self, source, command, args):
"""Handles mode changes."""
# InspIRCd:
@ -591,15 +604,11 @@ class IRCS2SProtocol(IRCCommonProtocol):
changedmodes = self.parse_modes(target, modestrings)
self.apply_modes(target, changedmodes)
# Call the CLIENT_OPERED hook if +o is being set.
# TODO: handle umodes for admin, servprotect, etc. and set the oper type accordingly.
if ('+o', None) in changedmodes and target in self.users:
self.call_hooks([target, 'CLIENT_OPERED', {'text': 'IRC Operator'}])
if target in self.users:
# Target was a user. Check for any cloak and away status changes.
self._check_cloak_change(target)
self._check_umode_away_change(target)
self._check_oper_status_change(target, changedmodes)
return {'target': target, 'modes': changedmodes, 'channeldata': channeldata}

3
protocols/p10.py
View File

@ -858,8 +858,7 @@ class P10Protocol(IRCS2SProtocol):
self.call_hooks([uid, 'CLIENT_SERVICES_LOGIN', {'text': accountname}])
# Call the OPERED UP hook if +o is being added to the mode list.
if ('+o', None) in parsedmodes:
self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'IRC Operator'}])
self._check_oper_status_change(uid, parsedmodes)
self._check_cloak_change(uid)

4
protocols/ts6.py
View File

@ -509,9 +509,7 @@ class TS6Protocol(TS6BaseProtocol):
self.servers[numeric].users.add(uid)
# Call the OPERED UP hook if +o is being added to the mode list.
if ('+o', None) in parsedmodes:
otype = 'Server Administrator' if ('+a', None) in parsedmodes else 'IRC Operator'
self.call_hooks([uid, 'CLIENT_OPERED', {'text': otype}])
self._check_oper_status_change(uid, parsedmodes)
# Set the accountname if present
if accountname != "*":

9
protocols/unreal.py
View File

@ -404,9 +404,7 @@ class UnrealProtocol(TS6BaseProtocol):
# enabled) but NOT +t (vHost set).
self.users[uid].cloaked_host = args[9]
if ('+o', None) in parsedmodes:
# If +o being set, call the CLIENT_OPERED internal hook.
self.call_hooks([uid, 'CLIENT_OPERED', {'text': 'IRC Operator'}])
self._check_oper_status_change(uid, parsedmodes)
if ('+x', None) not in parsedmodes:
# If +x is not set, update to use the person's real host.
@ -826,10 +824,7 @@ class UnrealProtocol(TS6BaseProtocol):
parsedmodes = self.parse_modes(numeric, args)
self.apply_modes(numeric, parsedmodes)
if ('+o', None) in parsedmodes:
# If +o being set, call the CLIENT_OPERED internal hook.
self.call_hooks([numeric, 'CLIENT_OPERED', {'text': 'IRC Operator'}])
self._check_oper_status_change(numeric, parsedmodes)
self._check_cloak_change(numeric, parsedmodes)
return {'target': numeric, 'modes': parsedmodes}