1 files changed, 58 insertions, 13 deletions

diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c
index 77f487ae..b69c532e 100644
--- a/protocols/twitter/twitter_lib.c
+++ b/protocols/twitter/twitter_lib.c
@@ -790,7 +790,7 @@ static char *twitter_msg_add_id(struct im_connection *ic,
 
 	if (txs->reply_to) {
 		int i;
-		for (i = 0; i < TWITTER_LOG_LENGTH; i++) {
+		for (i = 0; i < td->log_length; i++) {
 			if (td->log[i].id == txs->reply_to) {
 				reply_to = i;
 				break;
@@ -808,26 +808,52 @@ static char *twitter_msg_add_id(struct im_connection *ic,
 		}
 	}
 
-	td->log_id = (td->log_id + 1) % TWITTER_LOG_LENGTH;
-	td->log[td->log_id].id = txs->id;
-	td->log[td->log_id].bu = bee_user_by_handle(ic->bee, ic, txs->user->screen_name);
+	if (txs->from_filter) {
+		td->filter_log_id = (td->filter_log_id + 1) % td->log_length;
+		td->filter_log[td->filter_log_id].id = txs->id;
+		td->filter_log[td->filter_log_id].bu = bee_user_by_handle(ic->bee, ic, txs->user->screen_name);
+	} else {
+		td->log_id = (td->log_id + 1) % td->log_length;
+		td->log[td->log_id].id = txs->id;
+		td->log[td->log_id].bu = bee_user_by_handle(ic->bee, ic, txs->user->screen_name);
+	}
 
 	/* This is all getting hairy. :-( If we RT'ed something ourselves,
 	   remember OUR id instead so undo will work. In other cases, the
 	   original tweet's id should be remembered for deduplicating. */
 	if (g_strcasecmp(txs->user->screen_name, td->user) == 0) {
-		td->log[td->log_id].id = txs->rt_id;
-		/* More useful than NULL. */
-		td->log[td->log_id].bu = &twitter_log_local_user;
+		if (txs->from_filter) {
+			td->filter_log[td->filter_log_id].id = txs->rt_id;
+			/* More useful than NULL. */
+			td->filter_log[td->filter_log_id].bu = &twitter_log_local_user;
+		} else {
+			td->log[td->log_id].id = txs->rt_id;
+			/* More useful than NULL. */
+			td->log[td->log_id].bu = &twitter_log_local_user;
+		}
 	}
 
 	if (set_getbool(&ic->acc->set, "show_ids")) {
 		if (reply_to != -1) {
-			return g_strdup_printf("\002[\002%02x->%02x\002]\002 %s%s",
-			                       td->log_id, reply_to, prefix, txs->text);
+			if (td->long_ids) {
+				return g_strdup_printf("\002[\002%04x->%04x\002]\002 %s%s",
+						txs->from_filter ? td->filter_log_id : td->log_id,
+						reply_to, prefix, txs->text);
+			} else {
+				return g_strdup_printf("\002[\002%02x->%02x\002]\002 %s%s",
+						txs->from_filter ? td->filter_log_id : td->log_id,
+						reply_to, prefix, txs->text);
+			}
 		} else {
-			return g_strdup_printf("\002[\002%02x\002]\002 %s%s",
-			                       td->log_id, prefix, txs->text);
+			if (td->long_ids) {
+				return g_strdup_printf("\002[\002%04x\002]\002 %s%s",
+						txs->from_filter ? td->filter_log_id : td->log_id,
+						prefix, txs->text);
+			} else {
+				return g_strdup_printf("\002[\002%02x\002]\002 %s%s",
+						txs->from_filter ? td->filter_log_id : td->log_id,
+						prefix, txs->text);
+			}
 		}
 	} else {
 		if (*prefix) {
@@ -1009,8 +1035,23 @@ static void twitter_http_stream(struct http_request *req)
 	if ((req->flags & HTTPC_EOF) || !req->reply_body) {
 		if (req == td->stream) {
 			td->stream = NULL;
+
+			if (req->status_code == 200 &&
+			    td->stream_opentime + 3 < time(NULL)) {
+				debug("Reconnecting to twitter stream.");
+				twitter_open_stream(ic);
+				twitter_get_timeline(ic, -1);
+				return;
+			}
 		} else if (req == td->filter_stream) {
 			td->filter_stream = NULL;
+
+			if (req->status_code == 200 &&
+			    td->filter_stream_opentime + 3 < time(NULL)) {
+				debug("Reconnecting to twitter filter stream.");
+				twitter_open_filter_stream(ic);
+				return;
+			}
 		}
 
 		imcb_error(ic, "Stream closed (%s)", req->status_string);
@@ -1090,10 +1131,12 @@ static gboolean twitter_stream_handle_object(struct im_connection *ic, json_valu
 static gboolean twitter_stream_handle_status(struct im_connection *ic, struct twitter_xml_status *txs)
 {
 	struct twitter_data *td = ic->proto_data;
+	struct twitter_log_data *tl;
 	int i;
 
-	for (i = 0; i < TWITTER_LOG_LENGTH; i++) {
-		if (td->log[i].id == txs->id) {
+	tl = txs->from_filter ? td->filter_log : td->log;
+	for (i = 0; i < td->log_length; i++) {
+		if (tl[i].id == txs->id) {
 			/* Got a duplicate (RT, probably). Drop it. */
 			return TRUE;
 		}
@@ -1185,6 +1228,7 @@ gboolean twitter_open_stream(struct im_connection *ic)
 		/* 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;
+		td->stream_opentime = time(NULL);
 		return TRUE;
 	}
 
@@ -1240,6 +1284,7 @@ static gboolean twitter_filter_stream(struct im_connection *ic)
 		/* 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->filter_stream->flags |= HTTPC_STREAMING;
+		td->filter_stream_opentime = time(NULL);
 		ret = TRUE;
 	}