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

receipts: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:07:03 +01:00
commit 151635f5fb
2 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/message.rs
View file

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