Changeset 7d2ce9a

Timestamp:

2012-06-03T23:31:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1a0b734, 5ffa4f7, c43f488

Parents:

7a2a486

Message:

Scan media entities as well, not just url entities. This should expand more
t.co URLs.

File:

• protocols/twitter/twitter_lib.c (modified) (1 diff)

protocols/twitter/twitter_lib.c

@@ -501 +501 @@
                 struct xt_node *urls, *url;
                 
-                urls = xt_find_path(node, "entities/urls");
-                for (url = urls ? urls->children : NULL; url; url = url->next) {
-                        /* "short" is a reserved word. :-P */
-                        struct xt_node *kort = xt_find_node(url->children, "url");
-                        struct xt_node *disp = xt_find_node(url->children, "display_url");
-                        char *pos, *new;
-                        
-                        if (!kort || !kort->text || !disp || !disp->text ||
-                            !(pos = strstr(txs->text, kort->text)))
+                urls = xt_find_path(node, "entities");
+                if (urls != NULL)
+                        urls = urls->children;
+                for (; urls; urls = urls->next) {
+                        if (strcmp(urls->name, "urls") != 0 && strcmp(urls->name, "media") != 0)
                                 continue;
                         
-                        *pos = '\0';
-                        new = g_strdup_printf("%s%s <%s>%s", txs->text, kort->text,
-                                              disp->text, pos + strlen(kort->text));
-                        
-                        g_free(txs->text);
-                        txs->text = new;
+                        for (url = urls ? urls->children : NULL; url; url = url->next) {
+                                /* "short" is a reserved word. :-P */
+                                struct xt_node *kort = xt_find_node(url->children, "url");
+                                struct xt_node *disp = xt_find_node(url->children, "display_url");
+                                char *pos, *new;
+                                
+                                if (!kort || !kort->text || !disp || !disp->text ||
+                                    !(pos = strstr(txs->text, kort->text)))
+                                        continue;
+                                
+                                *pos = '\0';
+                                new = g_strdup_printf("%s%s <%s>%s", txs->text, kort->text,
+                                                      disp->text, pos + strlen(kort->text));
+                                
+                                g_free(txs->text);
+                                txs->text = new;
+                        }
                 }
         }