diff options
| -rw-r--r-- | modules/config.py | 12 | ||||
| -rw-r--r-- | src/utils/__init__.py | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/config.py b/modules/config.py index d48480c7..18a16c56 100644 --- a/modules/config.py +++ b/modules/config.py @@ -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) diff --git a/src/utils/__init__.py b/src/utils/__init__.py index 99d289ac..4e947c4b 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -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 |