From 1b221e0abd6453e3ca9cf45916ff6d16f94eff2b Mon Sep 17 00:00:00 2001
From: Geert Mulders <g.c.w.m.mulders@gmail.com>
Date: Tue, 1 Dec 2009 22:08:02 +0100
Subject: Added twitter-module.

---
 protocols/twitter/twitter.c | 221 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 221 insertions(+)
 create mode 100644 protocols/twitter/twitter.c

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
new file mode 100644
index 00000000..1cc7eaeb
--- /dev/null
+++ b/protocols/twitter/twitter.c
@@ -0,0 +1,221 @@
+/***************************************************************************\
+*                                                                           *
+*  BitlBee - An IRC to IM gateway                                           *
+*  Simple module to facilitate twitter functionality.                       *
+*                                                                           *
+*  Copyright 2009 Geert Mulders <g.c.w.m.mulders@gmail.com>                 *
+*                                                                           *
+*  This library is free software; you can redistribute it and/or            *
+*  modify it under the terms of the GNU Lesser General Public               *
+*  License as published by the Free Software Foundation, version            *
+*  2.1.                                                                     *
+*                                                                           *
+*  This library is distributed in the hope that it will be useful,          *
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU        *
+*  Lesser General Public License for more details.                          *
+*                                                                           *
+*  You should have received a copy of the GNU Lesser General Public License *
+*  along with this library; if not, write to the Free Software Foundation,  *
+*  Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA           *
+*                                                                           *
+****************************************************************************/
+
+#include "nogaim.h"
+#include "twitter.h"
+#include "twitter_http.h"
+#include "twitter_lib.h"
+
+
+/**
+ *  * Main loop function
+ *   */
+gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
+{
+	struct im_connection *ic = data;
+	// Check if we are still logged in...
+	if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN)
+		return 0;
+
+	// Do stuff..
+	twitter_get_home_timeline(ic, -1);
+
+	// If we are still logged in run this function again after timeout.
+	return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
+}
+
+
+static void twitter_init( account_t *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 );
+	
+	td->user = acc->user;
+	td->pass = acc->pass;
+	td->home_timeline_id = 0;
+
+	ic->proto_data = td;
+
+	// Set the status to logged in.
+	ic->flags = OPT_LOGGED_IN;
+
+	// Try to get the buddies...
+	//twitter_get_friends_ids(ic, -1);
+
+	//twitter_get_home_timeline(ic, -1);
+
+	// Run this once. After this queue the main loop function.
+	twitter_main_loop(ic, -1, 0);
+
+	// Queue the main_loop
+	b_timeout_add(60000, twitter_main_loop, ic);
+
+	imcb_log( ic, "Connecting to twitter" );
+	imcb_connected(ic);
+}
+
+/**
+ * Logout method. Just free the twitter_data.
+ */
+static void twitter_logout( struct im_connection *ic )
+{
+	struct twitter_data *td = ic->proto_data;
+	
+	// Set the status to logged out.
+	ic->flags = 0;
+
+	if( td )
+	{
+		g_free( td );
+	}
+}
+
+/**
+ *
+ */
+static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
+{
+	imcb_log( ic, "In twitter_buddy_msg...");
+	twitter_post_status(ic, message);
+	return( 0 );
+}
+
+/**
+ *
+ */
+static GList *twitter_away_states( struct im_connection *ic )
+{
+	static GList *l = NULL;
+	return l;
+}
+
+static void twitter_set_away( struct im_connection *ic, char *state, char *message )
+{
+}
+
+static void twitter_set_my_name( struct im_connection *ic, char *info )
+{
+	imcb_log( ic, "In twitter_set_my_name..." );
+//	char * aap = twitter_http("http://gertje.org", NULL, ic, 1, "geert", "poep", NULL, 0);
+
+//	imcb_log( ic, aap );
+//	g_free(aap);
+}
+
+static void twitter_get_info(struct im_connection *ic, char *who) 
+{
+}
+
+static void twitter_add_buddy( struct im_connection *ic, char *who, char *group )
+{
+}
+
+static void twitter_remove_buddy( struct im_connection *ic, char *who, char *group )
+{
+}
+
+static void twitter_chat_msg( struct groupchat *c, char *message, int flags )
+{
+}
+
+static void twitter_chat_invite( struct groupchat *c, char *who, char *message )
+{
+}
+
+static void twitter_chat_leave( struct groupchat *c )
+{
+}
+
+static struct groupchat *twitter_chat_with( struct im_connection *ic, char *who )
+{
+	return NULL;
+}
+
+static void twitter_keepalive( struct im_connection *ic )
+{
+}
+
+static void twitter_add_permit( struct im_connection *ic, char *who )
+{
+}
+
+static void twitter_rem_permit( struct im_connection *ic, char *who )
+{
+}
+
+static void twitter_add_deny( struct im_connection *ic, char *who )
+{
+}
+
+static void twitter_rem_deny( struct im_connection *ic, char *who )
+{
+}
+
+static int twitter_send_typing( struct im_connection *ic, char *who, int typing )
+{
+	return( 1 );
+}
+
+//static char *twitter_set_display_name( set_t *set, char *value )
+//{
+//	return value;
+//}
+
+void twitter_initmodule()
+{
+	struct prpl *ret = g_new0(struct prpl, 1);
+	
+	ret->name = "twitter";
+	ret->login = twitter_login;
+	ret->init = twitter_init;
+	ret->logout = twitter_logout;
+	ret->buddy_msg = twitter_buddy_msg;
+	ret->away_states = twitter_away_states;
+	ret->set_away = twitter_set_away;
+	ret->get_info = twitter_get_info;
+	ret->set_my_name = twitter_set_my_name;
+	ret->add_buddy = twitter_add_buddy;
+	ret->remove_buddy = twitter_remove_buddy;
+	ret->chat_msg = twitter_chat_msg;
+	ret->chat_invite = twitter_chat_invite;
+	ret->chat_leave = twitter_chat_leave;
+	ret->chat_with = twitter_chat_with;
+	ret->keepalive = twitter_keepalive;
+	ret->add_permit = twitter_add_permit;
+	ret->rem_permit = twitter_rem_permit;
+	ret->add_deny = twitter_add_deny;
+	ret->rem_deny = twitter_rem_deny;
+	ret->send_typing = twitter_send_typing;
+	ret->handle_cmp = g_strcasecmp;
+
+	register_protocol(ret);
+}
+
-- 
cgit v1.2.3


