Update dependencies

This commit is contained in:
SonnyX 2019-09-08 21:28:44 +02:00
commit 3b37646d0a
12 changed files with 617 additions and 629 deletions

View file

@ -1,4 +1,5 @@
use futures::{future, Sink, Stream};
use std::convert::TryFrom;
use std::env::args;
use std::process::exit;
use tokio::runtime::current_thread::Runtime;
@ -6,7 +7,6 @@ use tokio_xmpp::{Client, xmpp_codec::Packet};
use xmpp_parsers::{
Element,
Jid,
TryFrom,
ns,
iq::{
Iq,

View file

@ -1,4 +1,5 @@
use futures::{future, Future, Sink, Stream};
use std::convert::TryFrom;
use std::env::args;
use std::fs::{create_dir_all, File};
use std::io::{self, Write};
@ -21,7 +22,7 @@ use xmpp_parsers::{
NodeName,
},
stanza_error::{StanzaError, ErrorType, DefinedCondition},
Jid, TryFrom,
Jid,
};
fn main() {
@ -116,7 +117,7 @@ fn main() {
let from = message.from.clone().unwrap();
if let Some(body) = message.get_best_body(vec!["en"]) {
if body.1 .0 == "die" {
println!("Secret die command triggered by {}", from);
println!("Secret die command triggered by {}", from.clone());
wait_for_stream_end = true;
tx.start_send(Packet::StreamEnd).unwrap();
}
@ -133,7 +134,7 @@ fn main() {
let _metadata = AvatarMetadata::try_from(payload).unwrap();
println!(
"{} has published an avatar, downloading...",
from
from.clone()
);
let iq = download_avatar(&from);
tx.start_send(Packet::Stanza(iq.into())).unwrap();
@ -218,11 +219,11 @@ fn handle_iq_result(pubsub: PubSub, from: &Jid) {
}
fn save_avatar(from: &Jid, id: String, data: &[u8]) -> io::Result<()> {
let directory = format!("data/{}", from);
let filename = format!("data/{}/{}", from, id);
let directory = format!("data/{}", from.clone());
let filename = format!("data/{}/{}", from.clone(), id);
println!(
"Saving avatar from {} to {}.",
from, filename
from.clone(), filename
);
create_dir_all(directory)?;
let mut file = File::create(filename)?;

View file

@ -1,9 +1,10 @@
use futures::{future, Future, Sink, Stream};
use std::convert::TryFrom;
use std::env::args;
use std::process::exit;
use tokio::runtime::current_thread::Runtime;
use tokio_xmpp::{Client, Packet};
use xmpp_parsers::{Jid, Element, TryFrom};
use xmpp_parsers::{Jid, Element};
use xmpp_parsers::message::{Body, Message, MessageType};
use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};
@ -56,7 +57,7 @@ fn main() {
{
match (message.from, message.bodies.get("")) {
(Some(ref from), Some(ref body)) if body.0 == "die" => {
println!("Secret die command triggered by {}", from);
println!("Secret die command triggered by {}", from.clone());
wait_for_stream_end = true;
tx.start_send(Packet::StreamEnd).unwrap();
}
@ -87,7 +88,7 @@ fn main() {
// Construct a <presence/>
fn make_presence() -> Element {
let mut presence = Presence::new(PresenceType::None);
presence.show = PresenceShow::Chat;
presence.show = Some(PresenceShow::Chat);
presence
.statuses
.insert(String::from("en"), String::from("Echoing messages."));

View file

@ -1,10 +1,11 @@
use futures::{future, Sink, Stream};
use std::convert::TryFrom;
use std::env::args;
use std::process::exit;
use std::str::FromStr;
use tokio::runtime::current_thread::Runtime;
use tokio_xmpp::Component;
use xmpp_parsers::{Jid, Element, TryFrom};
use xmpp_parsers::{Jid, Element};
use xmpp_parsers::message::{Body, Message, MessageType};
use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};
@ -31,7 +32,7 @@ fn main() {
// Make the two interfaces for sending and receiving independent
// of each other so we can move one into a closure.
println!("Got it: {}", component.jid);
println!("Got it: {}", component.jid.clone());
let (mut sink, stream) = component.split();
// Wrap sink in Option so that we can take() it for the send(self)
// to consume and return it back when ready.
@ -83,7 +84,7 @@ fn make_presence(from: Jid, to: Jid) -> Element {
let mut presence = Presence::new(PresenceType::None);
presence.from = Some(from);
presence.to = Some(to);
presence.show = PresenceShow::Chat;
presence.show = Some(PresenceShow::Chat);
presence
.statuses
.insert(String::from("en"), String::from("Echoing messages."));