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

xmpp: Update to tokio-xmpp 3.4

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2023-08-17 16:17:53 +02:00
parent 68a8c043a2
commit 21c9fa2df4
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xmpp/Cargo.toml
View file

@ -14,8 +14,7 @@ license = "MPL-2.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
tokio-xmpp = "3.2" tokio-xmpp = "3.4"
xmpp-parsers = "0.19"
futures = "0.3" futures = "0.3"
tokio = { version = "1", features = ["fs"] } tokio = { version = "1", features = ["fs"] }
log = "0.4" log = "0.4"

2
xmpp/examples/hello_bot.rs
View file

@ -7,8 +7,8 @@
use env_logger; use env_logger;
use std::env::args; use std::env::args;
use std::str::FromStr; use std::str::FromStr;
use tokio_xmpp::parsers::{message::MessageType, BareJid, Jid};
use xmpp::{ClientBuilder, ClientFeature, ClientType, Event}; use xmpp::{ClientBuilder, ClientFeature, ClientType, Event};
use xmpp_parsers::{message::MessageType, BareJid, Jid};
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Option<()>> { async fn main() -> Result<(), Option<()>> {

6
xmpp/src/lib.rs
View file

@ -15,8 +15,7 @@ use std::path::{Path, PathBuf};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use tokio::fs::File; use tokio::fs::File;
use tokio_util::codec::{BytesCodec, FramedRead}; use tokio_util::codec::{BytesCodec, FramedRead};
use tokio_xmpp::{AsyncClient as TokioXmppClient, Event as TokioXmppEvent}; use tokio_xmpp::parsers::{
use xmpp_parsers::{
bookmarks2::Conference, bookmarks2::Conference,
caps::{compute_disco, hash_caps, Caps}, caps::{compute_disco, hash_caps, Caps},
disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity}, disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity},
@ -33,8 +32,9 @@ use xmpp_parsers::{
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},
BareJid, Element, Jid,
}; };
use tokio_xmpp::{AsyncClient as TokioXmppClient, Event as TokioXmppEvent};
use tokio_xmpp::{BareJid, Element, Jid};
#[macro_use] #[macro_use]
extern crate log; extern crate log;

2
xmpp/src/pubsub/avatar.rs
View file

@ -9,7 +9,7 @@ use crate::Event;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::fs::{self, File}; use std::fs::{self, File};
use std::io::{self, Write}; use std::io::{self, Write};
use xmpp_parsers::{ use tokio_xmpp::parsers::{
avatar::{Data, Metadata}, avatar::{Data, Metadata},
iq::Iq, iq::Iq,
ns, ns,

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

@ -8,7 +8,7 @@ use super::Agent;
use crate::Event; use crate::Event;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::str::FromStr; use std::str::FromStr;
use xmpp_parsers::{ use tokio_xmpp::parsers::{
bookmarks2::{Autojoin, Conference}, bookmarks2::{Autojoin, Conference},
ns, ns,
pubsub::event::PubSubEvent, pubsub::event::PubSubEvent,