xmpp-parsers: Add a lang property to Presence

Emmanuel Gil Peyrot created 11 months ago

This is a workaround for rxml not handling @xml:lang properly yet.

Change summary

parsers/ChangeLog       |  1 +
parsers/src/presence.rs | 30 +++++++++++++++++++++++++++---
2 files changed, 28 insertions(+), 3 deletions(-)

Detailed changes

parsers/ChangeLog

@@ -58,6 +58,7 @@ XXXX-YY-ZZ RELEASER <[e-mail]>
         Handshake::from_stream_id_and_password(), with the two parameters
         having been exchanged, and the stream_id is now a String instead of
         &str.
+      - Add a lang property in Presence, to avoid parser errors.
     * New parsers/serialisers:
       - Stream Features (RFC 6120) (!400)
       - Spam Reporting (XEP-0377) (!506)

parsers/src/presence.rs

@@ -157,6 +157,11 @@ pub struct Presence {
     #[xml(attribute(default))]
     pub type_: Type,
 
+    /// The xml:lang of this presence stanza.
+    // TODO: Remove that, it has no place here but helps parsing valid presences.
+    #[xml(attribute(default, name = "xml:lang"))]
+    pub lang: Option<Lang>,
+
     /// The availability of the sender of this presence.
     #[xml(extract(name = "show", default, fields(text(type_ = Show))))]
     pub show: Option<Show>,
@@ -186,6 +191,7 @@ impl Presence {
             to: None,
             id: None,
             type_,
+            lang: None,
             show: None,
             statuses: BTreeMap::new(),
             priority: Priority(0i8),
@@ -292,14 +298,14 @@ impl Presence {
 mod tests {
     use super::*;
     use jid::{BareJid, FullJid};
-    use xso::error::{Error, FromElementError};
+    use xso::error::FromElementError;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
     fn test_size() {
         assert_size!(Show, 1);
         assert_size!(Type, 1);
-        assert_size!(Presence, 72);
+        assert_size!(Presence, 84);
     }
 
     #[cfg(target_pointer_width = "64")]
@@ -307,7 +313,7 @@ mod tests {
     fn test_size() {
         assert_size!(Show, 1);
         assert_size!(Type, 1);
-        assert_size!(Presence, 144);
+        assert_size!(Presence, 168);
     }
 
     #[test]
@@ -622,4 +628,22 @@ mod tests {
         let elem: Element = presence.into();
         assert_eq!(elem.attr("to"), Some("test@localhost/coucou"));
     }
+
+    #[test]
+    fn test_xml_lang() {
+        #[cfg(not(feature = "component"))]
+        let elem: Element = "<presence xmlns='jabber:client' xml:lang='fr'/>"
+            .parse()
+            .unwrap();
+        #[cfg(feature = "component")]
+        let elem: Element = "<presence xmlns='jabber:component:accept' xml:lang='fr'/>"
+            .parse()
+            .unwrap();
+        let presence = Presence::try_from(elem).unwrap();
+        assert_eq!(presence.from, None);
+        assert_eq!(presence.to, None);
+        assert_eq!(presence.id, None);
+        assert_eq!(presence.type_, Type::None);
+        assert!(presence.payloads.is_empty());
+    }
 }