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

File:

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

protocols/twitter/twitter_lib.c

@@ -240 +240 @@
 
 static void twitter_http_get_friends_ids(struct http_request *req);
-static void twitter_http_get_mutes_ids(struct http_request *req);
-static void twitter_http_get_noretweets_ids(struct http_request *req);
 
 /**
@@ -254 +252 @@
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
-
-        g_free(args[1]);
-}
-
-/**
- * Get the muted users ids.
- */
-void twitter_get_mutes_ids(struct im_connection *ic, gint64 next_cursor)
-{
-        char *args[2];
-
-        args[0] = "cursor";
-        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
-        twitter_http(ic, TWITTER_MUTES_IDS_URL, twitter_http_get_mutes_ids, ic, 0, args, 2);
-
-        g_free(args[1]);
-}
-
-/**
- * Get the ids for users from whom we should ignore retweets.
- */
-void twitter_get_noretweets_ids(struct im_connection *ic, gint64 next_cursor)
-{
-        char *args[2];
-
-        args[0] = "cursor";
-        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
-        twitter_http(ic, TWITTER_NORETWEETS_IDS_URL, twitter_http_get_noretweets_ids, ic, 0, args, 2);
 
         g_free(args[1]);
@@ -367 +337 @@
 }
 
-/**
- * Callback for getting the mutes ids.
- */
-static void twitter_http_get_mutes_ids(struct http_request *req)
-{
-        struct im_connection *ic = req->data;
-        json_value *parsed;
-        struct twitter_xml_list *txl;
-        struct twitter_data *td;
-
-        // Check if the connection is stil active
-        if (!g_slist_find(twitter_connections, ic)) {
-                return;
-        }
-
-        td = ic->proto_data;
-
-        if (req->status_code != 200) {
-                /* Fail silently */
-                return;
-        }
-
-        // Parse the data.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
-
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = td->mutes_ids;
-
-        /* mute ids API response is similar enough to friends response
-           to reuse this method */
-        twitter_xt_get_friends_id_list(parsed, txl);
-        json_value_free(parsed);
-
-        td->mutes_ids = txl->list;
-        if (txl->next_cursor) {
-                /* Recurse while there are still more pages */
-                twitter_get_mutes_ids(ic, txl->next_cursor);
-        }
-
-        txl->list = NULL;
-        txl_free(txl);
-}
-
-/**
- * Callback for getting the no-retweets ids.
- */
-static void twitter_http_get_noretweets_ids(struct http_request *req)
-{
-        struct im_connection *ic = req->data;
-        json_value *parsed;
-        struct twitter_xml_list *txl;
-        struct twitter_data *td;
-
-        // Check if the connection is stil active
-        if (!g_slist_find(twitter_connections, ic)) {
-                return;
-        }
-
-        if (req->status_code != 200) {
-                /* Fail silently */
-                return;
-        }
-
-        td = ic->proto_data;
-
-        // Parse the data.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
-
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = td->noretweets_ids;
-        
-        // Process the retweet ids
-        txl->type = TXL_ID;
-        if (parsed->type == json_array) {
-                unsigned int i;
-                for (i = 0; i < parsed->u.array.length; i++) {
-                        json_value *c = parsed->u.array.values[i];
-                        if (c->type != json_integer) {
-                                continue;
-                        }
-                        txl->list = g_slist_prepend(txl->list,
-                                                    g_strdup_printf("%"PRIu64, c->u.integer));
-                }
-        }
-
-        json_value_free(parsed);
-        td->noretweets_ids = txl->list;
-
-        txl->list = NULL;
-        txl_free(txl);
-}
-
 static gboolean twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl);
 static void twitter_http_get_users_lookup(struct http_request *req);
@@ -587 +461 @@
 #endif
 
-static void expand_entities(char **text, const json_value *node, const json_value *extended_node);
+static void expand_entities(char **text, const json_value *node);
 
 /**
@@ -599 +473 @@
 static struct twitter_xml_status *twitter_xt_get_status(const json_value *node)
 {
-        struct twitter_xml_status *txs = {0};
+        struct twitter_xml_status *txs;
         const json_value *rt = NULL;
-        const json_value *text_value = NULL;
-        const json_value *extended_node = NULL;
 
         if (node->type != json_object) {
@@ -610 +482 @@
 
         JSON_O_FOREACH(node, k, v) {
-                if (strcmp("text", k) == 0 && v->type == json_string && text_value == NULL) {
-                        text_value = v;
-                } else if (strcmp("full_text", k) == 0 && v->type == json_string) {
-                        text_value = v;
-                } else if (strcmp("extended_tweet", k) == 0 && v->type == json_object) {
-                        text_value = json_o_get(v, "full_text");
-                        extended_node = v;
+                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;
@@ -642 +510 @@
                 struct twitter_xml_status *rtxs = twitter_xt_get_status(rt);
                 if (rtxs) {
+                        g_free(txs->text);
                         txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                         txs->id = rtxs->id;
                         txs_free(rtxs);
                 }
-        } else if (text_value && text_value->type == json_string) {
-                txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
-                strip_html(txs->text);
-                expand_entities(&txs->text, node, extended_node);
+        } else {
+                expand_entities(&txs->text, node);
         }
 
@@ -692 +559 @@
         }
 
-        expand_entities(&txs->text, node, NULL);
+        expand_entities(&txs->text, node);
 
         if (txs->text && txs->user && txs->id) {
@@ -702 +569 @@
 }
 
-static void expand_entities(char **text, const json_value *node, const json_value *extended_node)
-{
-        json_value *entities, *extended_entities, *quoted;
+static void expand_entities(char **text, const json_value *node)
+{
+        json_value *entities, *quoted;
         char *quote_url = NULL, *quote_text = NULL;
 
@@ -722 +589 @@
         }
 
-        if (extended_node) {
-                extended_entities = json_o_get(extended_node, "entities");
-                if (extended_entities && extended_entities->type == json_object) {
-                        entities = extended_entities;
-                }
-        }
-
         JSON_O_FOREACH(entities, k, v) {
                 int i;
@@ -971 +831 @@
         struct twitter_data *td = ic->proto_data;
         char *last_id_str;
-        char *uid_str;
 
         if (status->user == NULL || status->text == NULL) {
-                return;
-        }
-        
-        /* Check this is not a tweet that should be muted */
-        uid_str = g_strdup_printf("%" PRIu64, status->user->uid);
-
-        if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
-                g_free(uid_str);
-                return;
-        }
-        if (status->id != status->rt_id && g_slist_find_custom(td->noretweets_ids, uid_str, (GCompareFunc)strcmp)) {
-                g_free(uid_str);
                 return;
         }