From 62d2cfb0b7b5e7f3eda9ca13b1877d3ad74fcd5e Mon Sep 17 00:00:00 2001
From: Geert Mulders <g.c.w.m.mulders@gmail.com>
Date: Thu, 25 Mar 2010 22:31:27 +0100
Subject: Added option to get tweeds either through groupchat or privmes.

---
 protocols/twitter/twitter.c | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 1cc7eaeb..b6b23fa5 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -28,8 +28,8 @@
 
 
 /**
- *  * Main loop function
- *   */
+ * Main loop function
+ */
 gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 {
 	struct im_connection *ic = data;
@@ -37,6 +37,11 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 	if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN)
 		return 0;
 
+	// If the user uses multiple private message windows we need to get the 
+	// users buddies.
+	if (!set_getbool( &ic->acc->set, "use_groupchat" ))
+		twitter_get_statuses_friends(ic, -1);
+
 	// Do stuff..
 	twitter_get_home_timeline(ic, -1);
 
@@ -47,6 +52,8 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 
 static void twitter_init( account_t *acc )
 {
+	set_t *s;
+	s = set_add( &acc->set, "use_groupchat", "false", set_eval_bool, acc );
 }
 
 /**
@@ -57,7 +64,7 @@ static void twitter_login( account_t *acc )
 {
 	struct im_connection *ic = imcb_new( acc );
 	struct twitter_data *td = g_new0( struct twitter_data, 1 );
-	
+
 	td->user = acc->user;
 	td->pass = acc->pass;
 	td->home_timeline_id = 0;
@@ -67,11 +74,6 @@ static void twitter_login( account_t *acc )
 	// Set the status to logged in.
 	ic->flags = OPT_LOGGED_IN;
 
-	// Try to get the buddies...
-	//twitter_get_friends_ids(ic, -1);
-
-	//twitter_get_home_timeline(ic, -1);
-
 	// Run this once. After this queue the main loop function.
 	twitter_main_loop(ic, -1, 0);
 
@@ -80,6 +82,8 @@ static void twitter_login( account_t *acc )
 
 	imcb_log( ic, "Connecting to twitter" );
 	imcb_connected(ic);
+
+	twitter_connections = g_slist_append( twitter_connections, ic );
 }
 
 /**
@@ -96,6 +100,8 @@ static void twitter_logout( struct im_connection *ic )
 	{
 		g_free( td );
 	}
+
+	twitter_connections = g_slist_remove( twitter_connections, ic );
 }
 
 /**
@@ -103,8 +109,11 @@ static void twitter_logout( struct im_connection *ic )
  */
 static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
-	imcb_log( ic, "In twitter_buddy_msg...");
-	twitter_post_status(ic, message);
+	// 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);
 	return( 0 );
 }
 
