Changeset 7a9d968 for protocols/twitter

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

Location:

protocols/twitter

Files:

• Makefile (modified) (1 diff)
• twitter.c (modified) (1 diff)
• twitter_lib.c (modified) (8 diffs)

protocols/twitter/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
+        $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 twitter_mod.o: $(objects)
         @echo '*' Linking twitter_mod.o
-        @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o
+        $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o
         
 -include .depend/*.d

protocols/twitter/twitter.c

@@ -576 +576 @@
         s->flags |= SET_HIDDEN | SET_NOSAVE;
 
+        s = set_add(&acc->set, "in_korea", "false", set_eval_bool, acc);
+        s->flags |= SET_HIDDEN;
+
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -239 +239 @@
         if ((ret = json_parse_string(req->reply_body)) == NULL) {
                 imcb_error(ic, "Could not retrieve %s: %s",
-                           path, "XML parse error");
+                           path, "JSON parse error");
         }
         return ret;
@@ -310 +310 @@
 
                 txl->list = g_slist_prepend(txl->list,
-                                            g_strdup_printf("%lld", id));
+                                            g_strdup_printf("%" PRIu64, id);
         }
 
@@ -443 +443 @@
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->noretweets_ids;
-        
+
         // Process the retweet ids
         txl->type = TXL_ID;
@@ -452 +452 @@
                         jint id = json_array_get_integer(arr, i);
                         txl->list = g_slist_prepend(txl->list,
-                                                    g_strdup_printf("%lld", id));
+                                                    g_strdup_printf("%" PRId64, id));
                 }
         }
@@ -713 +713 @@
                 return;
         if ((quoted = json_object_get_object(node, "quoted_status"))) {
-                /* 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. */
@@ -755 +754 @@
                         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;
                         }
@@ -980 +982 @@
                 return;
         }
-        
+
         /* Check this is not a tweet that should be muted */
         uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid);
@@ -1691 +1693 @@
         };
 
+        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);