fix: update msc number

element-hq · May 8, 2024 · fe9f9a8 · fe9f9a8
1 parent 7021a21
commit fe9f9a8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/changelog.d/16858.feature b/changelog.d/16858.feature
@@ -1 +1 @@
-Experimental support for [MSC3767](https://github.com/matrix-org/matrix-spec-proposals/pull/3767): the `time_and_day` push rule condition. Contributed by @hanadi92.
+Experimental support for [MSC4141](https://github.com/matrix-org/matrix-spec-proposals/pull/4141): the `time_and_day` push rule condition. Contributed by @hanadi92.
diff --git a/rust/src/push/evaluator.rs b/rust/src/push/evaluator.rs
@@ -107,8 +107,8 @@ pub struct PushRuleEvaluator {
     /// flag as MSC1767 (extensible events core).
     msc3931_enabled: bool,
 
-    /// If MSC3767 (time based notification filtering push rule condition) is enabled
-    msc3767_time_and_day: bool,
+    /// If MSC4141 (time based notification filtering push rule condition) is enabled
+    msc4141_time_and_day: bool,
 }
 
 #[pymethods]
@@ -126,7 +126,7 @@ impl PushRuleEvaluator {
         related_event_match_enabled,
         room_version_feature_flags,
         msc3931_enabled,
-        msc3767_time_and_day,
+        msc4141_time_and_day,
     ))]
     pub fn py_new(
         flattened_keys: BTreeMap<String, JsonValue>,
@@ -138,7 +138,7 @@ impl PushRuleEvaluator {
         related_event_match_enabled: bool,
         room_version_feature_flags: Vec<String>,
         msc3931_enabled: bool,
-        msc3767_time_and_day: bool,
+        msc4141_time_and_day: bool,
     ) -> Result<Self, Error> {
         let body = match flattened_keys.get("content.body") {
             Some(JsonValue::Value(SimpleJsonValue::Str(s))) => s.clone().into_owned(),
@@ -156,7 +156,7 @@ impl PushRuleEvaluator {
             related_event_match_enabled,
             room_version_feature_flags,
             msc3931_enabled,
-            msc3767_time_and_day,
+            msc4141_time_and_day,
         })
     }
 
@@ -392,7 +392,7 @@ impl PushRuleEvaluator {
                 }
             }
             KnownCondition::TimeAndDay(time_and_day) => {
-                if !self.msc3767_time_and_day {
+                if !self.msc4141_time_and_day {
                     false
                 } else {
                     self.match_time_and_day(time_and_day.timezone, &time_and_day.intervals)?

diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs
@@ -362,7 +362,7 @@ pub enum KnownCondition {
     RoomVersionSupports {
         feature: Cow<'static, str>,
     },
-    #[serde(rename = "org.matrix.msc3767.time_and_day")]
+    #[serde(rename = "org.matrix.msc4141.time_and_day")]
     TimeAndDay(TimeAndDayCondition),
 }
 
@@ -455,7 +455,7 @@ pub struct TimeAndDayCondition {
 pub struct TimeAndDayIntervals {
     /// Tuple of hh::mm representing start and end times of the day
     pub time_of_day: Option<TimeInterval>,
-    /// 0 = Sunday, 1 = Monday, ..., 7 = Sunday
+    /// 0 = Sunday, 1 = Monday, ..., 6 = Saturday
     pub day_of_week: Vec<u32>,
 }
 

diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
@@ -437,7 +437,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
             "msc4115_membership_on_events", False
         )
 
-        # MSC3767: time based notification filtering
-        self.msc3767_time_and_day = experimental.get(
-            "org.matrix.msc3767.time_and_day", False
+        # MSC4141: time based notification filtering
+        self.msc4141_time_and_day = experimental.get(
+            "org.matrix.msc4141.time_and_day", False
         )
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
@@ -435,7 +435,7 @@ async def _action_for_event_by_user(
             self._related_event_match_enabled,
             event.room_version.msc3931_push_features,
             self.hs.config.experimental.msc1767_enabled,  # MSC3931 flag
-            self.hs.config.experimental.msc3767_time_and_day,
+            self.hs.config.experimental.msc4141_time_and_day,
         )
 
         for uid, rules in rules_by_user.items():

diff --git a/synapse/synapse_rust/push.pyi b/synapse/synapse_rust/push.pyi
@@ -65,7 +65,7 @@ class PushRuleEvaluator:
         related_event_match_enabled: bool,
         room_version_feature_flags: Tuple[str, ...],
         msc3931_enabled: bool,
-        msc3767_time_and_day: bool,
+        msc4141_time_and_day: bool,
     ): ...
     def run(
         self,

diff --git a/tests/push/test_push_rule_evaluator.py b/tests/push/test_push_rule_evaluator.py
@@ -174,7 +174,7 @@ def _get_evaluator(
             related_event_match_enabled=True,
             room_version_feature_flags=event.room_version.msc3931_push_features,
             msc3931_enabled=True,
-            msc3767_time_and_day=True,
+            msc4141_time_and_day=True,
         )
 
     def test_display_name(self) -> None:
@@ -806,7 +806,7 @@ def test_related_event_match_no_related_event(self) -> None:
     def test_time_and_day_match(self) -> None:
         # for testing, make whole day in do not disturb
         condition = {
-            "kind": "org.matrix.msc3767.time_and_day",
+            "kind": "org.matrix.msc4141.time_and_day",
             "timezone": None,
             "intervals": [
                 {