@@ -123,11 +132,6 @@ static void twitter_set_away( struct im_connection *ic, char *state, char *messa
 
 static void twitter_set_my_name( struct im_connection *ic, char *info )
 {
-	imcb_log( ic, "In twitter_set_my_name..." );
-//	char * aap = twitter_http("http://gertje.org", NULL, ic, 1, "geert", "poep", NULL, 0);
-
-//	imcb_log( ic, aap );
-//	g_free(aap);
 }
 
 static void twitter_get_info(struct im_connection *ic, char *who) 
@@ -217,5 +221,8 @@ void twitter_initmodule()
 	ret->handle_cmp = g_strcasecmp;
 
 	register_protocol(ret);
+
+	// Initialise the twitter_connections GSList.
+	twitter_connections = NULL;
 }
 
-- 
cgit v1.2.3


From 2abceca711403e8e3308213954b4477ceecd4282 Mon Sep 17 00:00:00 2001
From: Geert Mulders <g.c.w.m.mulders@gmail.com>
Date: Tue, 6 Apr 2010 19:25:51 +0200
Subject: Updates made as a result to the comments on the review.

---
 protocols/twitter/twitter.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index b6b23fa5..fb7acc12 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -34,7 +34,9 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 {
 	struct im_connection *ic = data;
 	// Check if we are still logged in...
-	if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN)
+	// We are logged in if the flag says so and the connection is still in the connections list.
+	if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN 
+			&& !g_slist_find( twitter_connections, ic ))
 		return 0;
 
 	// If the user uses multiple private message windows we need to get the 
@@ -54,6 +56,7 @@ 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;
 }
 
 /**
@@ -71,17 +74,15 @@ static void twitter_login( account_t *acc )
 
 	ic->proto_data = td;
 
-	// Set the status to logged in.
-	ic->flags = OPT_LOGGED_IN;
+	imcb_log( ic, "Connecting to twitter" );
+	imcb_connected(ic);
 
 	// Run this once. After this queue the main loop function.
 	twitter_main_loop(ic, -1, 0);
 
 	// Queue the main_loop
-	b_timeout_add(60000, twitter_main_loop, ic);
-
-	imcb_log( ic, "Connecting to twitter" );
-	imcb_connected(ic);
+	// Save the return value, so we can remove the timeout on logout.
+	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
 
 	twitter_connections = g_slist_append( twitter_connections, ic );
 }
@@ -96,6 +97,9 @@ static void twitter_logout( struct im_connection *ic )
 	// Set the status to logged out.
 	ic->flags = 0;
 
+	// Remove the main_loop function from the function queue.
+	b_event_remove(td->main_loop_id);
+
 	if( td )
 	{
 		g_free( td );
@@ -148,6 +152,8 @@ static void twitter_remove_buddy( struct im_connection *ic, char *who, char *gro
 
 static void twitter_chat_msg( struct groupchat *c, char *message, int flags )
 {
+	if( c && message )
+		twitter_post_status(c->ic, message);
 }
 
 static void twitter_chat_invite( struct groupchat *c, char *who, char *message )
-- 
cgit v1.2.3


From d5690197326bad1090dbb9f6bfc95470b479fe6b Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 7 Apr 2010 01:27:51 +0100
Subject: A little more cleanup.

---
 protocols/twitter/twitter.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index fb7acc12..d4e2ce3e 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -35,8 +35,8 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 	struct im_connection *ic = data;
 	// Check if we are still logged in...
 	// We are logged in if the flag says so and the connection is still in the connections list.
-	if ((ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN 
-			&& !g_slist_find( twitter_connections, ic ))
+	if (!g_slist_find( twitter_connections, ic ) ||
+	    (ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN) 
 		return 0;
 
 	// If the user uses multiple private message windows we need to get the 
@@ -68,13 +68,15 @@ 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;
 
-	imcb_log( ic, "Connecting to twitter" );
+	imcb_log( ic, "Connecting to Twitter" );
 	imcb_connected(ic);
 
 	// Run this once. After this queue the main loop function.
@@ -83,8 +85,6 @@ static void twitter_login( account_t *acc )
 	// Queue the main_loop
 	// Save the return value, so we can remove the timeout on logout.
 	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
-
-	twitter_connections = g_slist_append( twitter_connections, ic );
 }
 
 /**
-- 
cgit v1.2.3


From 1014caba0ae2c737e35b8f51cafe77c1967e6b67 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 7 Apr 2010 01:46:38 +0100
Subject: In groupchat mode, make contacts show up in the room instead of in
 &bitlbee. And clean up the room when disabling the Twitter account.

---
 protocols/twitter/twitter.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index d4e2ce3e..f62aeada 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -100,6 +100,8 @@ static void twitter_logout( struct im_connection *ic )
 	// Remove the main_loop function from the function queue.
 	b_event_remove(td->main_loop_id);
 
+	imcb_chat_free(td->home_timeline_gc);
+
 	if( td )
 	{
 		g_free( td );
-- 
cgit v1.2.3


From 91cec2ff02f956ec248dae6c8b8939f263ff8cfd Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 7 Apr 2010 22:38:56 +0100
Subject: It'd be nice to not crash when the user goes away. :-)

Don't export no-op set_away() funcs/etc and make nogaim detect that and
give up in time.
---
 protocols/twitter/twitter.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index f62aeada..812e0796 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -126,16 +126,6 @@ static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message
 /**
  *
  */
