Merge branch 'presence' into 'master'

lumi created 8 years ago

update the presence plugin to match xmpp-parsers 0.5.0

See merge request !22

Change summary

Cargo.toml              | 2 +-
examples/client.rs      | 4 ++--
src/plugins/presence.rs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

Cargo.toml

@@ -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"

examples/client.rs

@@ -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();
 }

src/plugins/presence.rs

@@ -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,