pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

roster: Make subscription="none" the default, see RFC6121 §2.1.2.5.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-10-10 17:40:29 +01:00
parent 558622a08a
commit 33018a5c09
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/roster.rs
View file

@ -21,7 +21,7 @@ generate_attribute!(Subscription, "subscription", {
To => "to", To => "to",
Both => "both", Both => "both",
Remove => "remove", Remove => "remove",
}); }, Default = None);
/// Contact from the user’s contact list. /// Contact from the user’s contact list.
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -33,7 +33,7 @@ pub struct Item {
pub name: Option<String>, pub name: Option<String>,
/// Subscription status of this contact. /// Subscription status of this contact.
pub subscription: Option<Subscription>, pub subscription: Subscription,
/// Groups this contact is part of. /// Groups this contact is part of.
pub groups: Vec<Group>, pub groups: Vec<Group>,
@ -50,7 +50,7 @@ impl TryFrom<Element> for Item {
let mut item = Item { let mut item = Item {
jid: get_attr!(elem, "jid", required), jid: get_attr!(elem, "jid", required),
name: get_attr!(elem, "name", optional).and_then(|name| if name == "" { None } else { Some(name) }), name: get_attr!(elem, "name", optional).and_then(|name| if name == "" { None } else { Some(name) }),
subscription: get_attr!(elem, "subscription", optional), subscription: get_attr!(elem, "subscription", default),
groups: vec!(), groups: vec!(),
}; };
for child in elem.children() { for child in elem.children() {
@ -183,7 +183,7 @@ mod tests {
assert_eq!(roster.items.len(), 3); assert_eq!(roster.items.len(), 3);
assert_eq!(roster.items[0].jid, Jid::from_str("romeo@example.net").unwrap()); assert_eq!(roster.items[0].jid, Jid::from_str("romeo@example.net").unwrap());
assert_eq!(roster.items[0].name, Some(String::from("Romeo"))); assert_eq!(roster.items[0].name, Some(String::from("Romeo")));
assert_eq!(roster.items[0].subscription, Some(Subscription::Both)); assert_eq!(roster.items[0].subscription, Subscription::Both);
assert_eq!(roster.items[0].groups, vec!(Group::from_str("Friends").unwrap())); assert_eq!(roster.items[0].groups, vec!(Group::from_str("Friends").unwrap()));
} }
@ -245,7 +245,7 @@ mod tests {
assert_eq!(roster.items[0].jid, Jid::from_str("nurse@example.com").unwrap()); assert_eq!(roster.items[0].jid, Jid::from_str("nurse@example.com").unwrap());
assert!(roster.items[0].name.is_none()); assert!(roster.items[0].name.is_none());
assert!(roster.items[0].groups.is_empty()); assert!(roster.items[0].groups.is_empty());
assert_eq!(roster.items[0].subscription, Some(Subscription::Remove)); assert_eq!(roster.items[0].subscription, Subscription::Remove);
} }
#[test] #[test]