Changeset b3d99e3

Timestamp:

2012-09-15T16:03:33Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b61c74c

Parents:

7281ad1

Message:

Twitter module cleanup: Both Twitter and identi.ca "modules" support OAuth
now.

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -69 +69 @@
                         
                         <bitlbee-command name="twitter">
-                                <syntax>account add twitter &lt;handle&gt; [&lt;password&gt;]</syntax>
+                                <syntax>account add twitter &lt;handle&gt;</syntax>
 
                                 <description>
@@ -95 +95 @@
                         
                         <bitlbee-command name="identica">
-                                <syntax>account add identica &lt;handle&gt; [&lt;password&gt;]</syntax>
+                                <syntax>account add identica &lt;handle&gt;</syntax>
 
                                 <description>
                                         <para>
-                                                Same protocol as <emphasis>twitter</emphasis>, but defaults to a <emphasis>base_url</emphasis> pointing at identi.ca, and with OAuth disabled.
+                                                Same protocol as <emphasis>twitter</emphasis>, but defaults to a <emphasis>base_url</emphasis> pointing at identi.ca. It also works with OAuth (so don't specify your password).
                                         </para>
                                 </description>

protocols/twitter/twitter.c

@@ -242 +242 @@
         set_t *s;
         char *def_url;
-        char *def_oauth;
         char *def_tul;
 
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 def_url = TWITTER_API_URL;
-                def_oauth = "true";
                 def_tul = "20";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
                 def_url = IDENTICA_API_URL;
-                def_oauth = "true";
                 def_tul = "0";
         }
@@ -274 +271 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "oauth", def_oauth, set_eval_oauth, acc);
+        s = set_add(&acc->set, "oauth", "true", set_eval_oauth, acc);
 
         s = set_add(&acc->set, "show_ids", "true", set_eval_bool, acc);