Changeset 2cd8540

Timestamp:

2012-11-25T12:05:48Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

96dd574

Parents:

898c08e

Message:

Show DMs the right way. With mode=many and show_ids=off they'll look just
like tweets but that's what you get with bad settings.. Also, don't show
DMs from ourselves.

File:

• protocols/twitter/twitter_lib.c (modified) (3 diffs)

protocols/twitter/twitter_lib.c

@@ -515 +515 @@
  * Function to fill a twitter_xml_status struct (DM variant).
  */
-static gboolean twitter_xt_get_dm(const json_value *node, struct twitter_xml_status *txs)
-{
+static struct twitter_xml_status *twitter_xt_get_dm(const json_value *node)
+{
+        struct twitter_xml_status *txs;
         const json_value *entities = NULL;
         
         if (node->type != json_object)
                 return FALSE;
+        txs = g_new0(struct twitter_xml_status, 1);
 
         JSON_O_FOREACH (node, k, v) {
@@ -544 +546 @@
         }
 
-        return txs->text && txs->user && txs->id;
+        if (txs->text && txs->user && txs->id)
+                return txs;
+        
+        txs_free(txs);
+        return NULL;
 }
 
@@ -847 +853 @@
                 return twitter_stream_handle_status(ic, txs);
         } else if ((c = json_o_get(o, "direct_message")) &&
-                   twitter_xt_get_dm(c, txs)) {
-                GSList *output = g_slist_append(NULL, txs);
-                twitter_private_message_chat(ic, output);
+                   (txs = twitter_xt_get_dm(c))) {
+                if (strcmp(txs->user->screen_name, td->user) != 0)
+                        imcb_buddy_msg(ic, txs->user->screen_name,
+                                       txs->text, 0, txs->created_at);
                 txs_free(txs);
-                g_slist_free(output);
                 return TRUE;
         } else if ((c = json_o_get(o, "event")) && c->type == json_string) {