Changeset 2abceca

Timestamp:

2010-04-06T17:25:51Z (15 years ago)

Author:

Geert Mulders <g.c.w.m.mulders@…>

Branches:

master

Children:

0519b0a

Parents:

62d2cfb

Message:

Updates made as a result to the comments on the review.

Location:

protocols/twitter

Files:

• twitter.c (modified) (6 diffs)
• twitter.h (modified) (1 diff)
• twitter_http.c (modified) (5 diffs)
• twitter_lib.c (modified) (10 diffs)

protocols/twitter/twitter.c

@@ -35 +35 @@
         struct im_connection *ic = data;
         // Check if we are still logged in...
-        if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN)
+        // We are logged in if the flag says so and the connection is still in the connections list.
+        if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN 
+                        && !g_slist_find( twitter_connections, ic ))
                 return 0;
 
@@ -55 +57 @@
         set_t *s;
         s = set_add( &acc->set, "use_groupchat", "false", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
 }
 
@@ -72 +75 @@
         ic->proto_data = td;
 
-        // Set the status to logged in.
-        ic->flags = OPT_LOGGED_IN;
+        imcb_log( ic, "Connecting to twitter" );
+        imcb_connected(ic);
 
         // Run this once. After this queue the main loop function.
@@ -79 +82 @@
 
         // Queue the main_loop
-        b_timeout_add(60000, twitter_main_loop, ic);
-
-        imcb_log( ic, "Connecting to twitter" );
-        imcb_connected(ic);
+        // Save the return value, so we can remove the timeout on logout.
+        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
 
         twitter_connections = g_slist_append( twitter_connections, ic );
@@ -96 +97 @@
         // Set the status to logged out.
         ic->flags = 0;
+
+        // Remove the main_loop function from the function queue.
+        b_event_remove(td->main_loop_id);
 
         if( td )
@@ -149 +153 @@
 static void twitter_chat_msg( struct groupchat *c, char *message, int flags )
 {
+        if( c && message )
+                twitter_post_status(c->ic, message);
 }
 

protocols/twitter/twitter.h

@@ -38 +38 @@
         char* pass;
         guint64 home_timeline_id;
+        gint main_loop_id;
         struct groupchat *home_timeline_gc;
 };

protocols/twitter/twitter_http.c

@@ -39 +39 @@
 
 
-char *twitter_urlencode(const char *instr);
 char *twitter_url_append(char *url, char *key, char* value);
-static int isurlchar(unsigned char c);
 
 /**
@@ -107 +105 @@
         // Make the request.
         request = g_strdup_printf(  "%s %s HTTP/1.0\r\n"
-                                                                "Host: %s\r\n"
-                                                                "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
-                                                                is_post ? "POST" : "GET", url->file, url->host );
+                                    "Host: %s\r\n"
+                                    "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
+                                    is_post ? "POST" : "GET", url->file, url->host );
 
         // If a pass and user are given we append them to the request.
@@ -146 +144 @@
 char *twitter_url_append(char *url, char *key, char* value)
 {
-        char *key_encoded = twitter_urlencode(key);
-        char *value_encoded = twitter_urlencode(value);
+        char *key_encoded = g_strndup(key, 3 * strlen(key));
+        http_encode(key_encoded);
+        char *value_encoded = g_strndup(value, 3 * strlen(value));
+        http_encode(value_encoded);
+
         char *retval;
         if (strlen(url) != 0)
@@ -159 +160 @@
         return retval;
 }
-
-char *twitter_urlencode(const char *instr)
-{
-        int ipos=0, bpos=0;
-        char *str = NULL;
-        int len = strlen(instr);
-
-        if(!(str = g_new(char, 3*len + 1) ))
-                return "";
-
-        while(instr[ipos]) {
-                while(isurlchar(instr[ipos]))
-                        str[bpos++] = instr[ipos++];
-                if(!instr[ipos])
-                        break;
-
-                g_snprintf(&str[bpos], 4, "%%%.2x", instr[ipos]);
-                bpos+=3;
-                ipos++;
-        }
-        str[bpos]='\0';
-
-        /* free extra alloc'ed mem. */
-        len = strlen(str);
-        str = g_renew(char, str, len+1);
-
-        return (str);
-}
-
 
 char *twitter_urldecode(const char *instr)
@@ -229 +201 @@
 }
 
-static int isurlchar(unsigned char c)
-{
-        return (isalnum(c) || '-' == c || '_' == c);
-}
-

protocols/twitter/twitter_lib.c

@@ -65 +65 @@
         g_free(txu->name);
         g_free(txu->screen_name);
+        g_free(txu);
 }
 
@@ -76 +77 @@
         g_free(txs->text);
         txu_free(txs->user);
+        g_free(txs);
 }
 
@@ -131 +133 @@
 {
         // Do something with the cursor.
-        txl->next_cursor = atoi(node->text);
+        txl->next_cursor = node->text != NULL ? atoi(node->text) : -1;
 
         return XT_HANDLED;
@@ -153 +155 @@
                 {
                         // Add the item to the list.
-                        txl->list = g_slist_append (txl->list, g_memdup( node->text, node->text_len + 1 ));
+                        txl->list = g_slist_append (txl->list, g_memdup( child->text, child->text_len + 1 ));
                 }
                 else if ( g_strcasecmp( "next_cursor", child->name ) == 0)
@@ -187 +189 @@
 
         txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
 
         // Parse the data.
@@ -451 +452 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not retrieve home/timeline. HTTP STATUS: %d", req->status_code);
+                imcb_error(ic, "Could not retrieve " TWITTER_HOME_TIMELINE_URL ". HTTP STATUS: %d", req->status_code);
                 return;
         }
@@ -488 +489 @@
         struct xt_parser *parser;
         struct twitter_xml_list *txl;
+        GSList *l = NULL;
+        struct twitter_xml_user *user;
 
         // Check if the connection is still active.
@@ -496 +499 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not retrieve home/timeline. HTTP STATUS: %d", req->status_code);
+                imcb_error(ic, "Could not retrieve " TWITTER_SHOW_FRIENDS_URL " HTTP STATUS: %d", req->status_code);
                 return;
         }
@@ -511 +514 @@
         xt_free( parser );
 
-        GSList *l = NULL;
-        struct twitter_xml_user *user;
         // Add the users as buddies.
         for ( l = txl->list; l ; l = g_slist_next(l) )
@@ -559 +560 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not post tweed... HTTP STATUS: %d", req->status_code);
-                imcb_error(ic, req->reply_body);
+                imcb_error(ic, "Could not post tweet... HTTP STATUS: %d", req->status_code);
                 return;
         }