push-gateway-api: Create proper PusherData type

It doesn't have the `url` field from ruma-common's type

crates/ruma-push-gateway-api/Cargo.toml

@@ -14,6 +14,7 @@ all-features = true
 
 [features]
 unstable-exhaustive-types = []
+unstable-pre-spec = []
 client = []
 server = []
 

crates/ruma-push-gateway-api/src/send_event_notification.rs

@@ -12,12 +12,14 @@ pub mod v1 {
     use ruma_common::{
         api::ruma_api,
         events::RoomEventType,
-        push::{PusherData, Tweak},
+        push::{PushFormat, Tweak},
         serde::{Incoming, StringEnum},
         EventId, RoomAliasId, RoomId, RoomName, SecondsSinceUnixEpoch, UserId,
     };
     use serde::{Deserialize, Serialize};
     use serde_json::value::RawValue as RawJsonValue;
+    #[cfg(feature = "unstable-pre-spec")]
+    use serde_json::value::Value as JsonValue;
 
     use crate::PrivOwnedStr;
 
@@ -214,9 +216,6 @@ pub mod v1 {
         pub pushkey_ts: Option<SecondsSinceUnixEpoch>,
 
         /// A dictionary of additional pusher-specific data.
-        ///
-        /// For 'http' pushers, this is the data dictionary passed in at pusher creation minus the
-        /// `url` key.
         #[serde(default, skip_serializing_if = "PusherData::is_empty")]
         pub data: PusherData,
 
@@ -240,6 +239,67 @@ pub mod v1 {
         }
     }
 
+    /// Information for the pusher implementation itself.
+    ///
+    /// This is the data dictionary passed in at pusher creation minus the `url` key.
+    ///
+    /// It can be constructed from [`ruma_common::push::PusherData`] with `::from()` / `.into()`.
+    #[derive(Clone, Debug, Default, Serialize, Deserialize)]
+    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
+    pub struct PusherData {
+        /// The format to use when sending notifications to the Push Gateway.
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub format: Option<PushFormat>,
+
+        /// iOS (+ macOS?) specific default payload that will be sent to apple push notification
+        /// service.
+        ///
+        /// For more information, see [Sygnal docs][sygnal].
+        ///
+        /// [sygnal]: https://github.com/matrix-org/sygnal/blob/main/docs/applications.md#ios-applications-beware
+        // Not specified, issue: https://github.com/matrix-org/matrix-spec/issues/921
+        #[cfg(feature = "unstable-pre-spec")]
+        #[serde(default, skip_serializing_if = "JsonValue::is_null")]
+        pub default_payload: JsonValue,
+    }
+
+    impl PusherData {
+        /// Creates an empty `PusherData`.
+        pub fn new() -> Self {
+            Default::default()
+        }
+
+        /// Returns `true` if all fields are `None`.
+        pub fn is_empty(&self) -> bool {
+            #[cfg(not(feature = "unstable-pre-spec"))]
+            {
+                self.format.is_none()
+            }
+
+            #[cfg(feature = "unstable-pre-spec")]
+            {
+                self.format.is_none() && self.default_payload.is_null()
+            }
+        }
+    }
+
+    impl From<ruma_common::push::PusherData> for PusherData {
+        fn from(data: ruma_common::push::PusherData) -> Self {
+            let ruma_common::push::PusherData {
+                format,
+                #[cfg(feature = "unstable-pre-spec")]
+                default_payload,
+                ..
+            } = data;
+
+            Self {
+                format,
+                #[cfg(feature = "unstable-pre-spec")]
+                default_payload,
+            }
+        }
+    }
+
     mod tweak_serde {
         use std::fmt;
 

crates/ruma/Cargo.toml

@@ -112,6 +112,7 @@ unstable-pdu = ["ruma-common/unstable-pdu"]
 unstable-pre-spec = [
     "ruma-common/unstable-pre-spec",
     "ruma-federation-api/unstable-pre-spec",
+    "ruma-push-gateway-api/unstable-pre-spec",
 ]
 unstable-msc1767 = ["ruma-common/unstable-msc1767"]
 unstable-msc2448 = [