Skip to content

Commit d223009

Browse files
committed
support bot-wide message filters too (!bfilter)
1 parent 8153047 commit d223009

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

modules/message_filter.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ def _split(self, s):
2828
return out
2929

3030
def _get_filters(self, server, target):
31-
filters = server.get_setting("message-filters", [])
31+
filters = self.bot.get_setting("message-filters", [])
32+
filters.extend(server.get_setting("message-filters", []))
3233
filters.extend(target.get_setting("message-filters", []))
3334
return list(set(filters))
3435

@@ -65,6 +66,7 @@ def channel_message(self, event):
6566

6667
@utils.hook("received.command.cfilter", channel_only=True)
6768
@utils.hook("received.command.filter")
69+
@utils.hook("received.command.bfilter")
6870
@utils.kwarg("help", "Add a message filter for the current channel")
6971
@utils.kwarg("permissions", "cfilter")
7072
@utils.spec("!'list ?<index>int")
@@ -77,6 +79,8 @@ def filter(self, event):
7779

7880
if event["command"] == "cfilter":
7981
target = event["target"]
82+
elif event["command"] == "bfilter":
83+
target = self.bot
8084
else:
8185
target = event["server"]
8286
filters = target.get_setting("message-filters", [])

0 commit comments

Comments
 (0)