X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/d90f61a7db7adadd41a4050c6e1a0a74e7456464..9185ab0c0a2ea1db12bcb31f81aba7f54c36bdbc:/bti.c diff --git a/bti.c b/bti.c index 20e6d7b..b5a01d3 100644 --- a/bti.c +++ b/bti.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2008 Greg Kroah-Hartman + * Copyright (C) 2008-2010 Greg Kroah-Hartman * Copyright (C) 2009 Bart Trojanowski - * Copyright (C) 2009 Amir Mohammad Saied + * Copyright (C) 2009-2010 Amir Mohammad Saied * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -40,7 +40,7 @@ #include #include #include - +#include "bti.h" #define zalloc(size) calloc(size, 1) @@ -53,87 +53,35 @@ static int debug; -static int verbose; - -enum host { - HOST_TWITTER = 0, - HOST_IDENTICA = 1, - HOST_CUSTOM = 2 -}; - -enum action { - ACTION_UPDATE = 0, - ACTION_FRIENDS = 1, - ACTION_USER = 2, - ACTION_REPLIES = 4, - ACTION_PUBLIC = 8, - ACTION_GROUP = 16, - ACTION_UNKNOWN = 32 -}; - -struct session { - char *password; - char *account; - char *consumer_key; - char *consumer_secret; - char *access_token_key; - char *access_token_secret; - char *tweet; - char *proxy; - char *time; - char *homedir; - char *logfile; - char *user; - char *group; - char *hosturl; - char *hostname; - char *configfile; - char *replyto; - int bash; - int interactive; - int shrink_urls; - int dry_run; - int page; - int no_oauth; - enum host host; - enum action action; - void *readline_handle; - char *(*readline)(const char *); -}; - -struct bti_curl_buffer { - char *data; - enum action action; - int length; -}; static void display_help(void) { - fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"); - fprintf(stdout, "Version: " VERSION "\n"); - fprintf(stdout, "Usage:\n"); - fprintf(stdout, " bti [options]\n"); - fprintf(stdout, "options are:\n"); - fprintf(stdout, " --account accountname\n"); - fprintf(stdout, " --password password\n"); - fprintf(stdout, " --action action\n"); - fprintf(stdout, " ('update', 'friends', 'public', 'replies', " - "'group' or 'user')\n"); - fprintf(stdout, " --user screenname\n"); - fprintf(stdout, " --group groupname\n"); - fprintf(stdout, " --proxy PROXY:PORT\n"); - fprintf(stdout, " --host HOST\n"); - fprintf(stdout, " --logfile logfile\n"); - fprintf(stdout, " --config configfile\n"); - fprintf(stdout, " --replyto ID\n"); - fprintf(stdout, " --shrink-urls\n"); - fprintf(stdout, " --page PAGENUMBER\n"); - fprintf(stdout, " --bash\n"); - fprintf(stdout, " --debug\n"); - fprintf(stdout, " --verbose\n"); - fprintf(stdout, " --dry-run\n"); - fprintf(stdout, " --version\n"); - fprintf(stdout, " --help\n"); + fprintf(stdout, "bti - send tweet to twitter or identi.ca\n" + "Version: %s\n" + "Usage:\n" + " bti [options]\n" + "options are:\n" + " --account accountname\n" + " --password password\n" + " --action action\n" + " ('update', 'friends', 'public', 'replies', or 'user')\n" + " --user screenname\n" + " --group groupname\n" + " --proxy PROXY:PORT\n" + " --host HOST\n" + " --logfile logfile\n" + " --config configfile\n" + " --replyto ID\n" + " --retweet ID\n" + " --shrink-urls\n" + " --page PAGENUMBER\n" + " --bash\n" + " --background\n" + " --debug\n" + " --verbose\n" + " --dry-run\n" + " --version\n" + " --help\n", VERSION); } static void display_version(void) @@ -251,6 +199,7 @@ static void session_free(struct session *session) { if (!session) return; + free(session->retweet); free(session->replyto); free(session->password); free(session->account); @@ -306,7 +255,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="; @@ -316,6 +265,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) @@ -333,7 +283,8 @@ static CURL *curl_init(void) return curl; } -static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) +static void parse_statuses(struct session *session, + xmlDocPtr doc, xmlNodePtr current) { xmlChar *text = NULL; xmlChar *user = NULL; @@ -363,7 +314,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) } if (user && text && created && id) { - if (verbose) + if (session->verbose) printf("[%s] {%s} (%.16s) %s\n", user, id, created, text); else @@ -385,7 +336,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) return; } -static void parse_timeline(char *document) +static void parse_timeline(char *document, struct session *session) { xmlDocPtr doc; xmlNodePtr current; @@ -411,7 +362,7 @@ static void parse_timeline(char *document) current = current->xmlChildrenNode; while (current != NULL) { if ((!xmlStrcmp(current->name, (const xmlChar *)"status"))) - parse_statuses(doc, current); + parse_statuses(session, doc, current); current = current->next; } xmlFreeDoc(doc); @@ -440,7 +391,7 @@ static size_t curl_callback(void *buffer, size_t size, size_t nmemb, memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size); curl_buf->length += buffer_size; if (curl_buf->action) - parse_timeline(curl_buf->data); + parse_timeline(curl_buf->data, curl_buf->session); dbg("%s\n", curl_buf->data); @@ -489,7 +440,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; @@ -524,9 +475,10 @@ static int request_access_token(struct session *session) free(reply); - fprintf(stdout, "Please open the following link in your browser, and "); - fprintf(stdout, "allow 'bti' to access your account. Then paste "); - fprintf(stdout, "back the provided PIN in here.\n"); + fprintf(stdout, + "Please open the following link in your browser, and " + "allow 'bti' to access your account. Then paste " + "back the provided PIN in here.\n"); if (session->host == HOST_TWITTER) { fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key); verifier = session->readline(NULL); @@ -552,10 +504,12 @@ static int request_access_token(struct session *session) free(reply); - fprintf(stdout, "Please put these two lines in your bti "); - fprintf(stdout, "configuration file (~/.bti):\n"); - fprintf(stdout, "access_token_key=%s\n", at_key); - fprintf(stdout, "access_token_secret=%s\n", at_secret); + fprintf(stdout, + "Please put these two lines in your bti " + "configuration file (~/.bti):\n" + "access_token_key=%s\n" + "access_token_secret=%s\n", + at_key, at_secret); return 0; } @@ -583,10 +537,11 @@ 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; + curl_buf->session = session; curl = curl_init(); if (!curl) @@ -681,7 +636,7 @@ static int send_request(struct session *session) curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf); if (!session->dry_run) { res = curl_easy_perform(curl); - if (res && !session->bash) { + if (res && !session->background) { fprintf(stderr, "error(%d) trying to perform " "operation\n", res); return -EINVAL; @@ -696,8 +651,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: @@ -722,33 +686,42 @@ 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) - parse_timeline(reply); + if ((session->action != ACTION_UPDATE) && + (session->action != ACTION_RETWEET)) + parse_timeline(reply, session); } return 0; } @@ -770,6 +743,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"); @@ -867,7 +841,12 @@ static void parse_configfile(struct session *session) c += 8; if (!strncasecmp(c, "true", 4) || !strncasecmp(c, "yes", 3)) - verbose = 1; + session->verbose = 1; + } else if (!strncasecmp(c,"retweet", 7) && + (c[7] == '=')) { + c += 8; + if (c[0] != '\0') + retweet = strdup(c); } } while (!feof(config_file)); @@ -908,6 +887,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; @@ -1310,16 +1291,19 @@ int main(int argc, char *argv[], char *envp[]) { "shrink-urls", 0, NULL, 's' }, { "help", 0, NULL, 'h' }, { "bash", 0, NULL, 'b' }, + { "background", 0, NULL, 'B' }, { "dry-run", 0, NULL, 'n' }, { "page", 1, NULL, 'g' }, { "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; @@ -1328,7 +1312,6 @@ int main(int argc, char *argv[], char *envp[]) int page_nr; debug = 0; - verbose = 0; session = session_alloc(); if (!session) { @@ -1371,7 +1354,7 @@ int main(int argc, char *argv[], char *envp[]) debug = 1; break; case 'V': - verbose = 1; + session->verbose = 1; break; case 'a': if (session->account) @@ -1388,6 +1371,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); @@ -1413,6 +1400,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); @@ -1461,6 +1450,9 @@ int main(int argc, char *argv[], char *envp[]) break; case 'b': session->bash = 1; + /* fall-through intended */ + case 'B': + session->background = 1; break; case 'c': if (session->configfile) @@ -1500,10 +1492,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"); - fprintf(stderr, "Both consumer key, and consumer secret are required"); - fprintf(stderr, " 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"); @@ -1525,7 +1524,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); @@ -1534,9 +1533,8 @@ int main(int argc, char *argv[], char *envp[]) } if (session->action == ACTION_UNKNOWN) { - fprintf(stderr, "Unknown action, valid actions are:\n"); - fprintf(stderr, "'update', 'friends', 'public', " - "'replies', 'group' or 'user'.\n"); + fprintf(stderr, "Unknown action, valid actions are:\n" + "'update', 'friends', 'public', 'replies', 'group' or 'user'.\n"); goto exit; } @@ -1545,8 +1543,23 @@ 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->bash || !session->interactive) + if (session->background || !session->interactive) tweet = get_string_from_stdin(); else tweet = session->readline("tweet: "); @@ -1578,7 +1591,7 @@ int main(int argc, char *argv[], char *envp[]) /* fork ourself so that the main shell can get on * with it's life as we try to connect and handle everything */ - if (session->bash) { + if (session->background) { child = fork(); if (child) { dbg("child is %d\n", child); @@ -1587,7 +1600,7 @@ int main(int argc, char *argv[], char *envp[]) } retval = send_request(session); - if (retval && !session->bash) + if (retval && !session->background) fprintf(stderr, "operation failed\n"); log_session(session, retval);