-static GList *twitter_away_states( struct im_connection *ic )
-{
-	static GList *l = NULL;
-	return l;
-}
-
-static void twitter_set_away( struct im_connection *ic, char *state, char *message )
-{
-}
-
 static void twitter_set_my_name( struct im_connection *ic, char *info )
 {
 }
@@ -210,8 +200,6 @@ void twitter_initmodule()
 	ret->init = twitter_init;
 	ret->logout = twitter_logout;
 	ret->buddy_msg = twitter_buddy_msg;
-	ret->away_states = twitter_away_states;
-	ret->set_away = twitter_set_away;
 	ret->get_info = twitter_get_info;
 	ret->set_my_name = twitter_set_my_name;
 	ret->add_buddy = twitter_add_buddy;
-- 
cgit v1.2.3


From 37d84b32ca7f02f2e3b05858e090e2470b8c479b Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 8 Apr 2010 01:51:16 +0100
Subject: Don't free the Twitter chatroom if there isn't one..

---
 protocols/twitter/twitter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 812e0796..dcbcfdfb 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -100,7 +100,8 @@ static void twitter_logout( struct im_connection *ic )
 	// Remove the main_loop function from the function queue.
 	b_event_remove(td->main_loop_id);
 
-	imcb_chat_free(td->home_timeline_gc);
+	if(td->home_timeline_gc)
+		imcb_chat_free(td->home_timeline_gc);
 
 	if( td )
 	{
-- 
cgit v1.2.3


From 16592d8422bbd7acdf39d29525e580fb82d47c36 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 9 Apr 2010 02:11:10 +0100
Subject: If the user leaves the Twitter channel, allow that. Recreate it when
 new tweets come in.

---
 protocols/twitter/twitter.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index dcbcfdfb..8502cd6f 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -155,6 +155,15 @@ static void twitter_chat_invite( struct groupchat *c, char *who, char *message )
 
 static void twitter_chat_leave( struct groupchat *c )
 {
+	struct twitter_data *td = c->ic->proto_data;
+	
+	if( c != td->home_timeline_gc )
+		return; /* WTF? */
+	
+	/* If the user leaves the channel: Fine. Rejoin him/her once new
+	   tweets come in. */
+	imcb_chat_free(td->home_timeline_gc);
+	td->home_timeline_gc = NULL;
 }
 
 static struct groupchat *twitter_chat_with( struct im_connection *ic, char *who )
-- 
cgit v1.2.3


From 3e69802454295ffbfbbbe9bca4fcd226b5b63b28 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 13 Apr 2010 14:51:05 +0200
Subject: Use full name information of Twitter buddies.

---
 protocols/twitter/twitter.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 8502cd6f..5027eb74 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -33,6 +33,7 @@
 gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 {
 	struct im_connection *ic = data;
+	
 	// Check if we are still logged in...
 	// We are logged in if the flag says so and the connection is still in the connections list.
 	if (!g_slist_find( twitter_connections, ic ) ||
-- 
cgit v1.2.3


From 3bd4a9327bb2c7c662e6d385b3bf6903ca8ca09a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 13 Apr 2010 19:36:16 +0200
Subject: Suppress HTTP error messages unless we get five or more in a row.

---
 protocols/twitter/twitter.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 5027eb74..727eff91 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -35,9 +35,7 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 	struct im_connection *ic = data;
 	
 	// Check if we are still logged in...
-	// We are logged in if the flag says so and the connection is still in the connections list.
-	if (!g_slist_find( twitter_connections, ic ) ||
-	    (ic->flags & OPT_LOGGED_IN) != OPT_LOGGED_IN) 
+	if (!g_slist_find( twitter_connections, ic ))
 		return 0;
 
 	// If the user uses multiple private message windows we need to get the 
@@ -78,7 +76,6 @@ static void twitter_login( account_t *acc )
 	ic->proto_data = td;
 
 	imcb_log( ic, "Connecting to Twitter" );
-	imcb_connected(ic);
 
 	// Run this once. After this queue the main loop function.
 	twitter_main_loop(ic, -1, 0);
-- 
cgit v1.2.3


From e88fbe272c097066e538d670fe8fa907e9847321 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 16 Apr 2010 01:10:10 +0200
Subject: Added a meta-contact twitter_$username and replaced the
 "use_groupchat" setting with a "mode" setting which also allows for a mode
 where everything just comes from the meta-contact. Tweets should now go to
 that user or to the channel (if available). Messages to others become DMs.

---
 protocols/twitter/twitter.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 727eff91..29be8a96 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -40,7 +40,7 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 
 	// 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);
 
 	// Do stuff..
@@ -50,11 +50,21 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 	return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
 }
 
+static char *set_eval_mode( set_t *set, char *value )
+{
+	if( g_strcasecmp( value, "one" ) == 0 ||
+	    g_strcasecmp( value, "many" ) == 0 ||
+	    g_strcasecmp( value, "char" ) == 0 )
+		return value;
+	else
+		return NULL;
+}
 
 static void twitter_init( account_t *acc )
 {
 	set_t *s;
-	s = set_add( &acc->set, "use_groupchat", "false", set_eval_bool, acc );
+	
+	s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
 	s->flags |= ACC_SET_OFFLINE_ONLY;
 }
 
@@ -66,6 +76,7 @@ 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 );
 
@@ -83,6 +94,10 @@ static void twitter_login( account_t *acc )
 	// Queue the main_loop
 	// Save the return value, so we can remove the timeout on logout.
 	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+	
+	sprintf( name, "twitter_%s", acc->user );
+	imcb_add_buddy( ic, name, NULL );
+	imcb_buddy_status( ic, name, OPT_LOGGED_IN, NULL, NULL );
 }
 
 /**
@@ -114,11 +129,12 @@ static void twitter_logout( struct im_connection *ic )
  */
 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 )
