From 85df4d947812a20084fdfaebbd606a44361f775b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 9 Sep 2020 14:43:17 +0100
Subject: [PATCH 1/4] Add base pushrule to notify for jitsi conferences

---
 synapse/push/baserules.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 8047873ff1d9..3a4788262b05 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -498,6 +498,30 @@ def make_base_prepend_rules(kind, modified_base_rules, use_new_defaults=False):
         ],
         "actions": ["notify", {"set_tweak": "highlight", "value": False}],
     },
+    {
+        "rule_id": "global/underride/.im.vector.jitsi",
+        "conditions": [
+            {
+                "kind": "event_match",
+                "key": "type",
+                "pattern": "im.vector.modular.widgets",
+                "_id": "_type_modular_widgets",
+            },
+            {
+                "kind": "event_match",
+                "key": "content.type",
+                "pattern": "jitsi",
+                "_id": "_content_type_jitsi",
+            },
+            {
+                "kind": "event_match",
+                "key": "state_key",
+                "pattern": "*",
+                "_id": "_is_state_event",
+            },
+        ],
+        "actions": ["notify", {"set_tweak": "highlight", "value": False}],
+    },
 ]
 
 

From 9eccedf155514c0b370b268a0a058029bebe4adf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 9 Sep 2020 14:55:27 +0100
Subject: [PATCH 2/4] changelog

---
 changelog.d/8286.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/8286.feature

diff --git a/changelog.d/8286.feature b/changelog.d/8286.feature
new file mode 100644
index 000000000000..1af58e5f609a
--- /dev/null
+++ b/changelog.d/8286.feature
@@ -0,0 +1 @@
+Add push rule for jitsi conferences

From 2f57b3673384ded30cf0bccd4542ed8bd853d6f3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 9 Sep 2020 14:56:52 +0100
Subject: [PATCH 3/4] changelog punctuation

---
 changelog.d/8286.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/8286.feature b/changelog.d/8286.feature
index 1af58e5f609a..641635b49a59 100644
--- a/changelog.d/8286.feature
+++ b/changelog.d/8286.feature
@@ -1 +1 @@
-Add push rule for jitsi conferences
+Add push rule for jitsi conferences.

From 3c4e9503064ccfc30edbf969a9a4d056a85f4c5c Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Fri, 30 Oct 2020 11:25:36 +0000
Subject: [PATCH 4/4] Better changelog

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
 changelog.d/8286.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/8286.feature b/changelog.d/8286.feature
index 641635b49a59..2c371419af51 100644
--- a/changelog.d/8286.feature
+++ b/changelog.d/8286.feature
@@ -1 +1 @@
-Add push rule for jitsi conferences.
+Add a push rule that highlights when a jitsi conference is created in a room.