Changeset f924563

Timestamp:

2010-05-03T00:52:08Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1a3ba05

Parents:

6a9d068 (diff), 6824fb3 (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:

Mainline merge.

Files:

• bitlbee.c (modified) (2 diffs)
• bitlbee.h (modified) (1 diff)
• debian/bitlbee.init (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/rules (modified) (1 diff)
• doc/CHANGES (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (7 diffs)
• lib/Makefile (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/oauth.c (added)
• lib/oauth.h (added)
• lib/url.c (modified) (1 diff)
• lib/url.h (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/msn/msn.h (modified) (4 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (6 diffs)
• protocols/twitter/twitter.c (modified) (6 diffs)
• protocols/twitter/twitter.h (modified) (1 diff)
• protocols/twitter/twitter_http.c (modified) (4 diffs)
• protocols/twitter/twitter_http.h (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (10 diffs)

bitlbee.c

@@ -36 +36 @@
 static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition condition );
 
+static gboolean try_listen( struct addrinfo *res )
+{
+        int i;
+        
+        global.listen_socket = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
+        if( global.listen_socket < 0 )
+        {
+                log_error( "socket" );
+                return FALSE;
+        }
+
+#ifdef IPV6_V6ONLY              
+        if( res->ai_family == AF_INET6 )
+        {
+                i = 0;
+                setsockopt( global.listen_socket, IPPROTO_IPV6, IPV6_V6ONLY,
+                            (char *) &i, sizeof( i ) );
+        }
+#endif
+
+        /* TIME_WAIT (?) sucks.. */
+        i = 1;
+        setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
+
+        i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
+        if( i == -1 )
+        {
+                closesocket( global.listen_socket );
+                global.listen_socket = -1;
+                
+                log_error( "bind" );
+                return FALSE;
+        }
+        
+        return TRUE;
+}
+
 int bitlbee_daemon_init()
 {
@@ -63 +100 @@
 
         global.listen_socket = -1;
-
+        
+        /* Try IPv6 first (which will become an IPv6+IPv4 socket). */
         for( res = addrinfo_bind; res; res = res->ai_next )
-        {
-                global.listen_socket = socket( res->ai_family, res->ai_socktype, res->ai_protocol );
-                if( global.listen_socket < 0 )
-                        continue;
-
-#ifdef IPV6_V6ONLY              
-                if( res->ai_family == AF_INET6 )
-                {
-                        i = 0;
-                        setsockopt( global.listen_socket, IPPROTO_IPV6, IPV6_V6ONLY,
-                                    (char *) &i, sizeof( i ) );
-                }
-#endif
-
-                /* TIME_WAIT (?) sucks.. */
-                i = 1;
-                setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
-
-                i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
-                if( i == -1 )
-                {
-                        log_error( "bind" );
-                        return( -1 );
-                }
-                break;
-        }
-
+                if( res->ai_family == AF_INET6 && try_listen( res ) )
+                        break;
+        
+        /* The rest (so IPv4, I guess). */
+        if( res == NULL )
+                for( res = addrinfo_bind; res; res = res->ai_next )
+                        if( res->ai_family != AF_INET6 && try_listen( res ) )
+                                break;
+        
         freeaddrinfo( addrinfo_bind );
 

bitlbee.h

@@ -35 +35 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.6"
+#define BITLBEE_VERSION "1.2.6a"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))

debian/bitlbee.init

@@ -38 +38 @@
 d_start() {
         # Make sure BitlBee can actually write its PID...
-        touch /var/run/bitlbee.pid
-        chown bitlbee: /var/run/bitlbee.pid
+        touch $PIDFILE
+        chown bitlbee: $PIDFILE
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \

debian/changelog

@@ +1 @@
+bitlbee (1.2.6a-1) unstable; urgency=low
+
+  * New upstream version.
+  * Native support for Twitter.
+  * Fixed /WHOIS response format. (Closes: #576120)
+  * Problems with bitlbee-skype are solved by now. (Closes: #575572)
+
+ -- Wilmer van der Gaast <wilmer@peer.gaast.net>  Tue, 20 Apr 2010 00:34:51 +0200
+
 bitlbee (1.2.5-1) unstable; urgency=low
 

debian/rules

@@ -99 +99 @@
                 find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
 
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
+        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0
 
         dpkg --build debian/bitlbee-dev ..

doc/CHANGES

@@ -4 +4 @@
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
 
+Version 1.2.6a:
+- Fixed a typo that renders the Twitter groupchat mode unusable. A last-
+  minute change that came a few minutes late.
+
+Finished 19 Apr 2010
+
 Version 1.2.6:
-- Native (very basic) support for Twitter.
+- Native (very basic) support for Twitter, implemented by Geert Mulders.
+  Currently supported are posting tweets, reading the ones of people you
+  follow, and sending (not yet receiving!) direct messages.
 - Fixed format of status messages in /WHOIS to improve IRC client
   compatibility.
@@ -16 +24 @@
   behaviour now is to write to wherever the last message came from, or to
   the bare JID (usually becomes a broadcast) if there wasn't any recent msg.
+- Added a switchboard_keepalives setting which should solve some issues with
+  talking to offline MSN contacts. (Although full support for offline
+  messages is not ready yet!)
 - The usual misc. bug fixes.
 
-Finished ...
+Finished 19 Apr 2010
 
 Version 1.2.5:

doc/user-guide/commands.xml

@@ -21 +21 @@
                         <description>
                                 <para>
-                                        Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
+                                        Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ), Yahoo and Twitter. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
                                 </para>
                         </description>
@@ -73 +73 @@
                                         
                                         <para>
-                                                By default all your Twitter contacts will show up in your contact list and their tweets will show up as private messages or in &amp;bitlbee depending on your settings. If you want them in a separate channel, use the use_groupchat setting (see <emphasis>help set use_groupchat</emphasis>).
+                                                By default all your Twitter contacts will come from a contact called twitter_(yourusername). You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
                                         </para>
                                         
                                         <para>
-                                                To send tweets yourself, send them to any of your Twitter contacts via /query (doesn't matter who), or just write in the groupchat channel if you enabled that option.
+                                                To send tweets yourself, send them to the twitter_(yourusername) contact, or just write in the groupchat channel if you enabled that option.
+                                        </para>
+
+                                        <para>
+                                                Since Twitter now requires OAuth authentication, you should not enter your Twitter password into BitlBee. Just type a bogus password. The first time you log in, BitlBee will start OAuth authentication. (See <emphasis>help set oauth</emphasis>.)
                                         </para>
                                 </description>
@@ -659 +663 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="mode" type="string" scope="account">
+                <possible-values>one, many, chat</possible-values>
+                <default>one</default>
+
+                <description>
+                        <para>
+                                By default, everything from the Twitter module will come from one nick, twitter_(yourusername). If you prefer to have individual nicks for everyone, you can set this setting to "many" instead.
+                        </para>
+                        
+                        <para>
+                                If you prefer to have all your Twitter things in a separate channel, you can set this setting to "chat".
+                        </para>
+                        
+                        <para>
+                                In the last two modes, you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="nick" type="string" scope="chat">
 
@@ -683 +707 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="oauth" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                This enables OAuth authentication for Twitter accounts. From June 2010 this will be mandatory.
+                        </para>
+
+                        <para>
+                                With OAuth enabled, you shouldn't tell BitlBee your Twitter password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with Twitter. If this succeeds, Twitter will return a PIN code which you can give back to BitlBee to finish the process.
+                        </para>
+
+                        <para>
+                                The resulting access token will be saved permanently, so you have to do this only once.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>
@@ -818 +861 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="show_offline" type="boolean" scope="global">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                If enabled causes BitlBee to also show offline users in Channel. Online-users will get op, away-users voice and offline users none of both. This option takes effect as soon as you reconnect.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="simulate_netsplit" type="boolean" scope="global">
                 <default>true</default>
@@ -863 +916 @@
                         <para>
                                 If BitlBee fails to detect this sometimes (most likely in AIM messages over an ICQ connection), you can set this setting to <emphasis>always</emphasis>, but this might sometimes accidentally strip non-HTML things too.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="switchboard_keepalives" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Turn on this flag if you have difficulties talking to offline/invisible contacts.
+                        </para>
+                        
+                        <para>
+                                With this setting enabled, BitlBee will send keepalives to MSN switchboards with offline/invisible contacts every twenty seconds. This should keep the server and client on the other side from shutting it down.
+                        </para>
+                        
+                        <para>
+                                This is useful because BitlBee doesn't support MSN offline messages yet and the MSN servers won't let the user reopen switchboards to offline users. Once offline messaging is supported, this flag might be removed.
                         </para>
                 </description>
@@ -916 +987 @@
                         <para>
                                 Sends you a /notice when a user starts typing a message (if supported by the IM protocol and the user's client). To use this, you most likely want to use a script in your IRC client to show this information in a more sensible way.
-                        </para>
-                </description>
-        </bitlbee-setting>
-
-        <bitlbee-setting name="use_groupchat" type="boolean" scope="account">
-                <default>false</default>
-
-                <description>
-                        <para>
-                                By default the Twitter module shows all Twitter contacts and their Tweet in &amp;bitlbee and/or private messages. With this setting enabled the module will show all contacts and their Tweets in a separate channel.
                         </para>
                 </description>

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ftutil.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall

lib/misc.c

@@ -306 +306 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' ) */
-                if( !isalnum( t[i] ) )
+                if( !isalnum( t[i] ) && !strchr( "._-~", t[i] ) )
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );

lib/url.c

@@ -27 +27 @@
 
 /* Convert an URL to a url_t structure */
-int url_set( url_t *url, char *set_url )
+int url_set( url_t *url, const char *set_url )
 {
         char s[MAX_STRING+1];

lib/url.h

@@ -42 +42 @@
 } url_t;
 
-int url_set( url_t *url, char *set_url );
+int url_set( url_t *url, const char *set_url );

protocols/msn/msn.c

@@ -38 +38 @@
         set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
 }
 

protocols/msn/msn.h

@@ -31 +31 @@
 #define TYPING_NOTIFICATION_MESSAGE "\r\r\rBEWARE, ME R TYPINK MESSAGE!!!!\r\r\r"
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
+#define SB_KEEPALIVE_MESSAGE "\r\r\rDONT HANG UP ON ME!\r\r\r"
 
 #ifdef DEBUG_MSN
@@ -53 +54 @@
                            "TypingUser: %s\r\n" \
                            "\r\n\r\n"
+
+#define SB_KEEPALIVE_HEADERS "MIME-Version: 1.0\r\n" \
+                             "Content-Type: text/x-ping\r\n" \
+                             "\r\n\r\n"
 
 #define PROFILE_URL "http://members.msn.com/"
@@ -84 +89 @@
         gint inp;
         struct msn_handler_data *handler;
+        gint keepalive;
         
         int trId;
@@ -181 +187 @@
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
 int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial );
+void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
 /* invitation.c */

protocols/msn/ns.c

@@ -422 +422 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                if( cmd[1] )
-                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                if( cmd[1] == NULL )
+                        return 1;
+                
+                imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                
+                msn_sb_start_keepalives( msn_sb_by_handle( ic, cmd[1] ), TRUE );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -449 +453 @@
                                    ( st != msn_away_state_list ? OPT_AWAY : 0 ),
                                    st->name, NULL );
+                
+                msn_sb_stop_keepalives( msn_sb_by_handle( ic, cmd[2] ) );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )

protocols/msn/sb.c

@@ -175 +175 @@
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
                 }
+                else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
+                {
+                        buf = g_strdup( SB_KEEPALIVE_HEADERS );
+                        i = strlen( buf );
+                }
                 else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
                 {
@@ -256 +261 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -477 +483 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -526 +534 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -587 +597 @@
                 if( sb->who )
                 {
+                        msn_sb_stop_keepalives( sb );
+                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -752 +764 @@
         return( 1 );
 }
+
+static gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond )
+{
+        struct msn_switchboard *sb = data;
+        return sb->ready && msn_sb_sendmessage( sb, SB_KEEPALIVE_MESSAGE );
+}
+
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial )
+{
+        bee_user_t *bu;
+        
+        if( sb && sb->who && sb->keepalive == 0 &&
+            ( bu = bee_user_by_handle( sb->ic->bee, sb->ic, sb->who ) ) &&
+            !( bu->flags & BEE_USER_ONLINE ) &&
+            set_getbool( &sb->ic->acc->set, "switchboard_keepalives" ) )
+        {
+                if( initial )
+                        msn_sb_keepalive( sb, 0, 0 );
+                
+                sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
+        }
+}
+
+void msn_sb_stop_keepalives( struct msn_switchboard *sb )
+{
+        if( sb && sb->keepalive > 0 )
+        {
+                b_event_remove( sb->keepalive );
+                sb->keepalive = 0;
+        }
+}

protocols/twitter/twitter.c

@@ -23 +23 @@
 
 #include "nogaim.h"
+#include "oauth.h"
 #include "twitter.h"
 #include "twitter_http.h"
 #include "twitter_lib.h"
 
-
 /**
  * Main loop function
@@ -41 +41 @@
         // If the user uses multiple private message windows we need to get the 
         // users buddies.
-        if (!set_getbool( &ic->acc->set, "use_groupchat" ))
+        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "many") == 0)
                 twitter_get_statuses_friends(ic, -1);
 
@@ -51 +51 @@
 }
 
-
-static void twitter_init( account_t *acc )
-{
-        set_t *s;
-        s = set_add( &acc->set, "use_groupchat", "false", set_eval_bool, acc );
-        s->flags |= ACC_SET_OFFLINE_ONLY;
-}
-
-/**
- * Login method. Since the twitter API works with seperate HTTP request we 
- * only save the user and pass to the twitter_data object.
- */
-static void twitter_login( account_t *acc )
-{
-        struct im_connection *ic = imcb_new( acc );
-        struct twitter_data *td = g_new0( struct twitter_data, 1 );
-
-        twitter_connections = g_slist_append( twitter_connections, ic );
-
-        td->user = acc->user;
-        td->pass = acc->pass;
-        td->home_timeline_id = 0;
-
-        ic->proto_data = td;
-
+static void twitter_main_loop_start( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
         imcb_log( ic, "Connecting to Twitter" );
 
@@ -86 +65 @@
 }
 
+
+static const struct oauth_service twitter_oauth =
+{
+        "http://api.twitter.com/oauth/request_token",
+        "http://api.twitter.com/oauth/access_token",
+        "http://api.twitter.com/oauth/authorize",
+        .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
+        .consumer_secret = "FCxqcr0pXKzsF9ajmP57S3VQ8V6Drk4o2QYtqMcOszo",
+};
+
+static gboolean twitter_oauth_callback( struct oauth_info *info );
+
+static void twitter_oauth_start( struct im_connection *ic )
+{
+        struct twitter_data *td = ic->proto_data;
+        
+        imcb_log( ic, "Requesting OAuth request token" );
+
+        td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
+}
+
+static gboolean twitter_oauth_callback( struct oauth_info *info )
+{
+        struct im_connection *ic = info->data;
+        struct twitter_data *td;
+        
+        if( !g_slist_find( twitter_connections, ic ) )
+                return FALSE;
+        
+        td = ic->proto_data;
+        if( info->stage == OAUTH_REQUEST_TOKEN )
+        {
+                char name[strlen(ic->acc->user)+9], *msg;
+                
+                if( info->request_token == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return FALSE;
+                }
+                
+                sprintf( name, "twitter_%s", ic->acc->user );
+                msg = g_strdup_printf( "To finish OAuth authentication, please visit "
+                                       "%s and respond with the resulting PIN code.",
+                                       info->auth_url );
+                imcb_buddy_msg( ic, name, msg, 0, 0 );
+                g_free( msg );
+        }
+        else if( info->stage == OAUTH_ACCESS_TOKEN )
+        {
+                if( info->token == NULL || info->token_secret == NULL )
+                {
+                        imcb_error( ic, "OAuth error: %s", info->http->status_string );
+                        imc_logout( ic, TRUE );
+                        return FALSE;
+                }
+                
+                /* IM mods didn't do this so far and it's ugly but I should
+                   be able to get away with it... */
+                g_free( ic->acc->pass );
+                ic->acc->pass = oauth_to_string( info );
+                
+                twitter_main_loop_start( ic );
+        }
+        
+        return TRUE;
+}
+
+
+static char *set_eval_mode( set_t *set, char *value )
+{
+        if( g_strcasecmp( value, "one" ) == 0 ||
+            g_strcasecmp( value, "many" ) == 0 ||
+            g_strcasecmp( value, "chat" ) == 0 )
+                return value;
+        else
+                return NULL;
+}
+
+static void twitter_init( account_t *acc )
+{
+        set_t *s;
+        
+        s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        s = set_add( &acc->set, "oauth", "true", set_eval_bool, acc );
+}
+
+/**
+ * Login method. Since the twitter API works with seperate HTTP request we 
+ * only save the user and pass to the twitter_data object.
+ */
+static void twitter_login( account_t *acc )
+{
+        struct im_connection *ic = imcb_new( acc );
+        struct twitter_data *td = g_new0( struct twitter_data, 1 );
+        char name[strlen(acc->user)+9];
+
+        twitter_connections = g_slist_append( twitter_connections, ic );
+        ic->proto_data = td;
+        ic->flags |= OPT_DOES_HTML;
+        
+        td->user = acc->user;
+        if( !set_getbool( &acc->set, "oauth" ) )
+                td->pass = g_strdup( acc->pass );
+        else if( strstr( acc->pass, "oauth_token=" ) )
+                td->oauth_info = oauth_from_string( acc->pass, &twitter_oauth );
+        td->home_timeline_id = 0;
+        
+        sprintf( name, "twitter_%s", acc->user );
+        imcb_add_buddy( ic, name, NULL );
+        imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
+        
+        if( td->pass || td->oauth_info )
+                twitter_main_loop_start( ic );
+        else
+                twitter_oauth_start( ic );
+}
+
 /**
  * Logout method. Just free the twitter_data.
@@ -104 +203 @@
         if( td )
         {
+                oauth_info_free( td->oauth_info );
+                g_free( td->pass );
                 g_free( td );
         }
@@ -115 +216 @@
 static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
-        // Let's just update the status.
-//      if ( g_strcasecmp(who, ic->acc->user) == 0 )
-                twitter_post_status(ic, message);
-//      else
-//              twitter_direct_messages_new(ic, who, message);
+        struct twitter_data *td = ic->proto_data;
+        
+        if (g_strncasecmp(who, "twitter_", 8) == 0 &&
+            g_strcasecmp(who + 8, ic->acc->user) == 0)
+        {
+                if( set_getbool( &ic->acc->set, "oauth" ) &&
+                    td->oauth_info && td->oauth_info->token == NULL )
+                {
+                        if( !oauth_access_token( message, td->oauth_info ) )
+                        {
+                                imcb_error( ic, "OAuth error: %s", "Failed to send access token request" );
+                                imc_logout( ic, TRUE );
+                                return FALSE;
+                        }
+                }
+                else
+                        twitter_post_status(ic, message);
+        }
+        else
+        {
+                twitter_direct_messages_new(ic, who, message);
+        }
         return( 0 );
 }

protocols/twitter/twitter.h

@@ -37 +37 @@
         char* user;
         char* pass;
+        struct oauth_info *oauth_info;
         guint64 home_timeline_id;
         gint main_loop_id;

protocols/twitter/twitter_http.c

@@ -29 +29 @@
 ****************************************************************************/ 
 
-#include "twitter_http.h"
 #include "twitter.h"
 #include "bitlbee.h"
@@ -35 +34 @@
 #include "misc.h"
 #include "base64.h"
+#include "oauth.h"
 #include <ctype.h>
 #include <errno.h>
+
+#include "twitter_http.h"
 
 
@@ -45 +47 @@
  * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
  */
-void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char** arguments, int arguments_len)
+void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, struct oauth_info* oi, char** arguments, int arguments_len)
 {
         url_t *url = g_new0( url_t, 1 );
@@ -110 +112 @@
 
         // If a pass and user are given we append them to the request.
-        if (userpass_base64)
+        if (oi)
+        {
+                char *full_header;
+                
+                full_header = oauth_http_header(oi, is_post ? "POST" : "GET",
+                                                url_string, url_arguments);
+                
+                tmp = g_strdup_printf("%sAuthorization: %s\r\n", request, full_header);
+                g_free(request);
+                g_free(full_header);
+                request = tmp;
+        }
+        else if (userpass_base64)
         {
                 tmp = g_strdup_printf("%sAuthorization: Basic %s\r\n", request, userpass_base64);

protocols/twitter/twitter_http.h

@@ -28 +28 @@
 #include "http_client.h"
 
+struct oauth_info;
+
 void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, 
-                                        char* user, char* pass, char** arguments, int arguments_len);
+                   char* user, char* pass, struct oauth_info *oi, char** arguments, int arguments_len);
 
 #endif //_TWITTER_HTTP_H

protocols/twitter/twitter_lib.c

@@ -105 +105 @@
         if (!bee_user_by_handle( ic->bee, ic, name ))
         {
+                char *mode = set_getstr(&ic->acc->set, "mode");
+                
                 // The buddy is not in the list, add the buddy and set the status to logged in.
                 imcb_add_buddy( ic, name, NULL );
                 imcb_rename_buddy( ic, name, fullname );
-                if (set_getbool( &ic->acc->set, "use_groupchat" ))
+                if (g_strcasecmp(mode, "chat") == 0)
                         imcb_chat_add_buddy( td->home_timeline_gc, name );
-                else
+                else if (g_strcasecmp(mode, "many") == 0)
                         imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
         }
@@ -128 +130 @@
         args[0] = "cursor";
         args[1] = g_strdup_printf ("%d", next_cursor);
-        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, td->user, td->pass, td->oauth_info, args, 2);
 
         g_free(args[1]);
@@ -394 +396 @@
         }
 
-        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, args, td->home_timeline_id ? 4 : 2);
+        twitter_http(TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, td->user, td->pass, td->oauth_info, args, td->home_timeline_id ? 4 : 2);
 
         g_free(args[1]);
