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

update other modules to use categorised require_access

Browse source
This commit is contained in:
jesopo 2020-02-07 00:11:28 +00:00
parent fe1c9ef746
commit d588760fc4
7 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/git_webhooks/__init__.py
View file

@ -200,7 +200,7 @@ class Module(ModuleManager.BaseModule):
""" """
:help: Add/remove/modify a git webhook :help: Add/remove/modify a git webhook
:require_mode: high :require_mode: high
:require_access: git-webhook :require_access: admin,git-webhook
:permission: gitoverride :permission: gitoverride
:usage: list :usage: list
:usage: add <hook> :usage: add <hook>

8
modules/vote.py
View file

@ -85,7 +85,7 @@ class Module(ModuleManager.BaseModule):
if event["target"].get_setting("votes-start-restricted", True): if event["target"].get_setting("votes-start-restricted", True):
event["check_assert"](utils.Check("channel-mode", "o")| event["check_assert"](utils.Check("channel-mode", "o")|
utils.Check("permission", "vote")| utils.Check("permission", "vote")|
utils.Check("channel-access", "vote")) utils.Check("channel-access", "low,vote"))
vote = self._start_vote(event["target"], event["args"]) vote = self._start_vote(event["target"], event["args"])
event["stdout"].write( event["stdout"].write(
@ -99,7 +99,7 @@ class Module(ModuleManager.BaseModule):
:help: End a vote :help: End a vote
:usage: <id> :usage: <id>
:require_mode: o :require_mode: o
:require_access: vote :require_access: high,vote
:permission: vote :permission: vote
""" """
vote_id = event["args_split"][0] vote_id = event["args_split"][0]
@ -117,10 +117,10 @@ class Module(ModuleManager.BaseModule):
:help: Cast choice for a given vote :help: Cast choice for a given vote
:usage: <id> [choice] :usage: <id> [choice]
""" """
if event["target"].get_setting("votes-scast-restricted", True): if event["target"].get_setting("votes-cast-restricted", True):
event["check_assert"](utils.Check("channel-mode", "v")| event["check_assert"](utils.Check("channel-mode", "v")|
utils.Check("permission", "vote")| utils.Check("permission", "vote")|
utils.Check("channel-access", "vote")) utils.Check("channel-access", "low,vote"))
vote_id = event["args_split"][0] vote_id = event["args_split"][0]
vote = self._get_vote(event["target"], vote_id) vote = self._get_vote(event["target"], vote_id)

2
src/core_modules/admin.py
View file

@ -43,7 +43,7 @@ class Module(ModuleManager.BaseModule):
elif event["is_channel"]: elif event["is_channel"]:
target = event["target"].name target = event["target"].name
check |= utils.Check("channel-mode", "high") check |= utils.Check("channel-mode", "high")
check |= utils.Check("channel-access", "part") check |= utils.Check("channel-access", "high,part")
else: else:
event["stderr"].write("No channel provided") event["stderr"].write("No channel provided")

3
src/core_modules/aliases.py
View file

@ -54,8 +54,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.balias", @utils.hook("received.command.balias",
permission="balias") permission="balias")
@utils.hook("received.command.calias", @utils.hook("received.command.calias",
require_mode="o", require_access="alias") require_mode="o", require_access="high,alias")
@utils.spec("!'list ?<alias>wordlower") @utils.spec("!'list ?<alias>wordlower")
@utils.spec("!'add !<alias>wordlower !<command>wordlower ?<args>string") @utils.spec("!'add !<alias>wordlower !<command>wordlower ?<args>string")
@utils.spec("!'remove !<alias>wordlower") @utils.spec("!'remove !<alias>wordlower")

2
src/core_modules/config.py
View file

@ -199,7 +199,7 @@ class Module(ModuleManager.BaseModule):
"Cannot change config for current channel when in " "Cannot change config for current channel when in "
"private message") "private message")
event["check_assert"](permission_check| event["check_assert"](permission_check|
utils.Check("channel-access", target, "config")| utils.Check("channel-access", target, "high,config")|
utils.Check("channel-mode", target, "o")) utils.Check("channel-mode", target, "o"))
elif context == "serverset" or context == "botset": elif context == "serverset" or context == "botset":
event["check_assert"](permission_check) event["check_assert"](permission_check)

2
src/core_modules/ignore.py
View file

@ -103,7 +103,7 @@ class Module(ModuleManager.BaseModule):
@utils.kwarg("usage", "<nickname>") @utils.kwarg("usage", "<nickname>")
@utils.kwarg("permission", "cignore") @utils.kwarg("permission", "cignore")
@utils.kwarg("require_mode", "o") @utils.kwarg("require_mode", "o")
@utils.kwarg("require_access", "cignore") @utils.kwarg("require_access", "high,cignore")
def cignore(self, event): def cignore(self, event):
remove = event["command"] == "cunignore" remove = event["command"] == "cunignore"

4
src/core_modules/silence.py
View file

@ -25,7 +25,7 @@ class Module(ModuleManager.BaseModule):
"(default: 5 minutes)") "(default: 5 minutes)")
@utils.kwarg("usage", "[+time]") @utils.kwarg("usage", "[+time]")
@utils.kwarg("require_mode", "high") @utils.kwarg("require_mode", "high")
@utils.kwarg("require_access", "silence") @utils.kwarg("require_access", "low,silence")
@utils.kwarg("permission", "silence") @utils.kwarg("permission", "silence")
def silence(self, event): def silence(self, event):
duration = SILENCE_TIME duration = SILENCE_TIME
@ -44,7 +44,7 @@ class Module(ModuleManager.BaseModule):
@utils.kwarg("unsilence", True) @utils.kwarg("unsilence", True)
@utils.kwarg("channel_only", True) @utils.kwarg("channel_only", True)
@utils.kwarg("require_mode", "high") @utils.kwarg("require_mode", "high")
@utils.kwarg("require_access", "unsilence") @utils.kwarg("require_access", "low,unsilence")
@utils.kwarg("permission", "unsilence") @utils.kwarg("permission", "unsilence")
def unsiltence(self, event): def unsiltence(self, event):
silence_until = event["target"].get_setting("silence-until", None) silence_until = event["target"].get_setting("silence-until", None)