pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Event::Contact{Uns,S}ubscription events

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-05-19 00:37:38 +02:00
parent f8cb643590
commit 02b9e2e71f
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
xmpp-rs/src/lib.rs
View file

@ -25,7 +25,7 @@ use xmpp_parsers::{
ns,
presence::{Presence, Type as PresenceType},
pubsub::pubsub::{Items, PubSub},
roster::{Item as RosterItem, Roster},
roster::{Item as RosterItem, Roster, Subscription as RosterSubscription},
stanza_error::{DefinedCondition, ErrorType, StanzaError},
BareJid, FullJid, Jid,
};
@ -71,9 +71,13 @@ pub type RoomNick = String;
pub enum Event {
Online,
Disconnected,
/// The server, another resource or the user have either added or modified a contact
ContactAdded(RosterItem),
/// The server, another resource or the user have removed a contact
ContactRemoved(RosterItem),
ContactChanged(RosterItem),
/// Another user has sent a subscription request
ContactSubscription(BareJid),
ContactUnsubscription(BareJid),
#[cfg(feature = "avatars")]
AvatarRetrieved(Jid, String),
ChatMessage(BareJid, Body),
@ -314,7 +318,11 @@ impl Agent {
if payload.is("query", ns::ROSTER) && iq.from.is_none() {
let roster = Roster::try_from(payload).unwrap();
for item in roster.items.into_iter() {
events.push(Event::ContactAdded(item));
if item.subscription == RosterSubscription::Remove {
events.push(Event::ContactRemoved(item));
} else {
events.push(Event::ContactAdded(item));
}
}
} else if payload.is("pubsub", ns::PUBSUB) {
let new_events = pubsub::handle_iq_result(&from, payload);
@ -368,15 +376,21 @@ impl Agent {
Jid::Full(FullJid { node, domain, .. }) => BareJid { node, domain },
Jid::Bare(bare) => bare,
};
for payload in presence.payloads.into_iter() {
let muc_user = match MucUser::try_from(payload) {
Ok(muc_user) => muc_user,
_ => continue,
};
for status in muc_user.status.into_iter() {
if status == Status::SelfPresence {
events.push(Event::RoomJoined(from.clone()));
break;
if presence.type_ == PresenceType::Subscribe {
events.push(Event::ContactSubscription(from.clone()));
} else if presence.type_ == PresenceType::Unsubscribe {
events.push(Event::ContactUnsubscription(from.clone()));
} else {
for payload in presence.payloads.into_iter() {
let muc_user = match MucUser::try_from(payload) {
Ok(muc_user) => muc_user,
_ => continue,
};
for status in muc_user.status.into_iter() {
if status == Status::SelfPresence {
events.push(Event::RoomJoined(from.clone()));
break;
}
}
}
}