From bf7f5d32a7f05bb0a7bc19dcb443d3df439243ba Mon Sep 17 00:00:00 2001
From: Andy Wortman <ixineeringeverywhere@gmail.com>
Date: Fri, 27 Oct 2017 01:23:05 -0700
Subject: better error handling in cases where event json changes

---
 src/tw/mod.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/tw/mod.rs')

diff --git a/src/tw/mod.rs b/src/tw/mod.rs
index 5f40c5e..d0bad59 100644
--- a/src/tw/mod.rs
+++ b/src/tw/mod.rs
@@ -257,7 +257,6 @@ fn parse_word_command<'a, 'b>(line: &'b str, commands: &[&'a Command]) -> Option
             }
         } else if line.starts_with(cmd.keyword) {
             if line.find(" ").map(|x| x == cmd.keyword.len()).unwrap_or(false) {
-                // let inner_twid = u64::from_str(&linestr.split(" ").collect::<Vec<&str>>()[1]).unwrap();
                 return Some((line.get((cmd.keyword.len() + 1)..).unwrap().trim(), &cmd));
             }
         }
@@ -641,10 +640,13 @@ fn handle_twitter_event(
     tweeter: &mut TwitterCache,
     mut queryer: &mut ::Queryer) {
     tweeter.cache_api_event(structure.clone(), &mut queryer);
-    if let Some(event) = events::Event::from_json(structure) {
-        tweeter.display_info.recv(display::Infos::Event(event));
-    } else {
-        // ought to handle the None case...
+    match events::Event::from_json(structure) {
+        Ok(event) => {
+            tweeter.display_info.recv(display::Infos::Event(event));
+        },
+        Err(e) => {
+            tweeter.display_info.status(format!("Unknown twitter json: {:?}", e));
+        }
     }
 }
 
-- 
cgit v1.1