summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-17 10:58:32 +0100
committerGitHub <noreply@github.com>2020-06-17 10:58:32 +0100
commit46613aaf794e11a23e22bcf325ff8b3c41e482f2 (patch)
tree88acf7730dfe96881809fc5985174ab1790aa596 /synapse/rest/client/v1
parentfix broken link in sample config (#7712) (diff)
parentMerge branch 'develop' into babolivier/mark_unread (diff)
downloadsynapse-46613aaf794e11a23e22bcf325ff8b3c41e482f2.tar.xz
Implement unread counter (MSC2625) (#7673)
Implementation of https://github.com/matrix-org/matrix-doc/pull/2625
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/push_rule.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py
index 9fd4908136..f563b3dc35 100644
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2014-2016 OpenMarket Ltd
+# Copyright 2014-2020 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -267,7 +267,7 @@ def _check_actions(actions):
         raise InvalidRuleException("No actions found")
 
     for a in actions:
-        if a in ["notify", "dont_notify", "coalesce"]:
+        if a in ["notify", "dont_notify", "coalesce", "org.matrix.msc2625.mark_unread"]:
             pass
         elif isinstance(a, dict) and "set_tweak" in a:
             pass