Changeset d569019

Timestamp:

2010-04-07T00:27:51Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1014cab

Parents:

0519b0a

Message:

A little more cleanup.

Location:

protocols/twitter

Files:

• twitter.c (modified) (4 diffs)
• twitter_lib.c (modified) (4 diffs)

protocols/twitter/twitter.c

@@ -36 +36 @@
         // 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;
 
@@ -69 +69 @@
         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;
@@ -75 +77 @@
         ic->proto_data = td;
 
-        imcb_log( ic, "Connecting to twitter" );
+        imcb_log( ic, "Connecting to Twitter" );
         imcb_connected(ic);
 
@@ -84 +86 @@
         // 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 );
 }
 

protocols/twitter/twitter_lib.c

@@ -37 +37 @@
 #define TXL_ID 3
 
-static void twitter_imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at );
-
 struct twitter_xml_list {
         int type;
@@ -101 +99 @@
 {
         // Check if the buddy is allready in the buddy list.
-        if (!user_findhandle( ic, name ))
+        if (!imcb_find_buddy( ic, name ))
         {
                 // The buddy is not in the list, add the buddy and set the status to logged in.
@@ -409 +407 @@
                 status = l->data;
                 twitter_add_buddy(ic, status->user->screen_name);
+                
                 // Say it!
-                twitter_imcb_chat_msg (gc, status->user->screen_name, status->text, 0, 0 );
+                if (g_strcasecmp(td->user, status->user->screen_name) == 0)
+                        imcb_chat_log (gc, "Your Tweet: %s", status->text);
+                else
+                        imcb_chat_msg (gc, status->user->screen_name, status->text, 0, 0 );
+                
                 // 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.
@@ -597 +600 @@
 //      g_free(args[3]);
 }
-
-
-/**
- * This function "overwrites" the imcb_chat_msg function. Because in the original the logged in user is filtered out.
- */
-static void twitter_imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
-{
-        struct im_connection *ic = c->ic;
-        char *wrapped;
-        user_t *u;
-
-        u = user_findhandle( ic, who );
-        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) 
-                        || ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
-                strip_html( msg );
-
-        wrapped = word_wrap( msg, 425 );
-        if( c && u )
-        {   
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
-        }
-        else
-        {   
-                imcb_log( ic, "Message from/to conversation %s@%p (unknown conv/user): %s", who, c, wrapped );
-        }
-        g_free( wrapped );
-}
-