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

Merge branch 'presence' into 'master'

Browse source 
update the presence plugin to match xmpp-parsers 0.5.0

See merge request !22
This commit is contained in:
lumi 2017-06-11 14:09:30 +00:00
commit 04a3afb621
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -16,7 +16,7 @@ gitlab = { repository = "lumi/xmpp-rs" }
[dependencies]
xml-rs = "0.4.1"
xmpp-parsers = "0.4.0"
xmpp-parsers = "0.5.0"
openssl = "0.9.12"
base64 = "0.5.2"
minidom = "0.4.1"

4
examples/client.rs
View file

@ -5,7 +5,7 @@ use xmpp::client::ClientBuilder;
use xmpp::plugins::stanza::StanzaPlugin;
use xmpp::plugins::unhandled_iq::UnhandledIqPlugin;
use xmpp::plugins::messaging::{MessagingPlugin, MessageEvent};
use xmpp::plugins::presence::{PresencePlugin, Type};
use xmpp::plugins::presence::{PresencePlugin, Type, Show};
use xmpp::plugins::disco::DiscoPlugin;
use xmpp::plugins::ibb::IbbPlugin;
use xmpp::plugins::ping::PingPlugin;
@ -33,6 +33,6 @@ fn main() {
println!("{:?}", e);
Propagation::Continue
});
client.plugin::<PresencePlugin>().set_presence(Type::Available, None, None).unwrap();
client.plugin::<PresencePlugin>().set_presence(Type::None, Show::None, None).unwrap();
client.main().unwrap();
}

4
src/plugins/presence.rs
View file

@ -3,7 +3,7 @@ use std::collections::BTreeMap;
use error::Error;
use plugin::PluginProxy;
pub use xmpp_parsers::presence::{Presence, PresenceType as Type, Show};
pub use xmpp_parsers::presence::{Presence, Type, Show};
pub struct PresencePlugin {
proxy: PluginProxy,
@ -16,7 +16,7 @@ impl PresencePlugin {
}
}
pub fn set_presence(&self, type_: Type, show: Option<Show>, status: Option<String>) -> Result<(), Error> {
pub fn set_presence(&self, type_: Type, show: Show, status: Option<String>) -> Result<(), Error> {
let presence = Presence {
from: None,
to: None,