diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-08-02 08:41:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 08:41:32 -0400 |
| commit | 01a45869f034265b9757992aa1a5eb7a0923351c (patch) | |
| tree | b0e7e9a927141365fe73d26774b3193f44a1ace6 /rust/src/push/mod.rs | |
| parent | Bump cryptography from 41.0.2 to 41.0.3 (#16048) (diff) | |
| download | synapse-01a45869f034265b9757992aa1a5eb7a0923351c.tar.xz | |
Update MSC3958 support to interact with intentional mentions. (#15992)
* Updates the rule ID. * Use `event_property_is` instead of `event_match`. This updates the implementation of MSC3958 to match the latest text from the MSC.
Diffstat (limited to 'rust/src/push/mod.rs')
| -rw-r--r-- | rust/src/push/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs index 514980579b..829fb79d0e 100644 --- a/rust/src/push/mod.rs +++ b/rust/src/push/mod.rs @@ -256,7 +256,7 @@ impl<'de> Deserialize<'de> for Action { #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(untagged)] pub enum SimpleJsonValue { - Str(String), + Str(Cow<'static, str>), Int(i64), Bool(bool), Null, @@ -265,7 +265,7 @@ pub enum SimpleJsonValue { impl<'source> FromPyObject<'source> for SimpleJsonValue { fn extract(ob: &'source PyAny) -> PyResult<Self> { if let Ok(s) = <PyString as pyo3::PyTryFrom>::try_from(ob) { - Ok(SimpleJsonValue::Str(s.to_string())) + Ok(SimpleJsonValue::Str(Cow::Owned(s.to_string()))) // A bool *is* an int, ensure we try bool first. } else if let Ok(b) = <PyBool as pyo3::PyTryFrom>::try_from(ob) { Ok(SimpleJsonValue::Bool(b.extract()?)) @@ -585,7 +585,7 @@ impl FilteredPushRules { } if !self.msc3958_suppress_edits_enabled - && rule.rule_id == "global/override/.com.beeper.suppress_edits" + && rule.rule_id == "global/override/.org.matrix.msc3958.suppress_edits" { return false; } |