From ccccc6e1b2ebd62a35715f71c746f3a3b9c0b97e Mon Sep 17 00:00:00 2001 From: Andy Wortman Date: Wed, 25 Oct 2017 04:07:32 -0700 Subject: begin removing unwrap() --- src/commands/thread.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/commands/thread.rs') diff --git a/src/commands/thread.rs b/src/commands/thread.rs index fd491ba..8880af7 100644 --- a/src/commands/thread.rs +++ b/src/commands/thread.rs @@ -33,12 +33,15 @@ fn remember(line: String, tweeter: &mut tw::TwitterCache, _queryer: &mut Queryer let maybe_id = TweetId::parse(line.to_owned()); match maybe_id { Ok(twid) => { - let twete = tweeter.retrieve_tweet(&twid).unwrap().clone(); - tweeter.set_thread(name.to_string(), twete.internal_id); - println!("Ok! Recorded {:?} as thread {}", twid, name); + if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { + tweeter.set_thread(name.to_string(), twete.internal_id); + tweeter.display_info.status(format!("Ok! Recorded {:?} as thread {}", twid, name)); + } else { + tweeter.display_info.status(format!("No tweet for id: {:?}", twid)); + } } Err(e) => { - println!("Invalid id: {}", e); + tweeter.display_info.status(format!("Invalid id: {}", e)); } } } -- cgit v1.1