@@ -1010 +857 @@
         set_setstr(&ic->acc->set, "_last_tweet", last_id_str);
         g_free(last_id_str);
-        g_free(uid_str);
 }
 
@@ -1028 +874 @@
         }
 
+        ic->flags |= OPT_PONGED;
         td = ic->proto_data;
 
@@ -1043 +890 @@
                 imc_logout(ic, TRUE);
                 return;
-        }
-
-        if (req == td->stream) {
-                ic->flags |= OPT_PONGED;
         }
 
@@ -1150 +993 @@
         json_value *target = json_o_get(o, "target");
         const char *type = json_o_str(o, "event");
-        struct twitter_xml_user *us = NULL;
-        struct twitter_xml_user *ut = NULL;
 
         if (!type || !source || source->type != json_object
@@ -1159 +1000 @@
 
         if (strcmp(type, "follow") == 0) {
-                us = twitter_xt_get_user(source);
-                ut = twitter_xt_get_user(target);
+                struct twitter_xml_user *us = twitter_xt_get_user(source);
+                struct twitter_xml_user *ut = twitter_xt_get_user(target);
                 if (g_strcasecmp(us->screen_name, td->user) == 0) {
                         twitter_add_buddy(ic, ut->screen_name, ut->name);
                 }
-        } else if (strcmp(type, "mute") == 0) {
-                GSList *found;
-                char *uid_str;
-                ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
-                if (!(found = g_slist_find_custom(td->mutes_ids, uid_str,
-                                                  (GCompareFunc)strcmp))) {
-                        td->mutes_ids = g_slist_prepend(td->mutes_ids, uid_str);
-                }
-                twitter_log(ic, "Muted user %s", ut->screen_name);
-                if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New mute: %s %"PRIu64"\n",
-                                ut->screen_name, ut->uid);
-                }
-        } else if (strcmp(type, "unmute") == 0) {
-                GSList *found;
-                char *uid_str;
-                ut = twitter_xt_get_user(target);
-                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
-                if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
-                                                (GCompareFunc)strcmp))) {
-                        char *found_str = found->data;
-                        td->mutes_ids = g_slist_delete_link(td->mutes_ids, found);
-                        g_free(found_str);
-                }
-                g_free(uid_str);
-                twitter_log(ic, "Unmuted user %s", ut->screen_name);
-                if (getenv("BITLBEE_DEBUG")) {
-                        fprintf(stderr, "New unmute: %s %"PRIu64"\n",
-                                ut->screen_name, ut->uid);
-                }
-        }
-
-        txu_free(us);
-        txu_free(ut);
+                txu_free(us);
+                txu_free(ut);
+        }
 
         return TRUE;
@@ -1496 +1305 @@
         td->flags &= ~TWITTER_GOT_TIMELINE;
 
-        char *args[8];
+        char *args[6];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
-        args[4] = "tweet_mode";
-        args[5] = "extended";
         if (td->timeline_id) {
-                args[6] = "since_id";
-                args[7] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
         if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                         td->timeline_id ? 8 : 6) == NULL) {
+                         td->timeline_id ? 6 : 4) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",
@@ -1520 +1327 @@
         g_free(args[1]);
         if (td->timeline_id) {
-                g_free(args[7]);
+                g_free(args[5]);
         }
 }
@@ -1535 +1342 @@
         td->flags &= ~TWITTER_GOT_MENTIONS;
 
-        char *args[8];
+        char *args[6];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
@@ -1547 +1354 @@
                 args[5] = g_strdup_printf("%d", set_getint(&ic->acc->set, "show_old_mentions"));
         }
-        args[6] = "tweet_mode";
-        args[7] = "extended";
 
         if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions,
-                         ic, 0, args, 8) == NULL) {
+                         ic, 0, args, 6) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",
@@ -1719 +1524 @@
 }
 
-/**
- * Mute or unmute a user
- */
-void twitter_mute_create_destroy(struct im_connection *ic, char *who, int create)
-{
-        char *args[2];
-
-        args[0] = "screen_name";
-        args[1] = who;
-        twitter_http(ic, create ? TWITTER_MUTES_CREATE_URL : TWITTER_MUTES_DESTROY_URL,
-                     twitter_http_post, ic, 1, args, 2);
-}
-
 void twitter_status_destroy(struct im_connection *ic, guint64 id)
 {