@@ -452 +454 @@
         GSList *l = NULL;
         struct twitter_xml_status *status;
-
+        char from[MAX_STRING];
+        gboolean mode_one;
+        
+        mode_one = g_strcasecmp( set_getstr( &ic->acc->set, "mode" ), "one" ) == 0;
+
+        if( mode_one )
+        {
+                g_snprintf( from, sizeof( from ) - 1, "twitter_%s", ic->acc->user );
+                from[MAX_STRING-1] = '\0';
+        }
+        
         for ( l = list; l ; l = g_slist_next(l) )
         {
+                char *text = NULL;
+                
                 status = l->data;
-                imcb_buddy_msg( ic, status->user->screen_name, status->text, 0, status->created_at );
+                
+                if( mode_one )
+                        text = g_strdup_printf( "\002<\002%s\002>\002 %s",
+                                                status->user->screen_name, status->text );
+                else
+                        twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+                
+                imcb_buddy_msg( ic,
+                                mode_one ? from : status->user->screen_name,
+                                mode_one ? text : status->text,
+                                0, status->created_at );
+                
                 // Update the home_timeline_id to hold the highest id, so that by the next request
                 // we won't pick up the updates allready in the list.
                 td->home_timeline_id = td->home_timeline_id < status->id ? status->id : td->home_timeline_id;
+                
+                g_free( text );
         }
 }
