Changeset b235228

Timestamp:

2012-11-25T22:28:38Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85cd12d

Parents:

67f6828

Message:

Have root confirm some commands that so far gave no feedback at all, since
"no news is good news" can be a little confusing.

Files:

• lib/http_client.h (modified) (1 diff)
• protocols/twitter/twitter_http.c (modified) (1 diff)
• protocols/twitter/twitter_http.h (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (5 diffs)

lib/http_client.h

@@ -42 +42 @@
         HTTPC_STREAMING = 1,
         HTTPC_EOF = 2,
+        
+        /* Let's reserve 0x1000000+ for lib users. */
 } http_client_flags_t;
 

protocols/twitter/twitter_http.c

@@ -135 +135 @@
 }
 
+struct http_request *twitter_http_f(struct im_connection *ic, char *url_string, http_input_function func,
+                                    gpointer data, int is_post, char **arguments, int arguments_len, twitter_http_flags_t flags)
+{
+        struct http_request *ret = twitter_http(ic, url_string, func, data, is_post, arguments, arguments_len);
+        if (ret)
+                ret->flags |= flags;
+        return ret;
+}
+
 static char *twitter_url_append(char *url, char *key, char *value)
 {

protocols/twitter/twitter_http.h

@@ -28 +28 @@
 #include "http_client.h"
 
+typedef enum {
+        /* With this set, twitter_http_post() will post a generic confirmation
+           message to the user. */
+        TWITTER_HTTP_USER_ACK = 0x1000000,
+} twitter_http_flags_t;
+
 struct oauth_info;
 
 struct http_request *twitter_http(struct im_connection *ic, char *url_string, http_input_function func,
                                   gpointer data, int is_post, char** arguments, int arguments_len);
+struct http_request *twitter_http_f(struct im_connection *ic, char *url_string, http_input_function func,
+                                    gpointer data, int is_post, char** arguments, int arguments_len, twitter_http_flags_t flags);
 
 #endif //_TWITTER_HTTP_H

protocols/twitter/twitter_lib.c

@@ -1167 +1167 @@
         
         json_value_free(parsed);
+        
+        if (req->flags & TWITTER_HTTP_USER_ACK)
+                twitter_log(ic, "Command processed successfully");
 }
 
@@ -1213 +1216 @@
         url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_DESTROY_URL,
                               (unsigned long long) id, ".json");
-        twitter_http(ic, url, twitter_http_post, ic, 1, NULL, 0);
+        twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
+                       TWITTER_HTTP_USER_ACK);
         g_free(url);
 }
@@ -1222 +1226 @@
         url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_RETWEET_URL,
                               (unsigned long long) id, ".json");
-        twitter_http(ic, url, twitter_http_post, ic, 1, NULL, 0);
+        twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
+                       TWITTER_HTTP_USER_ACK);
         g_free(url);
 }
@@ -1236 +1241 @@
         };
         args[1] = screen_name;
-        twitter_http(ic, TWITTER_REPORT_SPAM_URL, twitter_http_post,
-                     ic, 1, args, 2);
+        twitter_http_f(ic, TWITTER_REPORT_SPAM_URL, twitter_http_post,
+                       ic, 1, args, 2, TWITTER_HTTP_USER_ACK);
 }
 
@@ -1248 +1253 @@
         url = g_strdup_printf("%s%llu%s", TWITTER_FAVORITE_CREATE_URL,
                               (unsigned long long) id, ".json");
-        twitter_http(ic, url, twitter_http_post, ic, 1, NULL, 0);
+        twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
+                       TWITTER_HTTP_USER_ACK);
         g_free(url);
 }