aboutsummaryrefslogtreecommitdiff
path: root/src/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/fav.rs18
-rw-r--r--src/commands/follow.rs6
-rw-r--r--src/commands/look_up.rs17
-rw-r--r--src/commands/thread.rs11
-rw-r--r--src/commands/twete.rs169
-rw-r--r--src/commands/view.rs41
6 files changed, 166 insertions, 96 deletions
diff --git a/src/commands/fav.rs b/src/commands/fav.rs
index 1cb41e4..89e1987 100644
--- a/src/commands/fav.rs
+++ b/src/commands/fav.rs
@@ -15,13 +15,14 @@ pub static UNFAV: Command = Command {
};
fn unfav(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
- // TODO handle this unwrap
-// let inner_twid = u64::from_str(&line).unwrap();
let maybe_id = TweetId::parse(line.to_owned());
match maybe_id {
Ok(twid) => {
- let twete = tweeter.retrieve_tweet(&twid).unwrap();
- queryer.do_api_post(&format!("{}?id={}", UNFAV_TWEET_URL, twete.id));
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { // TODO: no clone when this stops taking &mut self
+ queryer.do_api_post(&format!("{}?id={}", UNFAV_TWEET_URL, twete.id));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id: {:?}", twid));
+ }
}
Err(e) => {
println!("Invalid id: {}", e);
@@ -36,12 +37,15 @@ pub static FAV: Command = Command {
};
fn fav(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
- // TODO handle this unwrap
let maybe_id = TweetId::parse(line.to_owned());
match maybe_id {
Ok(twid) => {
- let twete = tweeter.retrieve_tweet(&twid).unwrap();
- queryer.do_api_post(&format!("{}?id={}", FAV_TWEET_URL, twete.id));
+ // tweeter.to_twitter_tweet_id(twid)...
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { // TODO: no clone when this stops taking &mut self
+ queryer.do_api_post(&format!("{}?id={}", FAV_TWEET_URL, twete.id));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id: {:?}", twid));
+ }
}
Err(e) => {
println!("Invalid id: {}", e);
diff --git a/src/commands/follow.rs b/src/commands/follow.rs
index b2f0aa6..ad121e5 100644
--- a/src/commands/follow.rs
+++ b/src/commands/follow.rs
@@ -13,8 +13,7 @@ pub static UNFOLLOW: Command = Command {
};
fn unfl(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
- // TODO handle this unwrap
- let screen_name = line.trim(); //u64::from_str(&line).unwrap();
+ let screen_name = line.trim();
queryer.do_api_post(&format!("{}?screen_name={}", FOLLOW_URL, screen_name));
}
@@ -25,7 +24,6 @@ pub static FOLLOW: Command = Command {
};
fn fl(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
- // TODO handle this unwrap
- let screen_name = line.trim(); //u64::from_str(&line).unwrap();
+ let screen_name = line.trim();
println!("fl resp: {:?}", queryer.do_api_post(&format!("{}?screen_name={}", UNFOLLOW_URL, screen_name)));
}
diff --git a/src/commands/look_up.rs b/src/commands/look_up.rs
index 386fade..701ce2d 100644
--- a/src/commands/look_up.rs
+++ b/src/commands/look_up.rs
@@ -1,4 +1,6 @@
use tw;
+use tw::TweetId;
+use display;
use ::Queryer;
use commands::Command;
@@ -25,9 +27,16 @@ pub static LOOK_UP_TWEET: Command = Command {
// TODO: make this parse a proper tweet id
fn look_up_tweet(line: String, tweeter: &mut tw::TwitterCache, mut queryer: &mut Queryer) {
- if let Some(tweet) = tweeter.fetch_tweet(&line, &mut queryer) {
- println!("{:?}", tweet);
- } else {
-// println!("Couldn't retrieve {}", tweetid);
+ match TweetId::parse(line) {
+ Ok(twid) => {
+ if let Some(tweet) = tweeter.fetch_tweet(&twid, &mut queryer).map(|x| x.clone()) {
+ tweeter.display_info.recv(display::Infos::Tweet(twid));
+ } else {
+ tweeter.display_info.status(format!("Couldn't retrieve {:?}", twid));
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id {:?}", e));
+ }
}
}
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));
}
}
}
diff --git a/src/commands/twete.rs b/src/commands/twete.rs
index 9f5cb0d..b0530c8 100644
--- a/src/commands/twete.rs
+++ b/src/commands/twete.rs
@@ -18,9 +18,19 @@ 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.retrieve_tweet(&TweetId::Bare(inner_twid)).unwrap();
- queryer.do_api_post(&format!("{}/{}.json", DEL_TWEET_URL, twete.id));
+ match TweetId::parse(line.clone()) {
+ Ok(twid) => {
+ // TODO this really converts twid to a TweetId::Twitter
+ if let Some(twitter_id) = tweeter.retrieve_tweet(&twid).map(|x| x.id.to_owned()) {
+ queryer.do_api_post(&format!("{}/{}.json", DEL_TWEET_URL, twitter_id));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id {:?}", twid));
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id: {:?}", line));
+ }
+ }
}
pub static TWETE: Command = Command {
@@ -55,19 +65,23 @@ fn thread(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
let reply = reply_bare.trim();
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.retrieve_tweet(&TweetId::Bare(inner_twid)).map(|x| x.clone()) {
- 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 {
- let substituted = ::url_encode(reply);
- queryer.do_api_post(&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id));
- } else {
- println!("you can only thread your own tweets");
- // ask if it should .@ instead?
+ let maybe_id = TweetId::parse(id_str.to_owned());
+ match maybe_id {
+ Ok(twid) => {
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { // TODO: no clone when this stops taking &mut self
+ 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 {
+ let substituted = ::url_encode(reply);
+ queryer.do_api_post(&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id));
+ } else {
+ println!("you can only thread your own tweets");
+ // ask if it should .@ instead?
+ }
}
- let substituted = ::url_encode(reply);
- queryer.do_api_post(&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id));
+ }
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id: {}", e));
}
}
} else {
@@ -91,36 +105,43 @@ fn rep(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
let reply = reply_bare.trim();
let id_str = text.trim();
if reply.len() > 0 {
- if let Some(inner_twid) = u64::from_str(&id_str).ok() {
- // TODO: probably should just have Tweet impl Copy or something
- if let Some(twete) = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)).map(|x| x.clone()) {
- // 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(); //std::collections::HashSet::new();
- /*
- for handle in twete.get_mentions() {
- ats.insert(handle);
- }
- */
- ats.remove_item(&author_handle);
- ats.insert(0, author_handle);
- if let Some(rt_tweet) = twete.rt_tweet.and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))).map(|x| x.clone()) {
- 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.and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))).map(|x| x.clone()) {
- // 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);
+ let maybe_id = TweetId::parse(id_str.to_owned());
+ match maybe_id {
+ Ok(twid) => {
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { // TODO: no clone when this stops taking &mut self
+ // 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(); //std::collections::HashSet::new();
+ /*
+ for handle in twete.get_mentions() {
+ ats.insert(handle);
+ }
+ */
+ ats.remove_item(&author_handle);
+ ats.insert(0, author_handle);
+ if let Some(rt_tweet) = twete.rt_tweet.and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))).map(|x| x.clone()) {
+ 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.and_then(|id| tweeter.retrieve_tweet(&TweetId::Twitter(id))).map(|x| x.clone()) {
+ // 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);
+ }
+ //let ats_vec: Vec<&str> = ats.into_iter().collect();
+ //let full_reply = format!("{} {}", ats_vec.join(" "), reply);
+ let decorated_ats: Vec<String> = ats.into_iter().map(|x| format!("@{}", x)).collect();
+ let full_reply = format!("{} {}", decorated_ats.join(" "), reply);
+ let substituted = ::url_encode(&full_reply);
+ // println!("{}", (&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id)));
+ queryer.do_api_post(&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id: {:?}", twid));
}
- //let ats_vec: Vec<&str> = ats.into_iter().collect();
- //let full_reply = format!("{} {}", ats_vec.join(" "), reply);
- let decorated_ats: Vec<String> = ats.into_iter().map(|x| format!("@{}", x)).collect();
- let full_reply = format!("{} {}", decorated_ats.join(" "), reply);
- let substituted = ::url_encode(&full_reply);
-// println!("{}", (&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id)));
- queryer.do_api_post(&format!("{}?status={}&in_reply_to_status_id={}", CREATE_TWEET_URL, substituted, twete.id));
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Cannot parse input: {:?}", id_str));
}
}
} else {
@@ -144,24 +165,32 @@ fn quote(line: String, tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
let reply = reply_bare.trim();
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.retrieve_tweet(&TweetId::Bare(inner_twid)).map(|x| x.clone()) {
- let substituted = ::url_encode(reply);
- let attachment_url = ::url_encode(
- &format!(
- "https://www.twitter.com/{}/status/{}",
- tweeter.retrieve_user(&twete.author_id).unwrap().handle,
- twete.id
- )
- );
- println!("{}", substituted);
- queryer.do_api_post(
- &format!("{}?status={}&attachment_url={}",
- CREATE_TWEET_URL,
- substituted,
- attachment_url
- )
- );
+ let maybe_id = TweetId::parse(id_str.to_owned());
+ match maybe_id {
+ Ok(twid) => {
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) { // TODO: no clone when this stops taking &mut self
+ let substituted = ::url_encode(reply);
+ let attachment_url = ::url_encode(
+ &format!(
+ "https://www.twitter.com/{}/status/{}",
+ tweeter.retrieve_user(&twete.author_id).unwrap().handle, // TODO: for now this is ok ish, if we got the tweet we have the author
+ twete.id
+ )
+ );
+ println!("{}", substituted);
+ queryer.do_api_post(
+ &format!("{}?status={}&attachment_url={}",
+ CREATE_TWEET_URL,
+ substituted,
+ attachment_url
+ )
+ );
+ } else {
+ tweeter.display_info.status(format!("No tweet found for id {:?}", twid));
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id: {:?}", id_str));
}
}
} else {
@@ -179,8 +208,18 @@ 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.retrieve_tweet(&TweetId::Bare(inner_twid)).unwrap();
- queryer.do_api_post(&format!("{}/{}.json", RT_TWEET_URL, twete.id));
+ match TweetId::parse(line.clone()) {
+ Ok(twid) => {
+ // TODO this really converts twid to a TweetId::Twitter
+ if let Some(twitter_id) = tweeter.retrieve_tweet(&twid).map(|x| x.id.to_owned()) {
+ queryer.do_api_post(&format!("{}/{}.json", RT_TWEET_URL, twitter_id));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id {:?}", twid));
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id: {:?}", line));
+ }
+ }
}
diff --git a/src/commands/view.rs b/src/commands/view.rs
index e9b38ee..a6ce647 100644
--- a/src/commands/view.rs
+++ b/src/commands/view.rs
@@ -16,10 +16,18 @@ pub static VIEW: Command = Command {
};
fn view(line: String, tweeter: &mut tw::TwitterCache, _queryer: &mut Queryer) {
- // TODO handle this unwrap
- let inner_twid = u64::from_str(&line).unwrap();
- let twete = tweeter.retrieve_tweet(&TweetId::Bare(inner_twid)).unwrap().clone();
- tweeter.display_info.recv(display::Infos::Tweet(TweetId::Twitter(twete.id.to_owned())));
+ match TweetId::parse(line) {
+ Ok(twid) => {
+ if let Some(twete) = tweeter.retrieve_tweet(&twid).map(|x| x.clone()) {
+ tweeter.display_info.recv(display::Infos::Tweet(TweetId::Twitter(twete.id.to_owned())));
+ } else {
+ tweeter.display_info.status(format!("No tweet for id {:?}", twid));
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id {:?}", e));
+ }
+ }
// display::render_twete(&twete.id, tweeter);
// println!(" link: https://twitter.com/i/web/status/{}", twete.id);
}
@@ -32,14 +40,23 @@ pub static VIEW_THREAD: Command = Command {
fn view_tr(line: String, mut tweeter: &mut tw::TwitterCache, queryer: &mut Queryer) {
let mut thread: Vec<TweetId> = Vec::new();
- let inner_twid = u64::from_str(&line).unwrap();
- let curr_id = TweetId::Bare(inner_twid);
- let mut maybe_next_id = tweeter.retrieve_tweet(&curr_id).and_then(|x| x.reply_to_tweet.to_owned());
- thread.push(curr_id);
- while let Some(next_id) = maybe_next_id {
- let curr_id = TweetId::Twitter(next_id);
- maybe_next_id = tweeter.retrieve_tweet(&curr_id).and_then(|x| x.reply_to_tweet.to_owned());
- thread.push(curr_id);
+ let maybe_curr_id = TweetId::parse(line);
+ match maybe_curr_id {
+ Ok(curr_id) => {
+ let first_twete = tweeter.fetch_tweet(&curr_id, queryer).map(|x| x.to_owned());
+ if first_twete.is_some() {
+ thread.push(curr_id);
+ }
+ let mut maybe_next_id = first_twete.and_then(|x| x.reply_to_tweet.to_owned());
+ while let Some(next_id) = maybe_next_id {
+ let curr_id = TweetId::Twitter(next_id);
+ maybe_next_id = tweeter.fetch_tweet(&curr_id, queryer).and_then(|x| x.reply_to_tweet.to_owned());
+ thread.push(curr_id);
+ }
+ },
+ Err(e) => {
+ tweeter.display_info.status(format!("Invalid id {:?}", e));
+ }
}
tweeter.display_info.recv(display::Infos::Thread(thread));