Changeset b5fe39b

Timestamp:

2012-02-10T23:49:28Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

00d6760

Parents:

fc0640e

Message:

Applied patch from #895, making show_old_mentions an integer setting instead
of boolean so you can change the number of mentions being fetched.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -1455 +1455 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="show_old_mentions" type="integer" scope="account">
+                <default>20</default>
+
+                <description>
+                        <para>
+                                This setting specifies the number of old mentions to fetch on connection. Must be less or equal to 200. Setting it to 0 disables this feature.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="switchboard_keepalives" type="boolean" scope="account">
                 <default>false</default>

protocols/twitter/twitter.c

@@ -279 +279 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
+        s = set_add(&acc->set, "show_old_mentions", "20", set_eval_int, acc);
 
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -752 +752 @@
         struct twitter_data *td = ic->proto_data;
         gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
-        gboolean show_old_mentions = set_getbool(&ic->acc->set, "show_old_mentions");
+        int show_old_mentions = set_getint(&ic->acc->set, "show_old_mentions");
         struct twitter_xml_list *home_timeline = td->home_timeline_obj;
         struct twitter_xml_list *mentions = td->mentions_obj;
@@ -774 +774 @@
         if (include_mentions && mentions && mentions->list) {
                 for (l = mentions->list; l; l = g_slist_next(l)) {
-                        if (!show_old_mentions && output && twitter_compare_elements(l->data, output->data) < 0) {
+                        if (show_old_mentions < 1 && output && twitter_compare_elements(l->data, output->data) < 0) {
                                 continue;
                         }
@@ -852 +852 @@
                 args[4] = "since_id";
                 args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
-        }
-
-        if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
-                     td->timeline_id ? 6 : 4) == NULL) {
+        } else {
+                args[4] = "count";
+                args[5] = g_strdup_printf("%d", set_getint(&ic->acc->set, "show_old_mentions"));
+        }
+
+        if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions,
+                         ic, 0, args, 6) == NULL) {
                 if (++td->http_fails >= 5)
                         imcb_error(ic, "Could not retrieve %s: %s",