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

support bot-wide message filters too (!bfilter)

Browse source
This commit is contained in:
jesopo 2020-02-09 00:04:12 +00:00
parent 8153047f7c
commit d223009c6e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/message_filter.py
View file

@ -28,7 +28,8 @@ class Module(ModuleManager.BaseModule):
return out return out
def _get_filters(self, server, target): def _get_filters(self, server, target):
filters = server.get_setting("message-filters", []) filters = self.bot.get_setting("message-filters", [])
filters.extend(server.get_setting("message-filters", []))
filters.extend(target.get_setting("message-filters", [])) filters.extend(target.get_setting("message-filters", []))
return list(set(filters)) return list(set(filters))
@ -65,6 +66,7 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.cfilter", channel_only=True) @utils.hook("received.command.cfilter", channel_only=True)
@utils.hook("received.command.filter") @utils.hook("received.command.filter")
@utils.hook("received.command.bfilter")
@utils.kwarg("help", "Add a message filter for the current channel") @utils.kwarg("help", "Add a message filter for the current channel")
@utils.kwarg("permissions", "cfilter") @utils.kwarg("permissions", "cfilter")
@utils.spec("!'list ?<index>int") @utils.spec("!'list ?<index>int")
@ -77,6 +79,8 @@ class Module(ModuleManager.BaseModule):
if event["command"] == "cfilter": if event["command"] == "cfilter":
target = event["target"] target = event["target"]
elif event["command"] == "bfilter":
target = self.bot
else: else:
target = event["server"] target = event["server"]
filters = target.get_setting("message-filters", []) filters = target.get_setting("message-filters", [])