X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/b093827e79dfb914ebbd57a2b61d7795f5bfa316..9b020b6e3d6c5a296d5ed5eff5e40294fbe4b3b8:/bti.c diff --git a/bti.c b/bti.c index 8e00935..e7157df 100644 --- a/bti.c +++ b/bti.c @@ -88,6 +88,7 @@ struct session { char *hosturl; char *hostname; char *configfile; + char *replyto; int bash; int interactive; int shrink_urls; @@ -124,6 +125,7 @@ static void display_help(void) 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"); @@ -249,6 +251,7 @@ static void session_free(struct session *session) { if (!session) return; + free(session->replyto); free(session->password); free(session->account); free(session->consumer_key); @@ -307,13 +310,13 @@ static const char *identica_request_token_uri = "http://identi.ca/api/oauth/requ 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="; -static const char *user_uri = "/user_timeline/"; -static const char *update_uri = "/update.xml"; -static const char *public_uri = "/public_timeline.xml"; -static const char *friends_uri = "/friends_timeline.xml"; +static const char *user_uri = "/user_timeline/"; +static const char *update_uri = "/update.xml"; +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 *group_uri = "/../statusnet/groups/timeline/"; +static const char *replies_uri = "/replies.xml"; +static const char *group_uri = "/../statusnet/groups/timeline/"; static CURL *curl_init(void) { @@ -335,6 +338,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) xmlChar *text = NULL; xmlChar *user = NULL; xmlChar *created = NULL; + xmlChar *id = NULL; xmlNodePtr userinfo; current = current->xmlChildrenNode; @@ -344,6 +348,8 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); if (!xmlStrcmp(current->name, (const xmlChar *)"text")) text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); + if (!xmlStrcmp(current->name, (const xmlChar *)"id")) + id = xmlNodeListGetString(doc, current->xmlChildrenNode, 1); if (!xmlStrcmp(current->name, (const xmlChar *)"user")) { userinfo = current->xmlChildrenNode; while (userinfo != NULL) { @@ -356,19 +362,21 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) } } - if (user && text && created) { + if (user && text && created && id) { if (verbose) - printf("[%s] (%.16s) %s\n", - user, created, text); + printf("[%s] {%s} (%.16s) %s\n", + user, id, created, text); else printf("[%s] %s\n", user, text); xmlFree(user); xmlFree(text); xmlFree(created); + xmlFree(id); user = NULL; text = NULL; created = NULL; + id = NULL; } } current = current->next; @@ -447,20 +455,20 @@ static int parse_osp_reply(const char *reply, char **token, char **secret) rc = oauth_split_url_parameters(reply, &rv); qsort(rv, rc, sizeof(char *), oauth_cmpstringp); if (rc == 2 || rc == 4) { - if (!strncmp(rv[0],"oauth_token=",11) && !strncmp(rv[1],"oauth_token_secret=",18)) { + if (!strncmp(rv[0], "oauth_token=", 11) && !strncmp(rv[1], "oauth_token_secret=", 18)) { if (token) - *token =strdup(&(rv[0][12])); + *token = strdup(&(rv[0][12])); if (secret) - *secret=strdup(&(rv[1][19])); + *secret = strdup(&(rv[1][19])); retval = 0; } } else if (rc == 3) { - if (!strncmp(rv[1],"oauth_token=",11) && !strncmp(rv[2],"oauth_token_secret=",18)) { + if (!strncmp(rv[1], "oauth_token=", 11) && !strncmp(rv[2], "oauth_token_secret=", 18)) { if (token) - *token =strdup(&(rv[1][12])); + *token = strdup(&(rv[1][12])); if (secret) - *secret=strdup(&(rv[2][19])); + *secret = strdup(&(rv[2][19])); retval = 0; } @@ -474,7 +482,6 @@ static int parse_osp_reply(const char *reply, char **token, char **secret) return retval; } - static int request_access_token(struct session *session) { @@ -562,6 +569,7 @@ static int send_request(struct session *session) char *req_url = NULL; char *reply = NULL; char *postarg = NULL; + char *escaped_tweet = NULL; int is_post = 0; if (!session) @@ -583,67 +591,73 @@ static int send_request(struct session *session) session->hosturl = strdup(twitter_host); switch (session->action) { - case ACTION_UPDATE: - snprintf(user_password, sizeof(user_password), "%s:%s", - session->account, session->password); - snprintf(data, sizeof(data), "status=\"%s\"", session->tweet); + case ACTION_UPDATE: + snprintf(user_password, sizeof(user_password), "%s:%s", + session->account, session->password); + snprintf(data, sizeof(data), "status=\"%s\"", session->tweet); + curl_formadd(&formpost, &lastptr, + CURLFORM_COPYNAME, "status", + CURLFORM_COPYCONTENTS, session->tweet, + CURLFORM_END); + + curl_formadd(&formpost, &lastptr, + CURLFORM_COPYNAME, "source", + CURLFORM_COPYCONTENTS, "bti", + CURLFORM_END); + + if (session->replyto) curl_formadd(&formpost, &lastptr, - CURLFORM_COPYNAME, "status", - CURLFORM_COPYCONTENTS, session->tweet, - CURLFORM_END); + CURLFORM_COPYNAME, "in_reply_to_status_id", + CURLFORM_COPYCONTENTS, session->replyto, + CURLFORM_END); - curl_formadd(&formpost, &lastptr, - CURLFORM_COPYNAME, "source", - CURLFORM_COPYCONTENTS, "bti", - CURLFORM_END); - - curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); - slist = curl_slist_append(slist, "Expect:"); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); - - sprintf(endpoint, "%s%s", session->hosturl, update_uri); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); - - break; - case ACTION_FRIENDS: - snprintf(user_password, sizeof(user_password), "%s:%s", - session->account, session->password); - sprintf(endpoint, "%s%s?page=%d", session->hosturl, - friends_uri, session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); - - break; - case ACTION_USER: - sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, - user_uri, session->user, session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - - break; - case ACTION_REPLIES: - snprintf(user_password, sizeof(user_password), "%s:%s", - session->account, session->password); - sprintf(endpoint, "%s%s?page=%d", session->hosturl, replies_uri, - session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); - - break; - case ACTION_PUBLIC: - sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri, - session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - - break; - case ACTION_GROUP: - sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, - group_uri, session->group, session->page); - curl_easy_setopt(curl, CURLOPT_URL, endpoint); - - break; - default: - break; + curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); + slist = curl_slist_append(slist, "Expect:"); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); + + sprintf(endpoint, "%s%s", session->hosturl, update_uri); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); + break; + + case ACTION_FRIENDS: + snprintf(user_password, sizeof(user_password), "%s:%s", + session->account, session->password); + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + friends_uri, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); + break; + + case ACTION_USER: + sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, + user_uri, session->user, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + break; + + case ACTION_REPLIES: + snprintf(user_password, sizeof(user_password), "%s:%s", + session->account, session->password); + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + replies_uri, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + curl_easy_setopt(curl, CURLOPT_USERPWD, user_password); + break; + + case ACTION_PUBLIC: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + public_uri, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + break; + + case ACTION_GROUP: + sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, + group_uri, session->group, session->page); + curl_easy_setopt(curl, CURLOPT_URL, endpoint); + break; + + default: + break; } if (session->proxy) @@ -673,36 +687,34 @@ static int send_request(struct session *session) bti_curl_buffer_free(curl_buf); } else { switch (session->action) { - case ACTION_UPDATE: - sprintf(endpoint, - "%s%s?status=%s", - session->hosturl, update_uri, session->tweet); - is_post = 1; - break; - case ACTION_USER: - sprintf(endpoint, "%s%s%s.xml?page=%d", - session->hosturl, user_uri, - session->user, session->page); - break; - case ACTION_REPLIES: - sprintf(endpoint, "%s%s?page=%d", - session->hosturl, mentions_uri, session->page); - break; - case ACTION_PUBLIC: - sprintf(endpoint, "%s%s?page=%d", - session->hosturl, public_uri, session->page); - break; - case ACTION_GROUP: - sprintf(endpoint, "%s%s%s.xml?page=%d", - session->hosturl, group_uri, - session->group, session->page); - break; - case ACTION_FRIENDS: - sprintf(endpoint, "%s%s?page=%d", - session->hosturl, friends_uri, session->page); - break; - default: - break; + case ACTION_UPDATE: + escaped_tweet = oauth_url_escape(session->tweet); + sprintf(endpoint, "%s%s?status=%s", session->hosturl, + update_uri, escaped_tweet); + is_post = 1; + break; + case ACTION_USER: + sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, + user_uri, session->user, session->page); + break; + case ACTION_REPLIES: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + mentions_uri, session->page); + break; + case ACTION_PUBLIC: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + public_uri, session->page); + break; + case ACTION_GROUP: + sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, + group_uri, session->group, session->page); + break; + case ACTION_FRIENDS: + sprintf(endpoint, "%s%s?page=%d", session->hosturl, + friends_uri, session->page); + break; + default: + break; } if (is_post) { @@ -748,6 +760,7 @@ static void parse_configfile(struct session *session) char *logfile = NULL; char *action = NULL; char *user = NULL; + char *replyto = NULL; int shrink_urls = 0; config_file = fopen(session->configfile, "r"); @@ -819,6 +832,11 @@ static void parse_configfile(struct session *session) c += 8; if (c[0] != '\0') logfile = strdup(c); + } else if (!strncasecmp(c, "replyto", 7) && + (c[7] == '=')) { + c += 8; + if (c[0] != '\0') + replyto = strdup(c); } else if (!strncasecmp(c, "action", 6) && (c[6] == '=')) { c += 7; @@ -879,6 +897,8 @@ static void parse_configfile(struct session *session) } if (logfile) session->logfile = logfile; + if (replyto) + session->replyto = replyto; if (action) { if (strcasecmp(action, "update") == 0) session->action = ACTION_UPDATE; @@ -1285,6 +1305,7 @@ int main(int argc, char *argv[], char *envp[]) { "page", 1, NULL, 'g' }, { "version", 0, NULL, 'v' }, { "config", 1, NULL, 'c' }, + { "replyto", 1, NULL, 'r' }, { } }; struct session *session; @@ -1331,7 +1352,7 @@ int main(int argc, char *argv[], char *envp[]) parse_configfile(session); while (1) { - option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:snVv", + option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:sr:nVv", options, NULL); if (option == -1) break; @@ -1353,6 +1374,10 @@ int main(int argc, char *argv[], char *envp[]) dbg("page = %d\n", page_nr); session->page = page_nr; break; + case 'r': + session->replyto = strdup(optarg); + dbg("in_reply_to_status_id = %s\n", session->replyto); + break; case 'p': if (session->password) free(session->password); @@ -1474,25 +1499,27 @@ int main(int argc, char *argv[], char *envp[]) goto exit; } } else { - if (!session->consumer_key || !session->consumer_secret) { + if (!session->consumer_key || !session->consumer_secret) session->no_oauth = 1; - } } - + if (session->no_oauth) { if (!session->account) { - fprintf(stdout, "Enter account for %s: ", session->hostname); + fprintf(stdout, "Enter account for %s: ", + session->hostname); session->account = session->readline(NULL); } if (!session->password) { - read_password(password, sizeof(password), session->hostname); + read_password(password, sizeof(password), + session->hostname); session->password = strdup(password); } } else { - if (!session->access_token_key || !session->access_token_secret) { + if (!session->access_token_key || + !session->access_token_secret) { request_access_token(session); goto exit; - } + } } if (session->action == ACTION_UNKNOWN) {