+	if (g_strncasecmp(who, "twitter_", 8) == 0 &&
+	    g_strcasecmp(who + 8, ic->acc->user) == 0)
 		twitter_post_status(ic, message);
-//	else
-//		twitter_direct_messages_new(ic, who, message);
+	else
+		twitter_direct_messages_new(ic, who, message);
+	
 	return( 0 );
 }
 
-- 
cgit v1.2.3


From db57e7c0d4a88e2a2b0862afa20a1255dfffc58d Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 19 Apr 2010 15:08:34 +0200
Subject: 1.2.6a. I fail. :-(

The 1.2.6 I just released has a groupchat mode in the Twitter module that
doesn't actually work...
---
 protocols/twitter/twitter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 29be8a96..726c7cb1 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -54,7 +54,7 @@ static char *set_eval_mode( set_t *set, char *value )
 {
 	if( g_strcasecmp( value, "one" ) == 0 ||
 	    g_strcasecmp( value, "many" ) == 0 ||
-	    g_strcasecmp( value, "char" ) == 0 )
+	    g_strcasecmp( value, "chat" ) == 0 )
 		return value;
 	else
 		return NULL;
-- 
cgit v1.2.3


From 508c340d1d12d3ca932001d7ee1dea1a4c81bf02 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 26 Apr 2010 01:42:37 +0100
Subject: Successfully posted a tweet!

Twitter's tricky. It returns vars (user_id, screen_name) in the access token
that, the way I read the spec, should be included in all subsequent queries.
However, stuff only started to work when I dropped those vars.

This code's definitely not pretty ATM. Need to clean up now that it actually
works.
---
 protocols/twitter/twitter.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 726c7cb1..ead03c56 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -81,7 +81,10 @@ static void twitter_login( account_t *acc )
 	twitter_connections = g_slist_append( twitter_connections, ic );
 
 	td->user = acc->user;
-	td->pass = acc->pass;
+	if( strstr( acc->pass, "oauth_token=" ) == NULL )
+		td->pass = g_strdup( acc->pass );
+	else
+		td->oauth = g_strdup( acc->pass );
 	td->home_timeline_id = 0;
 
 	ic->proto_data = td;
@@ -118,6 +121,8 @@ static void twitter_logout( struct im_connection *ic )
 
 	if( td )
 	{
+		g_free( td->pass );
+		g_free( td->oauth );
 		g_free( td );
 	}
 
-- 
cgit v1.2.3


From 713d6111cd754ff9eae4cfa1e6de82c9824d16db Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 26 Apr 2010 22:50:48 +0100
Subject: Twitter module now generates authorize URLs.

---
 protocols/twitter/twitter.c | 64 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 14 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index ead03c56..e2a5986b 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -22,6 +22,7 @@
 ****************************************************************************/
 
 #include "nogaim.h"
+#include "oauth.h"
 #include "twitter.h"
 #include "twitter_http.h"
 #include "twitter_lib.h"
@@ -50,6 +51,44 @@ gboolean twitter_main_loop(gpointer data, gint fd, b_input_condition cond)
 	return (ic->flags & OPT_LOGGED_IN) == OPT_LOGGED_IN;
 }
 
