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

allow multipe require_accces (comma sep), support "low"/"high"/"admin"

Browse source
This commit is contained in:
jesopo 2020-02-06 23:50:19 +00:00
parent 822a44570c
commit fe1c9ef746
2 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/channel_op.py
View file

@ -62,7 +62,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.kick") @utils.hook("received.command.kick")
@utils.hook("received.command.k", alias_of="kick") @utils.hook("received.command.k", alias_of="kick")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "kick") @utils.kwarg("require_access", "high,kick")
@utils.kwarg("help", "Kick a user from a channel") @utils.kwarg("help", "Kick a user from a channel")
@utils.spec("!<#channel>r~channel !<nickname>cuser ?<reason>string") @utils.spec("!<#channel>r~channel !<nickname>cuser ?<reason>string")
def kick(self, event): def kick(self, event):
@ -105,7 +105,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.ban") @utils.hook("received.command.ban")
@utils.hook("received.command.b", alias_of="ban") @utils.hook("received.command.b", alias_of="ban")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "ban") @utils.kwarg("require_access", "high,ban")
@utils.spec("!<#channel>r~channel ?duration !<nickname>user|<mask>word") @utils.spec("!<#channel>r~channel ?duration !<nickname>user|<mask>word")
def ban(self, event): def ban(self, event):
self._ban(event["server"], event["spec"][0], event["spec"][2], True, self._ban(event["server"], event["spec"][0], event["spec"][2], True,
@ -113,7 +113,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.unban") @utils.hook("received.command.unban")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "ban") @utils.kwarg("require_access", "high,ban")
@utils.spec("!<#channel>r~channel !<nickname>user|<mask>word") @utils.spec("!<#channel>r~channel !<nickname>user|<mask>word")
def unban(self, event): def unban(self, event):
self._ban(event["server"], event["spec"][0], event["spec"][1], self._ban(event["server"], event["spec"][0], event["spec"][1],
@ -122,7 +122,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.kickban") @utils.hook("received.command.kickban")
@utils.hook("received.command.kb", alias_of="kickban") @utils.hook("received.command.kb", alias_of="kickban")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "kickban") @utils.kwarg("require_access", "high,kickban")
@utils.spec( @utils.spec(
"!<#channel>r~channel ?duration !<nickname>cuser| ?<reason>string") "!<#channel>r~channel ?duration !<nickname>cuser| ?<reason>string")
def kickban(self, event): def kickban(self, event):
@ -134,7 +134,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.op") @utils.hook("received.command.op")
@utils.hook("received.command.up", alias_of="op") @utils.hook("received.command.up", alias_of="op")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "op") @utils.kwarg("require_access", "high,op")
@utils.spec("!<#channel>r~channel !<nickname>ruser") @utils.spec("!<#channel>r~channel !<nickname>ruser")
def op(self, event): def op(self, event):
self._op(True, event["spec"]) self._op(True, event["spec"])
@ -142,7 +142,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.deop") @utils.hook("received.command.deop")
@utils.hook("received.command.down", alias_of="deop") @utils.hook("received.command.down", alias_of="deop")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "op") @utils.kwarg("require_access", "high,op")
@utils.spec("!<#channel>r~channel !<nickname>ruser") @utils.spec("!<#channel>r~channel !<nickname>ruser")
def deop(self, event): def deop(self, event):
self._op(False, event["spec"]) self._op(False, event["spec"])
@ -153,7 +153,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.voice") @utils.hook("received.command.voice")
@utils.hook("received.command.devoice") @utils.hook("received.command.devoice")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "voice") @utils.kwarg("require_access", "low,voice")
@utils.spec("!<#channel>r~channel !<nickname>ruser") @utils.spec("!<#channel>r~channel !<nickname>ruser")
def voice(self, event): def voice(self, event):
add = event["command"] == "voice" add = event["command"] == "voice"
@ -162,7 +162,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.topic") @utils.hook("received.command.topic")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "topic") @utils.kwarg("require_access", "low,topic")
@utils.kwarg("remove_empty", False) @utils.kwarg("remove_empty", False)
@utils.spec("!<#channel>r~channel !<topic>string") @utils.spec("!<#channel>r~channel !<topic>string")
def topic(self, event): def topic(self, event):
@ -170,7 +170,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.tappend") @utils.hook("received.command.tappend")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "topic") @utils.kwarg("require_access", "low,topic")
@utils.kwarg("remove_empty", False) @utils.kwarg("remove_empty", False)
@utils.spec("!<#channel>r~channel !<topic>string") @utils.spec("!<#channel>r~channel !<topic>string")
def tappend(self, event): def tappend(self, event):
@ -192,7 +192,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.quiet") @utils.hook("received.command.quiet")
@utils.hook("received.command.mute") @utils.hook("received.command.mute")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "quiet") @utils.kwarg("require_access", "high,quiet")
@utils.kwarg("help", "Quiet a given user") @utils.kwarg("help", "Quiet a given user")
@utils.spec("!<#channel>r~channel ?duration !<nickname>user|<mask>word") @utils.spec("!<#channel>r~channel ?duration !<nickname>user|<mask>word")
def quiet(self, event): def quiet(self, event):
@ -201,7 +201,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.unquiet") @utils.hook("received.command.unquiet")
@utils.hook("received.command.unmute") @utils.hook("received.command.unmute")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "unquiet") @utils.kwarg("require_access", "high,unquiet")
@utils.kwarg("help", "Unquiet a given user") @utils.kwarg("help", "Unquiet a given user")
@utils.spec("!<#channel>r~channel !<nickname>user|<mask>word") @utils.spec("!<#channel>r~channel !<nickname>user|<mask>word")
def unquiet(self, event): def unquiet(self, event):
@ -228,7 +228,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.invite") @utils.hook("received.command.invite")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "invite") @utils.kwarg("require_access", "low,invite")
@utils.kwarg("help", "Invite a given user") @utils.kwarg("help", "Invite a given user")
@utils.spec("!<#channel>r~channel !<nickname>word") @utils.spec("!<#channel>r~channel !<nickname>word")
def invite(self, event): def invite(self, event):
@ -253,7 +253,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.flags") @utils.hook("received.command.flags")
@utils.kwarg("help", "Configure access flags for a given user") @utils.kwarg("help", "Configure access flags for a given user")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "flags") @utils.kwarg("require_access", "admin,flags")
@utils.spec("!<#channel>r~channel !<nickname>ouser ?<flags>word") @utils.spec("!<#channel>r~channel !<nickname>ouser ?<flags>word")
def flags(self, event): def flags(self, event):
target = event["spec"][1] target = event["spec"][1]
@ -342,7 +342,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.cmute") @utils.hook("received.command.cmute")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "cmute") @utils.kwarg("require_access", "high,cmute")
@utils.kwarg("help", "Mute the current channel") @utils.kwarg("help", "Mute the current channel")
@utils.spec("!<#channel>r~channel ?duration") @utils.spec("!<#channel>r~channel ?duration")
def cmute(self, event): def cmute(self, event):
@ -354,7 +354,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.cunmute") @utils.hook("received.command.cunmute")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "cmute") @utils.kwarg("require_access", "high,cmute")
@utils.kwarg("help", "Mute the current channel") @utils.kwarg("help", "Mute the current channel")
@utils.spec("!<#channel>r~channel") @utils.spec("!<#channel>r~channel")
def cunmute(self, event): def cunmute(self, event):
@ -400,7 +400,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.clear") @utils.hook("received.command.clear")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "clear") @utils.kwarg("require_access", "admin,clear")
@utils.kwarg("help", "Clear a given channel list mode (e.g. +b)") @utils.kwarg("help", "Clear a given channel list mode (e.g. +b)")
@utils.spec("!<#channel>r~channel !<type>word|<mode>word ?<mask>word") @utils.spec("!<#channel>r~channel !<type>word|<mode>word ?<mask>word")
def clear(self, event): def clear(self, event):
@ -414,7 +414,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.lsearch") @utils.hook("received.command.lsearch")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "lsearch") @utils.kwarg("require_access", "high,lsearch")
@utils.kwarg("help", "Search a given channel list mode (e.g. +b)") @utils.kwarg("help", "Search a given channel list mode (e.g. +b)")
@utils.spec("!<#channel>r~channel !<type>word|<mode>word ?<mask>word") @utils.spec("!<#channel>r~channel !<type>word|<mode>word ?<mask>word")
def lsearch(self, event): def lsearch(self, event):

22
src/core_modules/channel_access.py
View file

@ -4,14 +4,28 @@
from src import ModuleManager, utils from src import ModuleManager, utils
SPECIAL = ["low", "high", "admin"]
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
_name = "ChanAccess" _name = "ChanAccess"
def _has_channel_access(self, target, user, require_access): def _has_channel_access(self, target, user, names):
access = target.get_user_setting(user.get_id(), "access", []) required_access = []
identified = self.exports.get_one("is-identified")(user) for name in names.split(","):
name = name.strip()
return (require_access in access or "*" in access) and identified if name in SPECIAL:
required_access.extend(SPECIAL[:SPECIAL.index(name)+1])
else:
required_access.append(name)
print(required_access)
user_access = target.get_user_setting(user.get_id(), "access", [])
identified = self.exports.get_one("is-identified")(user)
matched = list(set(required_access)&set(user_access))
return ("*" in required_access or matched) and identified
def _command_check(self, event, channel, require_access): def _command_check(self, event, channel, require_access):
if channel: if channel: