From 932fe4fa38accee577d1ab09ad004fb68e84d1d9 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 9 Feb 2022 18:47:24 +0100 Subject: [PATCH] common: Skip serializing empty default_payload in PusherData, simplify type --- crates/ruma-common/src/push.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/ruma-common/src/push.rs b/crates/ruma-common/src/push.rs index bdcc5a59..c4caaa40 100644 --- a/crates/ruma-common/src/push.rs +++ b/crates/ruma-common/src/push.rs @@ -414,7 +414,8 @@ pub struct PusherData { /// [sygnal]: https://github.com/matrix-org/sygnal/blob/main/docs/applications.md#ios-applications-beware // Not specified, issue: https://github.com/matrix-org/matrix-doc/issues/3474 #[cfg(feature = "unstable-pre-spec")] - pub default_payload: Option, + #[serde(default, skip_serializing_if = "JsonValue::is_null")] + pub default_payload: JsonValue, } impl PusherData { @@ -432,7 +433,7 @@ impl PusherData { #[cfg(feature = "unstable-pre-spec")] { - self.url.is_none() && self.format.is_none() && self.default_payload.is_none() + self.url.is_none() && self.format.is_none() && self.default_payload.is_null() } } }