3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 20:22:45 +01:00

p10: use is_halfop_plus when checking whether we need to override

This commit is contained in:
James Lu 2017-07-11 02:27:44 -07:00
parent 508253af7e
commit fbaa12de71

View File

@ -352,9 +352,9 @@ class P10Protocol(IRCS2SProtocol):
reason = 'No reason given' reason = 'No reason given'
cobj = self.channels[channel] cobj = self.channels[channel]
# HACK: prevent kick bounces by sending our kick through the server if # Prevent kick bounces by sending our kick through the server if
# the sender isn't op. # the sender isn't op.
if numeric not in self.servers and (not cobj.isOp(numeric)) and (not cobj.isHalfop(numeric)): if numeric not in self.servers and (not cobj.is_halfop_plus(numeric)):
reason = '(%s) %s' % (self.get_friendly_name(numeric), reason) reason = '(%s) %s' % (self.get_friendly_name(numeric), reason)
numeric = self.get_server(numeric) numeric = self.get_server(numeric)
@ -407,9 +407,9 @@ class P10Protocol(IRCS2SProtocol):
cobj = self.channels[self.to_lower(target)] cobj = self.channels[self.to_lower(target)]
ts = ts or cobj.ts ts = ts or cobj.ts
# HACK: prevent mode bounces by sending our mode through the server if # Prevent mode bounces by sending our mode through the server if
# the sender isn't op. # the sender isn't op.
if numeric not in self.servers and (not cobj.isOp(numeric)) and (not cobj.isHalfop(numeric)): if (numeric not in self.servers) and (not cobj.is_halfop_plus(numeric)):
numeric = self.get_server(numeric) numeric = self.get_server(numeric)
# Wrap modes: start with max bufsize and subtract the lengths of the source, target, # Wrap modes: start with max bufsize and subtract the lengths of the source, target,