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

client: replace jid field with bound_jid()

Browse source 
resolves gitlab MR #8
This commit is contained in:
Astro 2019-10-15 21:18:24 +02:00
parent a572bf4dea
commit 16458dedf1
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client/mod.rs
View file

@ -22,8 +22,6 @@ use self::bind::ClientBind;
/// XMPP client connection and state /// XMPP client connection and state
pub struct Client { pub struct Client {
/// The client's current Jabber-Id
pub jid: Jid,
state: ClientState, state: ClientState,
} }
@ -51,9 +49,8 @@ impl Client {
/// Start a new client given that the JID is already parsed. /// Start a new client given that the JID is already parsed.
pub fn new_with_jid(jid: Jid, password: &str) -> Self { pub fn new_with_jid(jid: Jid, password: &str) -> Self {
let password = password.to_owned(); let password = password.to_owned();
let connect = Self::make_connect(jid.clone(), password.clone()); let connect = Self::make_connect(jid, password.clone());
let client = Client { let client = Client {
jid,
state: ClientState::Connecting(Box::new(connect)), state: ClientState::Connecting(Box::new(connect)),
}; };
client client
@ -125,6 +122,15 @@ impl Client {
fn bind<S: AsyncWrite>(stream: xmpp_stream::XMPPStream<S>) -> ClientBind<S> { fn bind<S: AsyncWrite>(stream: xmpp_stream::XMPPStream<S>) -> ClientBind<S> {
ClientBind::new(stream) ClientBind::new(stream)
} }
/// Get the client's bound JID (the one reported by the XMPP
/// server).
pub fn bound_jid(&self) -> Option<&Jid> {
match self.state {
ClientState::Connected(ref stream) => Some(&stream.jid),
_ => None,
}
}
} }
impl Stream for Client { impl Stream for Client {