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

Allow channel-access and channel-mode check for channels people are not in

Browse source
This commit is contained in:
jesopo 2019-06-16 20:48:31 +01:00
parent 73aa55b866
commit ced59a0f74
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/config.py
View file

@ -39,6 +39,10 @@ class ConfigChannelTarget(object):
channel_id = self._get_id()
self._bot.database.channel_settings.delete(channel_id, setting)
def get_user_setting(self, user_id, setting, default=None):
return self.bot.database.user_channel_settings.get(user_id,
self._get_id(), setting, default)
class Module(ModuleManager.BaseModule):
def _to_context(self, server, channel, user, context_desc):
context_desc_lower = context_desc.lower()
@ -144,22 +148,22 @@ class Module(ModuleManager.BaseModule):
target = event["user"]
elif context == "channelset":
if name:
event["check_assert"](permission_check)
if name in event["server"].channels:
target = event["server"].channels.get(name)
else:
event["check_assert"]
target = ConfigChannelTarget(self.bot, event["server"],
name)
else:
if event["is_channel"]:
event["check_assert"](
utils.Check("channel-mode", "o")|permission_check)
target = event["target"]
else:
raise utils.EventError(
"Cannot change config for current channel when in "
"private message")
event["check_assert"](permission_check|
utils.Check("channel-access", "set")|
utils.Check("channel-mode", "o"))
elif context == "serverset" or context == "botset":
event["check_assert"](permission_check)

2
src/utils/__init__.py
View file

@ -193,6 +193,8 @@ class MultiCheck(object):
return self
def requests(self):
return self._requests[:]
def __or__(self, other: "Check"):
return MultiCheck(self._requests+[(other.request, other.args)])
class Check(object):
def __init__(self, request: str, *args: str):
self.request = request