Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

only apply modes for !flags when the user doesn't have them already

Browse source
This commit is contained in:
jesopo 2019-09-12 22:40:23 +01:00
parent 1edb11ae1f
commit 7094d94cd7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/channel_op.py
View file

@ -299,23 +299,30 @@ class Module(ModuleManager.BaseModule):
def _check_flags(self, channel, user): def _check_flags(self, channel, user):
flags = channel.get_user_setting(user.get_id(), "flags", "") flags = channel.get_user_setting(user.get_id(), "flags", "")
if flags: if flags:
identified = not user.get_identified_account() == None
current_modes = channel.get_user_modes(user)
modes = [] modes = []
kick_reason = None kick_reason = None
identified = not user.get_identified_account() == None
for flag in list(flags): for flag in list(flags):
if flag == "O": if flag == "O" and identified:
modes.append(("o", user.nickname)) modes.append(("o", user.nickname))
elif flag == "V": elif flag == "V" and identified:
modes.append(("v", user.nickname)) modes.append(("v", user.nickname))
elif flag == "b": elif flag == "b":
modes.append(("b", self._get_hostmask(channel, user))) modes.append(("b", self._get_hostmask(channel, user)))
kick_reason = "User is banned from this channel" kick_reason = "User is banned from this channel"
new_modes = []
for mode, arg in modes:
if not mode in current_modes:
new_modes.append((mode, arg))
# break up in to chunks of (maximum) 3 # break up in to chunks of (maximum) 3
# https://tools.ietf.org/html/rfc2812.html#section-3.2.3 # https://tools.ietf.org/html/rfc2812.html#section-3.2.3
for chunk in self._chunk(modes, 3): for chunk in self._chunk(new_modes, 3):
chars, args = list(zip(*chunk)) chars, args = list(zip(*chunk))
channel.send_mode("+%s" % "".join(chars), list(args)) channel.send_mode("+%s" % "".join(chars), list(args))
if not kick_reason == None: if not kick_reason == None: