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

chatstates: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:33:58 +01:00
commit e451520187
2 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/message.rs
View file

@ -17,7 +17,7 @@ use ns;
use body;
use stanza_error;
use chatstates;
use chatstates::ChatState;
use receipts::Receipt;
use delay;
use attention::Attention;
@ -29,7 +29,7 @@ use eme;
pub enum MessagePayload {
Body(body::Body),
StanzaError(stanza_error::StanzaError),
ChatState(chatstates::ChatState),
ChatState(ChatState),
Receipt(Receipt),
Delay(delay::Delay),
Attention(Attention),
@ -115,7 +115,7 @@ pub fn parse_message(root: &Element) -> Result<Message, Error> {
Some(MessagePayload::Body(body))
} else if let Ok(stanza_error) = stanza_error::parse_stanza_error(elem) {
Some(MessagePayload::StanzaError(stanza_error))
} else if let Ok(chatstate) = chatstates::parse_chatstate(elem) {
} else if let Ok(chatstate) = ChatState::try_from(elem) {
Some(MessagePayload::ChatState(chatstate))
} else if let Ok(receipt) = Receipt::try_from(elem) {
Some(MessagePayload::Receipt(receipt))
@ -149,7 +149,7 @@ pub fn serialise_payload(payload: &MessagePayload) -> Element {
MessagePayload::Body(ref body) => body::serialise(body),
MessagePayload::StanzaError(ref stanza_error) => stanza_error::serialise(stanza_error),
MessagePayload::Attention(ref attention) => attention.into(),
MessagePayload::ChatState(ref chatstate) => chatstates::serialise(chatstate),
MessagePayload::ChatState(ref chatstate) => chatstate.into(),
MessagePayload::Receipt(ref receipt) => receipt.into(),
MessagePayload::Delay(ref delay) => delay::serialise(delay),
MessagePayload::MessageCorrect(ref replace) => replace.into(),