Skip to content

Commit 8153047

Browse files
committed
support server-wide message filters too
1 parent 68e25a6 commit 8153047

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

modules/message_filter.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,22 @@ def channel_message(self, event):
6363
if not message == message_plain:
6464
event["line"].args[1] = message
6565

66-
@utils.hook("received.command.cfilter", min_args=1)
66+
@utils.hook("received.command.cfilter", channel_only=True)
67+
@utils.hook("received.command.filter")
6768
@utils.kwarg("help", "Add a message filter for the current channel")
6869
@utils.kwarg("permissions", "cfilter")
6970
@utils.spec("!'list ?<index>int")
7071
@utils.spec("!'add ?<m/pattern/>string|<s/pattern/replace/>string")
7172
@utils.spec("!'remove !<index>int")
72-
def cfilter(self, event):
73+
def filter(self, event):
7374
# mark output as "assured" so it can bypass filtering
7475
event["stdout"].assure()
7576
event["stderr"].assure()
76-
target = event["target"]
77+
78+
if event["command"] == "cfilter":
79+
target = event["target"]
80+
else:
81+
target = event["server"]
7782
filters = target.get_setting("message-filters", [])
7883

7984
if event["spec"][0] == "list":

0 commit comments

Comments
 (0)