Changeset 166a571

Timestamp:

2016-04-01T18:06:15Z (9 years ago)

Author:

Flexo <nick@…>

Branches:

master

Children:

991c75f

Parents:

0d581bd

Message:

Avoid adding an id twice to the mutes list.

Twitter doesn't error if you mute the same user multiple times.

Also, correct signedness of the stringified user ids. bitlbee keeps them as
unsigned even if the json library uses signed for integers...

File:

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

protocols/twitter/twitter_lib.c

@@ -954 +954 @@
         
         /* Check this is not a tweet that should be muted */
-        uid_str = g_strdup_printf("%" G_GINT64_FORMAT, status->user->uid);
+        uid_str = g_strdup_printf("%" PRIu64, status->user->uid);
+        if (getenv("BITLBEE_DEBUG")) {
+                GSList *item;
+                fprintf(stderr, "Checking mutes; this uid=%s\n", uid_str);
+                for (item = td->mutes_ids; item != NULL; item = item->next) {
+                        fprintf(stderr, "  id: %s\n", (char *)item->data);
+                }
+        }
         if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
                 g_free(uid_str);
@@ -1137 +1144 @@
                 }
         } else if (strcmp(type, "mute") == 0) {
-                GSList *ids = td->mutes_ids;
+                GSList *found;
+                char *uid_str;
                 ut = twitter_xt_get_user(target);
-                ids = g_slist_prepend(ids,
-                                      g_strdup_printf("%" G_GINT64_FORMAT, ut->uid));
-        
-                td->mutes_ids = ids;
+                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("%" G_GINT64_FORMAT, ut->uid);
+                uid_str = g_strdup_printf("%" PRIu64, ut->uid);
                 if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                 (GCompareFunc)strcmp))) {
@@ -1153 +1167 @@
                 }
                 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);
+                }
         }