xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xmpp-rs: update tokio_xmpp API

Browse source
This commit is contained in:
Astro 2020-05-30 00:24:58 +02:00
commit 91f4548ef0
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use futures::stream::StreamExt;
use std::cell::RefCell; use std::cell::RefCell;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::rc::Rc; use std::rc::Rc;
use tokio_xmpp::{Client as TokioXmppClient, Event as TokioXmppEvent}; use tokio_xmpp::{AsyncClient as TokioXmppClient, Event as TokioXmppEvent};
use xmpp_parsers::{ use xmpp_parsers::{
bookmarks2::Conference, bookmarks2::Conference,
caps::{compute_disco, hash_caps, Caps}, caps::{compute_disco, hash_caps, Caps},
@ -241,7 +241,7 @@ impl Agent {
let mut events = Vec::new(); let mut events = Vec::new();
match event { match event {
TokioXmppEvent::Online(_) => { TokioXmppEvent::Online { resumed: false, .. } => {
let presence = Self::make_initial_presence(&self.disco, &self.node).into(); let presence = Self::make_initial_presence(&self.disco, &self.node).into();
let _ = self.client.send_stanza(presence).await; let _ = self.client.send_stanza(presence).await;
events.push(Event::Online); events.push(Event::Online);
@ -260,6 +260,7 @@ impl Agent {
Iq::from_get("bookmarks", PubSub::Items(Items::new(ns::BOOKMARKS2))).into(); Iq::from_get("bookmarks", PubSub::Items(Items::new(ns::BOOKMARKS2))).into();
let _ = self.client.send_stanza(iq).await; let _ = self.client.send_stanza(iq).await;
} }
TokioXmppEvent::Online { resumed: true, .. } => {}
TokioXmppEvent::Disconnected(_) => { TokioXmppEvent::Disconnected(_) => {
events.push(Event::Disconnected); events.push(Event::Disconnected);
} }
@ -398,7 +399,7 @@ impl Agent {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{Agent, ClientBuilder, ClientFeature, ClientType, Event}; use super::{Agent, ClientBuilder, ClientFeature, ClientType, Event};
use tokio_xmpp::Client as TokioXmppClient; use tokio_xmpp::AsyncClient as TokioXmppClient;
#[tokio::test] #[tokio::test]
async fn test_simple() { async fn test_simple() {