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

Receive legacy XEP-0048 v1.0 bookmarks

Browse source
This commit is contained in:
xmppftw 2023-12-16 16:06:38 +01:00 committed by Emmanuel Gil Peyrot
parent f9b71c8da0
commit 5fbba5c925
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xmpp/src/lib.rs
View file

@ -16,7 +16,7 @@ use tokio::fs::File;
use tokio_util::codec::{BytesCodec, FramedRead}; use tokio_util::codec::{BytesCodec, FramedRead};
pub use tokio_xmpp::parsers; pub use tokio_xmpp::parsers;
use tokio_xmpp::parsers::{ use tokio_xmpp::parsers::{
bookmarks2::Conference, bookmarks2,
caps::{compute_disco, hash_caps, Caps}, caps::{compute_disco, hash_caps, Caps},
disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity}, disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity},
hashes::Algo, hashes::Algo,
@ -29,6 +29,7 @@ use tokio_xmpp::parsers::{
}, },
ns, ns,
presence::{Presence, Type as PresenceType}, presence::{Presence, Type as PresenceType},
private::Query as PrivateXMLQuery,
pubsub::pubsub::{Items, PubSub}, pubsub::pubsub::{Items, PubSub},
roster::{Item as RosterItem, Roster}, roster::{Item as RosterItem, Roster},
stanza_error::{DefinedCondition, ErrorType, StanzaError}, stanza_error::{DefinedCondition, ErrorType, StanzaError},
@ -84,7 +85,7 @@ pub enum Event {
#[cfg(feature = "avatars")] #[cfg(feature = "avatars")]
AvatarRetrieved(Jid, String), AvatarRetrieved(Jid, String),
ChatMessage(Id, BareJid, Body), ChatMessage(Id, BareJid, Body),
JoinRoom(BareJid, Conference), JoinRoom(BareJid, bookmarks2::Conference),
LeaveRoom(BareJid), LeaveRoom(BareJid),
LeaveAllRooms, LeaveAllRooms,
RoomJoined(BareJid), RoomJoined(BareJid),
@ -388,6 +389,18 @@ impl Agent {
} else if payload.is("slot", ns::HTTP_UPLOAD) { } else if payload.is("slot", ns::HTTP_UPLOAD) {
let new_events = handle_upload_result(&from, iq.id, payload, self).await; let new_events = handle_upload_result(&from, iq.id, payload, self).await;
events.extend(new_events); events.extend(new_events);
} else if payload.is("query", ns::PRIVATE) {
match PrivateXMLQuery::try_from(payload) {
Ok(query) => {
for conf in query.storage.conferences {
let (jid, room) = conf.into_bookmarks2();
events.push(Event::JoinRoom(jid, room));
}
}
Err(e) => {
panic!("Wrong XEP-0048 v1.0 Bookmark format: {}", e);
}
}
} }
} else if let IqType::Set(_) = iq.payload { } else if let IqType::Set(_) = iq.payload {
// We MUST answer unhandled set iqs with a service-unavailable error. // We MUST answer unhandled set iqs with a service-unavailable error.
@ -402,7 +415,6 @@ impl Agent {
.into(); .into();
let _ = self.client.send_stanza(iq).await; let _ = self.client.send_stanza(iq).await;
} }
events events
} }

6
xmpp/src/pubsub/mod.rs
View file

@ -8,7 +8,7 @@ use super::Agent;
use crate::Event; use crate::Event;
use std::str::FromStr; use std::str::FromStr;
use tokio_xmpp::parsers::{ use tokio_xmpp::parsers::{
bookmarks2::{Autojoin, Conference}, bookmarks2::{self, Autojoin},
ns, ns,
pubsub::event::PubSubEvent, pubsub::event::PubSubEvent,
pubsub::pubsub::PubSub, pubsub::pubsub::PubSub,
@ -37,7 +37,7 @@ pub(crate) async fn handle_event(from: &Jid, elem: Element, agent: &mut Agent) -
let item = items.clone().pop().unwrap(); let item = items.clone().pop().unwrap();
let jid = BareJid::from_str(&item.id.clone().unwrap().0).unwrap(); let jid = BareJid::from_str(&item.id.clone().unwrap().0).unwrap();
let payload = item.payload.clone().unwrap(); let payload = item.payload.clone().unwrap();
match Conference::try_from(payload) { match bookmarks2::Conference::try_from(payload) {
Ok(conference) => { Ok(conference) => {
if conference.autojoin == Autojoin::True { if conference.autojoin == Autojoin::True {
events.push(Event::JoinRoom(jid, conference)); events.push(Event::JoinRoom(jid, conference));
@ -97,7 +97,7 @@ pub(crate) fn handle_iq_result(from: &Jid, elem: Element) -> impl IntoIterator<I
let item = item.0; let item = item.0;
let jid = BareJid::from_str(&item.id.clone().unwrap().0).unwrap(); let jid = BareJid::from_str(&item.id.clone().unwrap().0).unwrap();
let payload = item.payload.clone().unwrap(); let payload = item.payload.clone().unwrap();
match Conference::try_from(payload) { match bookmarks2::Conference::try_from(payload) {
Ok(conference) => { Ok(conference) => {
if let Autojoin::True = conference.autojoin { if let Autojoin::True = conference.autojoin {
events.push(Event::JoinRoom(jid, conference)); events.push(Event::JoinRoom(jid, conference));