@@ -483 +510 @@
         {
                 td->http_fails = 0;
-                if (!ic->flags & OPT_LOGGED_IN)
+                if (!(ic->flags & OPT_LOGGED_IN))
                         imcb_connected(ic);
         }
@@ -512 +539 @@
 
         // See if the user wants to see the messages in a groupchat window or as private messages.
-        if (set_getbool( &ic->acc->set, "use_groupchat" ))
+        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
                 twitter_groupchat(ic, txl->list);
         else
@@ -593 +620 @@
         args[1] = g_strdup_printf ("%d", next_cursor);
 
-        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_SHOW_FRIENDS_URL, twitter_http_get_statuses_friends, ic, 0, td->user, td->pass, td->oauth_info, args, 2);
 
         g_free(args[1]);
@@ -612 +639 @@
         if (req->status_code != 200) {
                 // It didn't go well, output the error and return.
-                imcb_error(ic, "Could not post tweet... HTTP STATUS: %d", req->status_code);
+                imcb_error(ic, "Could not post message... HTTP STATUS: %d", req->status_code);
                 return;
         }
@@ -627 +654 @@
         args[0] = "status";
         args[1] = msg;
-        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 2);
+        twitter_http(TWITTER_STATUS_UPDATE_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth_info, args, 2);
 //      g_free(args[1]);
 }
@@ -645 +672 @@
         args[3] = msg;
         // Use the same callback as for twitter_post_status, since it does basically the same.
-        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, args, 4);
+        twitter_http(TWITTER_DIRECT_MESSAGES_NEW_URL, twitter_http_post_status, ic, 1, td->user, td->pass, td->oauth_info, args, 4);
 //      g_free(args[1]);
 //      g_free(args[3]);