Changeset 29f72b7

Timestamp:

2012-11-25T17:43:13Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9ed0081

Parents:

7f557d5

Message:

Finally cleaned up the show-tweet functions.

Location:

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_lib.c (modified) (10 diffs)

protocols/twitter/twitter.c

@@ -99 +99 @@
                 bee_user_t *bu = l->data;
                 if (bu->ic == ic)
-                        imcb_chat_add_buddy(td->timeline_gc, bu->handle);
+                        imcb_chat_add_buddy(gc, bu->handle);
         }
         imcb_chat_add_buddy(gc, ic->acc->user);

protocols/twitter/twitter_lib.c

@@ -463 +463 @@
                 if (strcmp("text", k) == 0 && v->type == json_string) {
                         txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
+                        strip_html(txs->text);
                 } else if (strcmp("retweeted_status", k) == 0 && v->type == json_object) {
                         rt = v;
@@ -520 +521 @@
                 if (strcmp("text", k) == 0 && v->type == json_string) {
                         txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
+                        strip_html(txs->text);
                 } else if (strcmp("created_at", k) == 0 && v->type == json_string) {
                         struct tm parsed;
@@ -567 +569 @@
                         
                         *pos = '\0';
-                        new = g_strdup_printf("%s%s <%s>%s", text, kort,
+                        new = g_strdup_printf("%s%s <%s>%s", text, kort,
                                               disp, pos + strlen(kort));
                         
@@ -659 +661 @@
  * Function that is called to see the statuses in a groupchat window.
  */
-static void twitter_groupchat(struct im_connection *ic, GSList * list)
-{
-        struct twitter_data *td = ic->proto_data;
-        GSList *l = NULL;
-        struct twitter_xml_status *status;
+static void twitter_status_show_chat(struct im_connection *ic, struct twitter_xml_status *status)
+{
+        struct twitter_data *td = ic->proto_data;
         struct groupchat *gc;
-        guint64 last_id = 0;
+        gboolean me = g_strcasecmp(td->user, status->user->screen_name) == 0;
+        char *msg;
 
         // Create a new groupchat if it does not exsist.
         gc = twitter_groupchat_init(ic);
 
-        for (l = list; l; l = g_slist_next(l)) {
-                char *msg;
-
-                status = l->data;
-                if (status->user == NULL || status->text == NULL || last_id == status->id)
-                        continue;
-
-                last_id = status->id;
-
-                strip_html(status->text);
-
-                if (set_getbool(&ic->acc->set, "strip_newlines"))
-                        strip_newlines(status->text);
-
-                msg = twitter_msg_add_id(ic, status, "");
-
-                // Say it!
-                if (g_strcasecmp(td->user, status->user->screen_name) == 0) {
-                        imcb_chat_log(gc, "You: %s", msg ? msg : status->text);
-                } else {
-                        twitter_add_buddy(ic, status->user->screen_name, status->user->name);
-
-                        imcb_chat_msg(gc, status->user->screen_name,
-                                      msg ? msg : status->text, 0, status->created_at);
-                }
-
-                g_free(msg);
-
-                // Update the timeline_id to hold the highest id, so that by the next request
-                // we won't pick up the updates already in the list.
-                td->timeline_id = MAX(td->timeline_id, status->id);
-        }
+        if (!me)
+                /* MUST be done before twitter_msg_add_id() to avoid #872. */
+                twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+        msg = twitter_msg_add_id(ic, status, "");
+        
+        // Say it!
+        if (me) {
+                imcb_chat_log(gc, "You: %s", msg ? msg : status->text);
+        } else {
+                imcb_chat_msg(gc, status->user->screen_name,
+                              msg ? msg : status->text, 0, status->created_at);
+        }
+
+        g_free(msg);
 }
 
@@ -707 +690 @@
  * Function that is called to see statuses as private messages.
  */
-static void twitter_private_message_chat(struct im_connection *ic, GSList * list)
-{
-        struct twitter_data *td = ic->proto_data;
-        GSList *l = NULL;
-        struct twitter_xml_status *status;
+static void twitter_status_show_msg(struct im_connection *ic, struct twitter_xml_status *status)
+{
+        struct twitter_data *td = ic->proto_data;
         char from[MAX_STRING] = "";
-        guint64 last_id = 0;
+        char *prefix = NULL, *text = NULL;
+        gboolean me = g_strcasecmp(td->user, status->user->screen_name) == 0;
 
         if (td->flags & TWITTER_MODE_ONE) {
@@ -720 +702 @@
         }
 
-        for (l = list; l; l = g_slist_next(l)) {
-                char *prefix = NULL, *text = NULL;
-
-                status = l->data;
-                if (status->user == NULL || status->text == NULL || last_id == status->id)
-                        continue;
-
-                last_id = status->id;
-
-                strip_html(status->text);
-                if (td->flags & TWITTER_MODE_ONE)
-                        prefix = g_strdup_printf("\002<\002%s\002>\002 ",
-                                                 status->user->screen_name);
-                else
-                        twitter_add_buddy(ic, status->user->screen_name, status->user->name);
-
-                text = twitter_msg_add_id(ic, status, prefix ? prefix : "");
-
-                imcb_buddy_msg(ic,
-                               *from ? from : status->user->screen_name,
-                               text ? text : status->text, 0, status->created_at);
-
-                // Update the timeline_id to hold the highest id, so that by the next request
-                // we won't pick up the updates already in the list.
-                td->timeline_id = MAX(td->timeline_id, status->id);
-
-                g_free(text);
-                g_free(prefix);
-        }
+        if (td->flags & TWITTER_MODE_ONE)
+                prefix = g_strdup_printf("\002<\002%s\002>\002 ",
+                                         status->user->screen_name);
+        else if (!me)
+                twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+        else
+                prefix = g_strdup("You: ");
+
+        text = twitter_msg_add_id(ic, status, prefix ? prefix : "");
+
+        imcb_buddy_msg(ic,
+                       *from ? from : status->user->screen_name,
+                       text ? text : status->text, 0, status->created_at);
+
+        g_free(text);
+        g_free(prefix);
+}
+
+static void twitter_status_show(struct im_connection *ic, struct twitter_xml_status *status)
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        if (status->user == NULL || status->text == NULL)
+                return;
+        
+        /* Grrrr. Would like to do this during parsing, but can't access
+           settings from there. */
+        if (set_getbool(&ic->acc->set, "strip_newlines"))
+                strip_newlines(status->text);
+        
+        if (td->flags & TWITTER_MODE_CHAT)
+                twitter_status_show_chat(ic, status);
+        else
+                twitter_status_show_msg(ic, status);
+
+        // Update the timeline_id to hold the highest id, so that by the next request
+        // we won't pick up the updates already in the list.
+        td->timeline_id = MAX(td->timeline_id, status->id);
 }
 
@@ -848 +839 @@
         for (i = 0; i < TWITTER_LOG_LENGTH; i++) {
                 if (td->log[i].id == txs->id) {
-                        /* Got a duplicate (RT, surely). Drop it. */
+                        /* Got a duplicate (RT, probably). Drop it. */
                         txs_free(txs);
                         return TRUE;
@@ -865 +856 @@
         }
         
-        GSList *output = g_slist_append(NULL, txs);
-        twitter_groupchat(ic, output);
+        twitter_status_show(ic, txs);
         txs_free(txs);
-        g_slist_free(output);
+        
         return TRUE;
 }
@@ -951 +941 @@
         struct twitter_xml_list *home_timeline = td->home_timeline_obj;
         struct twitter_xml_list *mentions = td->mentions_obj;
+        guint64 last_id = 0;
         GSList *output = NULL;
         GSList *l;
 
+        imcb_connected(ic);
+        
         if (!(td->flags & TWITTER_GOT_TIMELINE)) {
                 return;
@@ -977 +970 @@
                 }
         }
-        
-        if (!(ic->flags & OPT_LOGGED_IN))
-                imcb_connected(ic);
 
         // See if the user wants to see the messages in a groupchat window or as private messages.
-        if (td->flags & TWITTER_MODE_CHAT)
-                twitter_groupchat(ic, output);
-        else
-                twitter_private_message_chat(ic, output);
-
-        g_slist_free(output);
+        while (output) {
+                struct twitter_xml_status *txs = output->data;
+                if (txs->id != last_id)
+                        twitter_status_show(ic, txs);
+                last_id = txs->id;
+                output = g_slist_remove(output, txs);
+        }
 
         txl_free(home_timeline);