Changeset dff0e0b

Timestamp:

2012-11-11T14:42:20Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

62f6b45

Parents:

ddc2de5

Message:

Showing tweets now, and leaking less memory. Still lots of cleanup left
to do.

Location:

protocols/twitter

Files:

• twitter.c (modified) (3 diffs)
• twitter_lib.c (modified) (5 diffs)
• twitter_lib.h (modified) (1 diff)

protocols/twitter/twitter.c

@@ -5 +5 @@
 *                                                                           *
 *  Copyright 2009 Geert Mulders <g.c.w.m.mulders@gmail.com>                 *
+*  Copyright 2010-2012 Wilmer van der Gaast <wilmer@gaast.net>              *
 *                                                                           *
 *  This library is free software; you can redistribute it and/or            *
@@ -66 +67 @@
         // Run this once. After this queue the main loop function.
         twitter_main_loop(ic, -1, 0);
-
-        // Queue the main_loop
-        // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id =
-            b_timeout_add(set_getint(&ic->acc->set, "fetch_interval") * 1000, twitter_main_loop, ic);
+        
+        if (set_getbool(&ic->acc->set, "stream")) {
+                /* That fetch was just to get backlog, the stream will give
+                   us the rest. \o/ */
+                twitter_open_stream(ic);
+        } else {
+                /* Not using the streaming API, so keep polling the old-
+                   fashioned way. :-( */
+                td->main_loop_id =
+                    b_timeout_add(set_getint(&ic->acc->set, "fetch_interval") * 1000,
+                                  twitter_main_loop, ic);
+        }
 }
 
@@ -279 +287 @@
 
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);
+        
+        s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
 }
 

protocols/twitter/twitter_lib.c

@@ -176 +176 @@
                 root = json_parse(req->reply_body);
                 err = json_o_get(root, "errors");
-                if (err->type == json_array && (err = err->u.array.values[0]) &&
+                if (err && err->type == json_array && (err = err->u.array.values[0]) &&
                     err->type == json_object) {
                         const char *msg = json_o_str(err, "message");
@@ -529 +529 @@
         }
 
-        return TRUE;
+        return txs->text && txs->user && txs->id;
 }
 
@@ -727 +727 @@
 }
 
-static void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
-static void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor);
+static gboolean twitter_stream_handle_object(struct im_connection *ic, json_value *o);
 
 static void twitter_http_stream(struct http_request *req)
 {
-        int len;
-        int i;
+        struct im_connection *ic = req->data;
+        //struct twitter_data *td = ic->proto_data;
+        json_value *parsed;
+        int len, i;
         char c;
-        json_value *j;
+        
+        if (!g_slist_find(twitter_connections, ic))
+                return;
+        //td = ic->proto_data;;
         
         printf( "%d bytes in stream\n", req->body_size );
@@ -763 +767 @@
         
         printf("JSON: %s\n", req->reply_body);
-        printf("parsed: %p\n", (j = json_parse(req->reply_body)));
-        json_value_free(j);
+        printf("parsed: %p\n", (parsed = json_parse(req->reply_body)));
+        if (parsed) {
+                twitter_stream_handle_object(ic, parsed);
+        }
+        json_value_free(parsed);
         req->reply_body[len] = c;
         
         http_flush_bytes(req, len);
-}
+        
+        /* One notification might bring multiple events! */
+        if (req->body_size > 0)
+                twitter_http_stream(req);
+}
+
+static gboolean twitter_stream_handle_object(struct im_connection *ic, json_value *o)
+{
+        struct twitter_xml_status *txs = g_new0(struct twitter_xml_status, 1);
+        
+        if (twitter_xt_get_status(o, txs)) {
+                GSList *output = g_slist_append(NULL, txs);
+                twitter_groupchat(ic, output);
+                txs_free(txs);
+                g_slist_free(output);
+                return TRUE;
+        }
+        txs_free(txs);
+        return FALSE;
+}
+
+gboolean twitter_open_stream(struct im_connection *ic)
+{
+        struct twitter_data *td = ic->proto_data;
+        char *args[4] = {"with", "followings", "delimited", "length"};
+        
+        if ((td->stream = twitter_http(ic, TWITTER_USER_STREAM_URL,
+                                       twitter_http_stream, ic, 0, args, 4))) {
+                /* This flag must be enabled or we'll get no data until EOF
+                   (which err, kind of, defeats the purpose of a streaming API). */
+                td->stream->flags |= HTTPC_STREAMING;
+                return TRUE;
+        }
+        
+        return FALSE;
+}
+
+static void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
+static void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor);
 
 /**
@@ -791 +836 @@
         if (include_mentions) {
                 twitter_get_mentions(ic, next_cursor);
-        }
-        
-        static int bla = 0;
-        
-        if (bla)
-                return;
-        bla = 1;
-        
-        char *args[4];
-        args[0] = "with";
-        args[1] = "followings";
-        args[2] = "delimited";
-        args[3] = "length";
-        
-        if ((td->stream = twitter_http(ic, "https://userstream.twitter.com/1.1/user.json",
-                                       twitter_http_stream, ic, 0, args, 4))) {
-                td->stream->flags |= HTTPC_STREAMING;
         }
 }

protocols/twitter/twitter_lib.h

@@ -79 +79 @@
 #define TWITTER_REPORT_SPAM_URL "/report_spam.json"
 
+#define TWITTER_USER_STREAM_URL "https://userstream.twitter.com/1.1/user.json"
+
+gboolean twitter_open_stream(struct im_connection *ic);
 void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);