+static void twitter_main_loop_start( struct im_connection *ic )
+{
+	struct twitter_data *td = ic->proto_data;
+	
+	imcb_log( ic, "Connecting to Twitter" );
+
+	// Run this once. After this queue the main loop function.
+	twitter_main_loop(ic, -1, 0);
+
+	// Queue the main_loop
+	// Save the return value, so we can remove the timeout on logout.
+	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+}
+
+static void twitter_oauth_callback( struct oauth_info *info );
+
+static void twitter_oauth_start( struct im_connection *ic )
+{
+	oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+}
+
+static void twitter_oauth_callback( struct oauth_info *info )
+{
+	struct im_connection *ic = info->data;
+	
+	if( info->request_token && info->access_token == NULL )
+	{
+		char name[strlen(ic->acc->user)+9], *msg;
+		
+		sprintf( name, "twitter_%s", ic->acc->user );
+		msg = g_strdup_printf( "To finish OAuth authentication, please visit "
+		                       "%s?%s and respond with the resulting PIN code.",
+		                       TWITTER_OAUTH_AUTHORIZE, info->auth_params );
+		imcb_buddy_msg( ic, name, msg, 0, 0 );
+		g_free( msg );
+	}
+}
+
 static char *set_eval_mode( set_t *set, char *value )
 {
 	if( g_strcasecmp( value, "one" ) == 0 ||
@@ -66,6 +105,8 @@ static void twitter_init( account_t *acc )
 	
 	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 );
 }
 
 /**
@@ -79,28 +120,23 @@ static void twitter_login( account_t *acc )
 	char name[strlen(acc->user)+9];
 
 	twitter_connections = g_slist_append( twitter_connections, ic );
-
+	ic->proto_data = td;
+	
 	td->user = acc->user;
-	if( strstr( acc->pass, "oauth_token=" ) == NULL )
+	if( !set_getbool( &acc->set, "oauth" ) )
 		td->pass = g_strdup( acc->pass );
-	else
+	else if( strstr( acc->pass, "oauth_token=" ) )
 		td->oauth = g_strdup( acc->pass );
 	td->home_timeline_id = 0;
-
-	ic->proto_data = td;
-
-	imcb_log( ic, "Connecting to Twitter" );
-
-	// Run this once. After this queue the main loop function.
-	twitter_main_loop(ic, -1, 0);
-
-	// Queue the main_loop
-	// Save the return value, so we can remove the timeout on logout.
-	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
 	
 	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 )
+		twitter_main_loop_start( ic );
+	else
+		twitter_oauth_start( ic );
 }
 
 /**
-- 
cgit v1.2.3


From c42e8b907817fc76df4dc3b48d85858555102654 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 26 Apr 2010 23:40:11 +0100
Subject: OAuth, it lives!

---
 protocols/twitter/twitter.c | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index e2a5986b..eb05d9d5 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -69,17 +69,29 @@ static void twitter_oauth_callback( struct oauth_info *info );
 
 static void twitter_oauth_start( struct im_connection *ic )
 {
+	imcb_log( ic, "Requesting OAuth request token" );
+
 	oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
 }
 
 static void twitter_oauth_callback( struct oauth_info *info )
 {
 	struct im_connection *ic = info->data;
+	struct twitter_data *td = ic->proto_data;
 	
-	if( info->request_token && info->access_token == NULL )
+	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;
+		}
+		
+		td->oauth_info = info;
+		
 		sprintf( name, "twitter_%s", ic->acc->user );
 		msg = g_strdup_printf( "To finish OAuth authentication, please visit "
 		                       "%s?%s and respond with the resulting PIN code.",
@@ -87,6 +99,19 @@ static void twitter_oauth_callback( struct oauth_info *info )
 		imcb_buddy_msg( ic, name, msg, 0, 0 );
 		g_free( msg );
 	}
+	else if( info->stage == OAUTH_ACCESS_TOKEN )
+	{
+		if( info->access_token == NULL )
+		{
+			imcb_error( ic, "OAuth error: %s", info->http->status_string );
+			imc_logout( ic, TRUE );
+			return;
+		}
+		
+		td->oauth = g_strdup( info->access_token );
+		
+		twitter_main_loop_start( ic );
+	}
 }
 
 static char *set_eval_mode( set_t *set, char *value )
@@ -170,12 +195,20 @@ static void twitter_logout( struct im_connection *ic )
  */
 static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
+	struct twitter_data *td = ic->proto_data;
+	
 	if (g_strncasecmp(who, "twitter_", 8) == 0 &&
 	    g_strcasecmp(who + 8, ic->acc->user) == 0)
-		twitter_post_status(ic, message);
+	{
+		if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth == NULL )
+			oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
+		else
+			twitter_post_status(ic, message);
+	}
 	else
+	{
 		twitter_direct_messages_new(ic, who, message);
-	
+	}
 	return( 0 );
 }
 
-- 
cgit v1.2.3


From 288b215ca64d09ea6a49cf9ff1fcc7682b7607ec Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 26 Apr 2010 23:50:25 +0100
Subject: Save the OAuth token in the acct structs so it doesn't have to be
 rerequested every time.

