Changeset 537d9b9 for protocols/twitter/twitter.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (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 master up to commit '9f03c47' into parson

File:

• protocols/twitter/twitter.c (modified) (8 diffs)

protocols/twitter/twitter.c

@@ -345 +345 @@
                 imcb_log(ic, "Getting contact list");
                 twitter_get_friends_ids(ic, -1);
+                twitter_get_mutes_ids(ic, -1);
+                twitter_get_noretweets_ids(ic, -1);
         } else {
                 twitter_main_loop_start(ic);
@@ -469 +471 @@
         g_regex_match(regex, msg, 0, &match_info);
         while (g_match_info_matches(match_info)) {
-                gchar *s, *url;
+                gchar *url;
 
                 url = g_match_info_fetch(match_info, 2);
                 url_len_diff += target_len - g_utf8_strlen(url, -1);
 
-                /* Add another character for https://t.co/... URLs */
-                if ((s = g_match_info_fetch(match_info, 3))) {
-                        url_len_diff += 1;
-                        g_free(s);
-                }
                 g_free(url);
                 g_match_info_next(match_info, NULL);
@@ -541 +538 @@
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 def_url = TWITTER_API_URL;
-                def_tul = "22";
+                def_tul = "23";
                 def_mentions = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
@@ -690 +687 @@
                 }
 
+                g_slist_foreach(td->mutes_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->mutes_ids);
+
+                g_slist_foreach(td->noretweets_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->noretweets_ids);
+
                 http_close(td->stream);
                 twitter_filter_remove_all(ic);
@@ -948 +951 @@
         } else if ((g_strcasecmp(cmd[0], "favourite") == 0 ||
                     g_strcasecmp(cmd[0], "favorite") == 0 ||
-                    g_strcasecmp(cmd[0], "fav") == 0) && cmd[1]) {
+                    g_strcasecmp(cmd[0], "fav") == 0 ||
+                    g_strcasecmp(cmd[0], "like") == 0) && cmd[1]) {
                 if ((id = twitter_message_id_from_command_arg(ic, cmd[1], NULL))) {
                         twitter_favourite_tweet(ic, id);
@@ -960 +964 @@
         } else if (g_strcasecmp(cmd[0], "unfollow") == 0 && cmd[1]) {
                 twitter_remove_buddy(ic, cmd[1], NULL);
+                goto eof;
+        } else if (g_strcasecmp(cmd[0], "mute") == 0 && cmd[1]) {
+                twitter_mute_create_destroy(ic, cmd[1], 1);
+                goto eof;
+        } else if (g_strcasecmp(cmd[0], "unmute") == 0 && cmd[1]) {
+                twitter_mute_create_destroy(ic, cmd[1], 0);
                 goto eof;
         } else if ((g_strcasecmp(cmd[0], "report") == 0 ||
@@ -1082 +1092 @@
         struct prpl *ret = g_new0(struct prpl, 1);
 
-        ret->options = OPT_NOOTR;
+        ret->options = PRPL_OPT_NOOTR | PRPL_OPT_NO_PASSWORD;
         ret->name = "twitter";
         ret->login = twitter_login;
@@ -1109 +1119 @@
         ret = g_memdup(ret, sizeof(struct prpl));
         ret->name = "identica";
+        ret->options =  PRPL_OPT_NOOTR;
         register_protocol(ret);
 }