From c6264e108763f62d12f81e4682268024a201af9f Mon Sep 17 00:00:00 2001
From: Gabor Adam Toth <tg@x-net.hu>
Date: Tue, 23 Feb 2010 20:34:26 +0100
Subject: [PATCH] http/fetch: call callback even if status is not OK so errors
 can be handled; surf: added back dest param for cmd()

---
 world/default/en/html.textdb |  3 ++-
 world/net/http/fetch.c       |  7 +++---
 world/net/http/oauth.c       | 41 ++++++++++++++++++++----------------
 world/net/twitter/client.c   | 11 ++++++----
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/world/default/en/html.textdb b/world/default/en/html.textdb
index 1c1d4bd..d8a08a4 100644
--- a/world/default/en/html.textdb
+++ b/world/default/en/html.textdb
@@ -1352,8 +1352,9 @@ _PAGES_start_description
 |<script>
 |var longer = 44
 |
-|function cmd(wish) {
+|function cmd(wish, dest) {
 |	Pef.cmd.value = wish
+|	Pef.dest.value = dest || ''
 |	Pef.submit()
 |	longer = 44
 |	return false
diff --git a/world/net/http/fetch.c b/world/net/http/fetch.c
index 8b17dff..9f39d1e 100644
--- a/world/net/http/fetch.c
+++ b/world/net/http/fetch.c
@@ -202,15 +202,14 @@ disconnected(remainder) {
 	fheaders = headers;
 	buffer = headers = 0;
 	switch (http_status) {
-	case R_OK:
+	default:
 		mixed *waiter;
 		while (qSize(ME)) {
 			waiter = shift(ME);
 			P2(("%O calls back.. body is %O\n", ME, fetched))
-			funcall(waiter[0], fetched, waiter[1] ? fheaders : copy(fheaders));
+			funcall(waiter[0], fetched, waiter[1] ? fheaders : copy(fheaders), http_status);
 		}
-		break;
-	default:
+		if (http_status == R_OK) break;
 		// doesn't seem to get here when HTTP returns 301 or 302. strange.
 		// fall thru
 	case R_NOTMODIFIED:
diff --git a/world/net/http/oauth.c b/world/net/http/oauth.c
index 6efd39e..05ae63d 100644
--- a/world/net/http/oauth.c
+++ b/world/net/http/oauth.c
@@ -9,6 +9,7 @@
 
 #include <net.h>
 #include <tls.h>
+#include <ht/http.h>
 
 string consumer_key;
 string consumer_secret;
@@ -51,28 +52,32 @@ varargs void fetch(object ua, string url, string method, mapping post, mapping o
     ua->fetch(url, method, post, (["authorization": "OAuth " + p]));
 }
 
-void parse_request_token(string body, mapping headers) {
-    P3((">> oauth:parse_request_token(%O, %O)\n", body, headers))
-    request_params = ([]);
-    url_parse_query(request_params, body);
-    if (strlen(request_params["oauth_token"]) && strlen(request_params["oauth_token_secret"])) {
-	shared_memory("oauth_request_tokens")[request_params["oauth_token"]] = ME;
-	sendmsg(user, "_notice_oauth_authorize_url", "Open [_url] to perform authorization.",
-		(["_url": authorize_url + "?oauth_token=" + request_params["oauth_token"]]));
-    } else {
-	sendmsg(user, "_error_oauth_token_request", "OAuth failed: could not get a request token.");
+void parse_request_token(string body, mapping headers, int http_status) {
+    P3((">> oauth:parse_request_token(%O, %O, %O)\n", body, headers, http_status))
+    if (http_status == R_OK) {
+	request_params = ([]);
+	url_parse_query(request_params, body);
+	if (strlen(request_params["oauth_token"]) && strlen(request_params["oauth_token_secret"])) {
+	    shared_memory("oauth_request_tokens")[request_params["oauth_token"]] = ME;
+	    sendmsg(user, "_notice_oauth_authorize_url", "Open [_url] to perform authorization.",
+		    (["_url": authorize_url + "?oauth_token=" + request_params["oauth_token"]]));
+	    return;
+	}
     }
+    sendmsg(user, "_error_oauth_token_request", "OAuth failed: could not get a request token.");
 }
 
-void parse_access_token(string body, mapping headers) {
-    P3((">> oauth:parse_access_token(%O, %O)\n", body, headers))
-    access_params = ([]);
-    url_parse_query(access_params, body);
-    if (strlen(access_params["oauth_token"]) && strlen(access_params["oauth_token_secret"])) {
-	sendmsg(user, "_notice_oauth_success", "OAuth successful.");
-    } else {
-	sendmsg(user, "_error_oauth_token_access", "OAuth failed: could not get an access token.");
+void parse_access_token(string body, mapping headers, int http_status) {
+    P3((">> oauth:parse_access_token(%O, %O, %O)\n", body, headers, http_status))
+    if (http_status == R_OK) {
+	access_params = ([]);
+	url_parse_query(access_params, body);
+	if (strlen(access_params["oauth_token"]) && strlen(access_params["oauth_token_secret"])) {
+	    sendmsg(user, "_notice_oauth_success", "OAuth successful.");
+	    return;
+	}
     }
+    sendmsg(user, "_error_oauth_token_access", "OAuth failed: could not get an access token.");
 }
 
 void verified(string verifier) {
diff --git a/world/net/twitter/client.c b/world/net/twitter/client.c
index cadd740..dcc250a 100644
--- a/world/net/twitter/client.c
+++ b/world/net/twitter/client.c
@@ -1,4 +1,5 @@
 /* twitter client
+ * http://apiwiki.twitter.com/Twitter-API-Documentation
  *
  * - register @ http://twitter.com/apps
  *   - settings:
@@ -23,8 +24,10 @@ object load(object usr, string key, string secret, string request, string access
     return ::load(usr, key, secret, request, access, authorize);
 }
 
-void parse_status_update(string body, string headers) {
-    P3(("twitter/client:parse_status_update(%O, %O)\n", body, headers))
+void parse_status_update(string body, string headers, int http_status) {
+    P3(("twitter/client:parse_status_update(%O, %O, %O)\n", body, headers, http_status))
+    if (http_status != R_OK)
+	sendmsg(user, "_error_twitter_status_update", "Error: failed to post status update on twitter.");
 }
 
 void status_update(string text) {
@@ -36,8 +39,8 @@ void status_update(string text) {
     fetch(ua, "http://api.twitter.com/1/statuses/update.json", "POST", (["status": text]));
 }
 
-void parse_home_timeline(string body, string headers) {
-    P3(("twitter/client:parse_home_timeline(%O, %O)\n", body, headers))
+void parse_home_timeline(string body, string headers, int http_status) {
+    P3(("twitter/client:parse_home_timeline(%O, %O, %O)\n", body, headers, http_status))
 }
 
 void home_timeline() {