---
 protocols/twitter/twitter.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index eb05d9d5..54bee2f1 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -110,6 +110,11 @@ static void twitter_oauth_callback( struct oauth_info *info )
 		
 		td->oauth = g_strdup( info->access_token );
 		
+		/* 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 = g_strdup( info->access_token );
+		
 		twitter_main_loop_start( ic );
 	}
 }
-- 
cgit v1.2.3


From 18dbb20242719f7537ad1a18a9a3befa2eefd502 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 27 Apr 2010 23:42:07 +0100
Subject: Valgrind cleanup.

---
 protocols/twitter/twitter.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 54bee2f1..8ea1a56e 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -65,20 +65,27 @@ static void twitter_main_loop_start( struct im_connection *ic )
 	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
 }
 
-static void twitter_oauth_callback( struct oauth_info *info );
+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" );
 
-	oauth_request_token( TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+	td->oauth_info = oauth_request_token(
+		TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
 }
 
-static void twitter_oauth_callback( struct oauth_info *info )
+static gboolean twitter_oauth_callback( struct oauth_info *info )
 {
 	struct im_connection *ic = info->data;
-	struct twitter_data *td = ic->proto_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;
@@ -87,11 +94,9 @@ static void twitter_oauth_callback( struct oauth_info *info )
 		{
 			imcb_error( ic, "OAuth error: %s", info->http->status_string );
 			imc_logout( ic, TRUE );
-			return;
+			return FALSE;
 		}
 		
-		td->oauth_info = info;
-		
 		sprintf( name, "twitter_%s", ic->acc->user );
 		msg = g_strdup_printf( "To finish OAuth authentication, please visit "
 		                       "%s?%s and respond with the resulting PIN code.",
@@ -105,7 +110,7 @@ static void twitter_oauth_callback( struct oauth_info *info )
 		{
 			imcb_error( ic, "OAuth error: %s", info->http->status_string );
 			imc_logout( ic, TRUE );
-			return;
+			return FALSE;
 		}
 		
 		td->oauth = g_strdup( info->access_token );
@@ -117,6 +122,8 @@ static void twitter_oauth_callback( struct oauth_info *info )
 		
 		twitter_main_loop_start( ic );
 	}
+	
+	return TRUE;
 }
 
 static char *set_eval_mode( set_t *set, char *value )
@@ -187,6 +194,8 @@ static void twitter_logout( struct im_connection *ic )
 
 	if( td )
 	{
+		oauth_info_free( td->oauth_info );
+		
 		g_free( td->pass );
 		g_free( td->oauth );
 		g_free( td );
@@ -205,8 +214,11 @@ static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message
 	if (g_strncasecmp(who, "twitter_", 8) == 0 &&
 	    g_strcasecmp(who + 8, ic->acc->user) == 0)
 	{
-		if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth == NULL )
+		if( set_getbool( &ic->acc->set, "oauth" ) && td->oauth_info )
+		{
 			oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
+			td->oauth_info = NULL;
+		}
 		else
 			twitter_post_status(ic, message);
 	}
-- 
cgit v1.2.3


From a7c6d0e9a9d985534dc18d450399d6a7ece6c592 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 30 Apr 2010 23:51:18 +0100
Subject: Set HTML-flag on Twitter accounts so &lt;/&gt; and all get converted
 back. (Probably also fixes potential problems with outgoing messages.)

---
 protocols/twitter/twitter.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 8ea1a56e..f5baeeea 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -158,6 +158,7 @@ static void twitter_login( account_t *acc )
 
 	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" ) )
-- 
cgit v1.2.3


From c2ecadc08daa5163f4c90aef36de0e33d0d44f16 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 1 May 2010 14:53:59 +0100
Subject: Cleaned up OAuth stuff: consumer key/secret should *not* be in
 lib/oauth.c. Keep it in the Twitter module, and use the oauth_info struct
 through the whole session to keep all this together.

---
 protocols/twitter/twitter.c | 46 +++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index f5baeeea..6d43d819 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -27,7 +27,6 @@
 #include "twitter_http.h"
 #include "twitter_lib.h"
 
-
 /**
  * Main loop function
  */
@@ -65,6 +64,16 @@ static void twitter_main_loop_start( struct im_connection *ic )
 	td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
 }
 
+
+static 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 )
@@ -73,8 +82,7 @@ static void twitter_oauth_start( struct im_connection *ic )
 	
 	imcb_log( ic, "Requesting OAuth request token" );
 
-	td->oauth_info = oauth_request_token(
-		TWITTER_OAUTH_REQUEST_TOKEN, twitter_oauth_callback, ic );
+	td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
 }
 
 static gboolean twitter_oauth_callback( struct oauth_info *info )
