begin conversion to typed TwitterID

1 files changed, 9 insertions, 7 deletions

diff --git a/src/commands/twete.rs b/src/commands/twete.rs
index f1f19cf..a66d5eb 100644
--- a/src/commands/twete.rs
+++ b/src/commands/twete.rs
@@ -1,6 +1,8 @@
 use tw;
 use ::Queryer;
 
+use tw::TweetId;
+
 use commands::Command;
 
 use std::str::FromStr;
@@ -17,7 +19,7 @@ pub static DEL: Command = Command {
 
 fn del(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
     let inner_twid = u64::from_str(&line).unwrap();
-    let twete = tweeter.tweet_by_innerid(inner_twid).unwrap();
+    let twete = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)).unwrap();
     queryer.do_api_post(&format!("{}/{}.json", DEL_TWEET_URL, twete.id));
 }
 
@@ -54,7 +56,7 @@ fn thread(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
         let id_str = text.trim();
         if reply.len() > 0 {
             if let Some(inner_twid) = u64::from_str(&id_str).ok() {
-                if let Some(twete) = tweeter.tweet_by_innerid(inner_twid) {
+                if let Some(twete) = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)) {
                     let handle = &tweeter.retrieve_user(&twete.author_id).unwrap().handle;
                     // TODO: definitely breaks if you change your handle right now
                     if handle == &tweeter.current_user.handle {
@@ -90,7 +92,7 @@ fn rep(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
         let id_str = text.trim();
         if reply.len() > 0 {
             if let Some(inner_twid) = u64::from_str(&id_str).ok() {
-                if let Some(twete) = tweeter.tweet_by_innerid(inner_twid) {
+                if let Some(twete) = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)) {
                     // get handles to reply to...
                     let author_handle = tweeter.retrieve_user(&twete.author_id).unwrap().handle.to_owned();
                     let mut ats: Vec<String> = twete.get_mentions().into_iter().map(|x| x.to_owned()).collect(); //std::collections::HashSet::new();
@@ -102,12 +104,12 @@ fn rep(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
                     ats.remove_item(&author_handle);
                     ats.insert(0, author_handle);
                     // no idea why i have to .to_owned() here --v-- what about twete.rt_tweet is a move?
-                    if let Some(rt_tweet) = twete.rt_tweet.to_owned().and_then(|id| tweeter.retrieve_tweet(&id)) {
+                    if let Some(rt_tweet) = twete.rt_tweet.to_owned().and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))) {
                         let rt_author_handle = tweeter.retrieve_user(&rt_tweet.author_id).unwrap().handle.to_owned();
                         ats.remove_item(&rt_author_handle);
                         ats.insert(1, rt_author_handle);
                     }
-                    if let Some(qt_tweet) = twete.quoted_tweet_id.to_owned().and_then(|id| tweeter.retrieve_tweet(&id)) {
+                    if let Some(qt_tweet) = twete.quoted_tweet_id.to_owned().and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))) {
                     //    let qt_author_handle = tweeter.retrieve_user(&qt_tweet.author_id).unwrap().handle.to_owned();
                     //    ats.remove_item(&qt_author_handle);
                     //    ats.insert(1, qt_author_handle);
@@ -143,7 +145,7 @@ fn quote(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
         let id_str = text.trim();
         if reply.len() > 0 {
             if let Some(inner_twid) = u64::from_str(&id_str).ok() {
-                if let Some(twete) = tweeter.tweet_by_innerid(inner_twid) {
+                if let Some(twete) = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)) {
                     let substituted = ::url_encode(reply);
                     let attachment_url = ::url_encode(
                         &format!(
@@ -178,7 +180,7 @@ pub static RETWETE: Command = Command {
 
 fn retwete(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
     let inner_twid = u64::from_str(&line).unwrap();
-    let twete = tweeter.tweet_by_innerid(inner_twid).unwrap();
+    let twete = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)).unwrap();
     queryer.do_api_post(&format!("{}/{}.json", RT_TWEET_URL, twete.id));
 }