]> ToastFreeware Gitweb - gregoa/bti.git/blobdiff - bti.c
Merge branch 'oauth-readme' of https://github.com/agimenez/bti into agimenez-oauth...
[gregoa/bti.git] / bti.c
diff --git a/bti.c b/bti.c
index c06bdce6bd4040073de5c3716d3220f8879c7b04..4ad5b541052a2ce7115a1255fca341e98404e194 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -68,7 +68,8 @@ enum action {
        ACTION_REPLIES = 4,
        ACTION_PUBLIC  = 8,
        ACTION_GROUP   = 16,
-       ACTION_UNKNOWN = 32
+       ACTION_RETWEET = 32,
+       ACTION_UNKNOWN = 64
 };
 
 struct session {
@@ -89,6 +90,7 @@ struct session {
        char *hostname;
        char *configfile;
        char *replyto;
+       char *retweet;
        int bash;
        int background;
        int interactive;
@@ -96,6 +98,7 @@ struct session {
        int dry_run;
        int page;
        int no_oauth;
+       int guest;
        enum host host;
        enum action action;
        void *readline_handle;
@@ -126,6 +129,7 @@ static void display_help(void)
                "  --logfile logfile\n"
                "  --config configfile\n"
                "  --replyto ID\n"
+               "  --retweet ID\n"
                "  --shrink-urls\n"
                "  --page PAGENUMBER\n"
                "  --bash\n"
@@ -252,6 +256,7 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
+       free(session->retweet);
        free(session->replyto);
        free(session->password);
        free(session->account);
@@ -307,7 +312,7 @@ static const char identica_name[] = "identi.ca";
 static const char twitter_request_token_uri[]  = "http://twitter.com/oauth/request_token";
 static const char twitter_access_token_uri[]   = "http://twitter.com/oauth/access_token";
 static const char twitter_authorize_uri[]      = "http://twitter.com/oauth/authorize?oauth_token=";
-static const char identica_request_token_uri[] = "http://identi.ca/api/oauth/request_token";
+static const char identica_request_token_uri[] = "http://identi.ca/api/oauth/request_token?oauth_callback=oob";
 static const char identica_access_token_uri[]  = "http://identi.ca/api/oauth/access_token";
 static const char identica_authorize_uri[]     = "http://identi.ca/api/oauth/authorize?oauth_token=";
 
@@ -317,6 +322,7 @@ static const char public_uri[]   = "/public_timeline.xml";
 static const char friends_uri[]  = "/friends_timeline.xml";
 static const char mentions_uri[] = "/mentions.xml";
 static const char replies_uri[]  = "/replies.xml";
+static const char retweet_uri[]  = "/retweet/";
 static const char group_uri[]    = "/../statusnet/groups/timeline/";
 
 static CURL *curl_init(void)
@@ -490,7 +496,7 @@ static int request_access_token(struct session *session)
 {
        char *post_params = NULL;
        char *request_url = NULL;
-       char *reply    = NULL;
+       char *reply       = NULL;
        char *at_key      = NULL;
        char *at_secret   = NULL;
        char *verifier    = NULL;
@@ -587,7 +593,7 @@ static int send_request(struct session *session)
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 
-       if (session->no_oauth) {
+       if (session->no_oauth || session->guest) {
                curl_buf = bti_curl_buffer_alloc(session->action);
                if (!curl_buf)
                        return -ENOMEM;
@@ -700,8 +706,17 @@ static int send_request(struct session *session)
                switch (session->action) {
                case ACTION_UPDATE:
                        escaped_tweet = oauth_url_escape(session->tweet);
-                       sprintf(endpoint, "%s%s?status=%s", session->hosturl,
-                               update_uri, escaped_tweet);
+                       if (session->replyto) {
+                               sprintf(endpoint,
+                                       "%s%s?status=%s&in_reply_to_status_id=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet, session->replyto);
+                       } else {
+                               sprintf(endpoint, "%s%s?status=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet);
+                       }
+
                        is_post = 1;
                        break;
                case ACTION_USER:
@@ -726,32 +741,41 @@ static int send_request(struct session *session)
                        sprintf(endpoint, "%s%s?page=%d", session->hosturl,
                                friends_uri, session->page);
                        break;
+               case ACTION_RETWEET:
+                       sprintf(endpoint, "%s%s%s.xml", session->hosturl,
+                               retweet_uri, session->retweet);
+                       is_post = 1;
+                       break;
                default:
                        break;
                }
 
-               if (is_post) {
-                       req_url = oauth_sign_url2(endpoint, &postarg, OA_HMAC,
-                                                 NULL, session->consumer_key,
-                                                 session->consumer_secret,
-                                                 session->access_token_key,
-                                                 session->access_token_secret);
-                       reply = oauth_http_post(req_url, postarg);
-               } else {
-                       req_url = oauth_sign_url2(endpoint, NULL, OA_HMAC, NULL,
-                                                 session->consumer_key,
-                                                 session->consumer_secret,
-                                                 session->access_token_key,
-                                                 session->access_token_secret);
-                       reply = oauth_http_get(req_url, postarg);
-               }
+               dbg("%s\n", endpoint);
+               if (!session->dry_run) {
+                       if (is_post) {
+                               req_url = oauth_sign_url2(endpoint, &postarg, OA_HMAC,
+                                                         NULL, session->consumer_key,
+                                                         session->consumer_secret,
+                                                         session->access_token_key,
+                                                         session->access_token_secret);
+                               reply = oauth_http_post(req_url, postarg);
+                       } else {
+                               req_url = oauth_sign_url2(endpoint, NULL, OA_HMAC, NULL,
+                                                         session->consumer_key,
+                                                         session->consumer_secret,
+                                                         session->access_token_key,
+                                                         session->access_token_secret);
+                               reply = oauth_http_get(req_url, postarg);
+                       }
 
-               dbg("%s\n", req_url);
-               dbg("%s\n", reply);
-               if (req_url)
-                       free(req_url);
+                       dbg("%s\n", req_url);
+                       dbg("%s\n", reply);
+                       if (req_url)
+                               free(req_url);
+               }
 
-               if (session->action != ACTION_UPDATE)
+               if ((session->action != ACTION_UPDATE) &&
+                               (session->action != ACTION_RETWEET))
                        parse_timeline(reply);
        }
        return 0;
@@ -774,6 +798,7 @@ static void parse_configfile(struct session *session)
        char *action = NULL;
        char *user = NULL;
        char *replyto = NULL;
+       char *retweet = NULL;
        int shrink_urls = 0;
 
        config_file = fopen(session->configfile, "r");
@@ -872,6 +897,11 @@ static void parse_configfile(struct session *session)
                        if (!strncasecmp(c, "true", 4) ||
                                        !strncasecmp(c, "yes", 3))
                                verbose = 1;
+               } else if (!strncasecmp(c,"retweet", 7) &&
+                               (c[7] == '=')) {
+                       c += 8;
+                       if (c[0] != '\0')
+                               retweet = strdup(c);
                }
        } while (!feof(config_file));
 
@@ -912,6 +942,8 @@ static void parse_configfile(struct session *session)
                session->logfile = logfile;
        if (replyto)
                session->replyto = replyto;
+       if (retweet)
+               session->retweet = retweet;
        if (action) {
                if (strcasecmp(action, "update") == 0)
                        session->action = ACTION_UPDATE;
@@ -1320,11 +1352,13 @@ int main(int argc, char *argv[], char *envp[])
                { "version", 0, NULL, 'v' },
                { "config", 1, NULL, 'c' },
                { "replyto", 1, NULL, 'r' },
+               { "retweet", 1, NULL, 'w' },
                { }
        };
        struct session *session;
        pid_t child;
        char *tweet;
+       char *retweet;
        static char password[80];
        int retval = 0;
        int option;
@@ -1393,6 +1427,10 @@ int main(int argc, char *argv[], char *envp[])
                        session->replyto = strdup(optarg);
                        dbg("in_reply_to_status_id = %s\n", session->replyto);
                        break;
+               case 'w':
+                       session->retweet = strdup(optarg);
+                       dbg("Retweet ID = %s\n", session->retweet);
+                       break;
                case 'p':
                        if (session->password)
                                free(session->password);
@@ -1418,6 +1456,8 @@ int main(int argc, char *argv[], char *envp[])
                                session->action = ACTION_PUBLIC;
                        else if (strcasecmp(optarg, "group") == 0)
                                session->action = ACTION_GROUP;
+                       else if (strcasecmp(optarg,"retweet") == 0)
+                               session->action = ACTION_RETWEET;
                        else
                                session->action = ACTION_UNKNOWN;
                        dbg("action = %d\n", session->action);
@@ -1508,11 +1548,17 @@ int main(int argc, char *argv[], char *envp[])
 
        if (session->host == HOST_TWITTER) {
                if (!session->consumer_key || !session->consumer_secret) {
-                       fprintf(stderr,
-                               "Twitter no longer supports HTTP basic authentication.\n"
-                               "Both consumer key, and consumer secret are required"
-                               " for bti in order to behave as an OAuth consumer.\n");
-                       goto exit;
+                       if (session->action == ACTION_USER ||
+                                       session->action == ACTION_PUBLIC) {
+                               /* Some actions may still work without authentication */
+                               session->guest = 1;
+                       } else {
+                               fprintf(stderr,
+                                               "Twitter no longer supports HTTP basic authentication.\n"
+                                               "Both consumer key, and consumer secret are required"
+                                               " for bti in order to behave as an OAuth consumer.\n");
+                               goto exit;
+                       }
                }
                if (session->action == ACTION_GROUP) {
                        fprintf(stderr, "Groups only work in Identi.ca.\n");
@@ -1534,7 +1580,7 @@ int main(int argc, char *argv[], char *envp[])
                                      session->hostname);
                        session->password = strdup(password);
                }
-       } else {
+       } else if (!session->guest) {
                if (!session->access_token_key ||
                    !session->access_token_secret) {
                        request_access_token(session);
@@ -1553,6 +1599,21 @@ int main(int argc, char *argv[], char *envp[])
                session->group = session->readline(NULL);
        }
 
+       if (session->action == ACTION_RETWEET) {
+               fprintf(stdout, "Status ID to retweet: ");
+               retweet = get_string_from_stdin();
+
+               if (!retweet || strlen(retweet) == 0) {
+                       dbg("no retweet?\n");
+                       return -1;
+               }
+
+               session->retweet = zalloc(strlen(retweet) + 10);
+               sprintf(session->retweet,"%s", retweet);
+               free(retweet);
+               dbg("retweet ID = %s\n", session->retweet);
+       }
+
        if (session->action == ACTION_UPDATE) {
                if (session->background || !session->interactive)
                        tweet = get_string_from_stdin();