Changes in protocols/twitter/twitter_lib.c [58d285a:d11822a]

File:

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

protocols/twitter/twitter_lib.c

@@ -234 +234 @@
         if ((ret = json_parse(req->reply_body, req->body_size)) == NULL) {
                 imcb_error(ic, "Could not retrieve %s: %s",
-                           path, "XML parse error");
+                           path, "JSON parse error");
         }
         return ret;
@@ -308 +308 @@
 
                 txl->list = g_slist_prepend(txl->list,
-                                            g_strdup_printf("%" PRIu64, c->u.array.values[i]->u.integer));
+                                            g_strdup_printf("%" PRId64, c->u.array.values[i]->u.integer));
         }
 
@@ -441 +441 @@
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->noretweets_ids;
-        
+
         // Process the retweet ids
         txl->type = TXL_ID;
@@ -452 +452 @@
                         }
                         txl->list = g_slist_prepend(txl->list,
-                                                    g_strdup_printf("%"PRIu64, c->u.integer));
+                                                    g_strdup_printf("%" PRId64, c->u.integer));
                 }
         }
@@ -710 +710 @@
                 return;
         if ((quoted = json_o_get(node, "quoted_status")) && quoted->type == json_object) {
-                /* New "retweets with comments" feature. Note that this info
-                 * seems to be included in the streaming API only! Grab the
+                /* New "retweets with comments" feature. Grab the
                  * full message and try to insert it when we run into the
                  * Tweet entity. */
@@ -751 +750 @@
                         char *pos, *new;
 
-                        if (!kort || !disp || !(pos = strstr(*text, kort))) {
+                        /* Skip if a required field is missing, if the t.co URL is not in fact
+                           in the Tweet at all, or if the full-ish one *is* in it already
+                           (dupes appear, especially in streaming API). */
+                        if (!kort || !disp || !(pos = strstr(*text, kort)) || strstr(*text, disp)) {
                                 continue;
                         }
@@ -976 +978 @@
                 return;
         }
-        
+
         /* Check this is not a tweet that should be muted */
-        uid_str = g_strdup_printf("%" PRIu64, status->user->uid);
+        uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid);
 
         if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
@@ -1168 +1170 @@
                 char *uid_str;
                 ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
                 if (!(found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                   (GCompareFunc)strcmp))) {
@@ -1175 +1177 @@
                 twitter_log(ic, "Muted user %s", ut->screen_name);
                 if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New mute: %s %"PRIu64"\n",
+                        fprintf(stderr, "New mute: %s %"G_GUINT64_FORMAT"\n",
                                 ut->screen_name, ut->uid);
                 }
@@ -1182 +1184 @@
                 char *uid_str;
                 ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
                 if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                 (GCompareFunc)strcmp))) {
@@ -1192 +1194 @@
                 twitter_log(ic, "Unmuted user %s", ut->screen_name);
                 if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New unmute: %s %"PRIu64"\n",
+                        fprintf(stderr, "New unmute: %s %"G_GUINT64_FORMAT"\n",
                                 ut->screen_name, ut->uid);
                 }
@@ -1688 +1690 @@
         };
 
+        if (set_getbool(&ic->acc->set, "in_korea") && !in_reply_to) {
+                g_free(args[3]);
+                args[2] = "place_id";
+                args[3] = g_strdup("c999e6a453e9ef72");
+                in_reply_to = 1;
+        }
+
         twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1,
                      args, in_reply_to ? 4 : 2);