@@ -99,26 +107,24 @@ static gboolean twitter_oauth_callback( struct oauth_info *info )
 		
 		sprintf( name, "twitter_%s", ic->acc->user );
 		msg = g_strdup_printf( "To finish OAuth authentication, please visit "
-		                       "%s?%s and respond with the resulting PIN code.",
-		                       TWITTER_OAUTH_AUTHORIZE, info->auth_params );
+		                       "%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->access_token == NULL )
+		if( info->token == NULL )
 		{
 			imcb_error( ic, "OAuth error: %s", info->http->status_string );
 			imc_logout( ic, TRUE );
 			return FALSE;
 		}
 		
-		td->oauth = g_strdup( info->access_token );
-		
 		/* 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 = g_strdup( info->access_token );
+		//g_free( ic->acc->pass );
+		//ic->acc->pass = g_strdup( info->access_token );
 		
 		twitter_main_loop_start( ic );
 	}
@@ -126,6 +132,7 @@ static gboolean twitter_oauth_callback( struct oauth_info *info )
 	return TRUE;
 }
 
+
 static char *set_eval_mode( set_t *set, char *value )
 {
 	if( g_strcasecmp( value, "one" ) == 0 ||
@@ -163,15 +170,15 @@ static void twitter_login( account_t *acc )
 	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 = g_strdup( acc->pass );
+	//else if( strstr( acc->pass, "oauth_token=" ) )
+	//	td->oauth = g_strdup( acc->pass );
 	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 )
+	if( td->pass || td->oauth_info )
 		twitter_main_loop_start( ic );
 	else
 		twitter_oauth_start( ic );
@@ -196,9 +203,7 @@ static void twitter_logout( struct im_connection *ic )
 	if( td )
 	{
 		oauth_info_free( td->oauth_info );
-		
 		g_free( td->pass );
-		g_free( td->oauth );
 		g_free( td );
 	}
 
@@ -215,10 +220,15 @@ static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message
 	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 )
+		if( set_getbool( &ic->acc->set, "oauth" ) &&
+		    td->oauth_info && td->oauth_info->token == NULL )
 		{
-			oauth_access_token( TWITTER_OAUTH_ACCESS_TOKEN, message, td->oauth_info );
-			td->oauth_info = 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);
-- 
cgit v1.2.3


From f4b0911d037c02f8b9190518b5efda4368dcc25b Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 1 May 2010 15:10:32 +0100
Subject: Save the credentials again.

---
 protocols/twitter/twitter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 6d43d819..589f2088 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -123,8 +123,8 @@ static gboolean twitter_oauth_callback( struct oauth_info *info )
 		
 		/* 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 = g_strdup( info->access_token );
+		g_free( ic->acc->pass );
+		ic->acc->pass = oauth_to_string( info );
 		
 		twitter_main_loop_start( ic );
 	}
@@ -170,8 +170,8 @@ static void twitter_login( account_t *acc )
 	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 = 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 );
-- 
cgit v1.2.3


From 999769119e85518cc46b3ed64cb8781695fefbdc Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 3 May 2010 22:36:43 +0100
Subject: Check Tweet length on the BitlBee side already.

---
 protocols/twitter/twitter.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'protocols/twitter/twitter.c')

diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 9c7b060c..98e85641 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -143,10 +143,24 @@ static char *set_eval_mode( set_t *set, char *value )
 		return NULL;
 }
 
+static gboolean twitter_length_check( struct im_connection *ic, gchar *msg )
+{
+	int max = set_getint( &ic->acc->set, "message_length" ), len;
+	
+	if( max == 0 || ( len = g_utf8_strlen( msg, -1 ) ) <= max )
+		return TRUE;
+	
+	imcb_error( ic, "Maximum message length exceeded: %d > %d", len, max );
+	
+	return FALSE;
+}
+
 static void twitter_init( account_t *acc )
 {
 	set_t *s;
 	
+	s = set_add( &acc->set, "message_length", "140", set_eval_int, acc );
+	
 	s = set_add( &acc->set, "mode", "one", set_eval_mode, acc );
 	s->flags |= ACC_SET_OFFLINE_ONLY;
 	
@@ -230,7 +244,7 @@ static int twitter_buddy_msg( struct im_connection *ic, char *who, char *message
 				return FALSE;
 			}
 		}
-		else
+		else if( twitter_length_check(ic, message) )
 			twitter_post_status(ic, message);
 	}
 	else
@@ -261,7 +275,7 @@ static void twitter_remove_buddy( struct im_connection *ic, char *who, char *gro
 
 static void twitter_chat_msg( struct groupchat *c, char *message, int flags )
 {
-	if( c && message )
+	if( c && message && twitter_length_check(c->ic, message))
 		twitter_post_status(c->ic, message);
 }
 
-- 
cgit v1.2.3