Changeset 06aed9a for protocols/msn/msn.c

Timestamp:

2012-10-01T22:51:39Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4fdb102

Parents:

a992d7a (diff), 4c9d377 (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:

Merge msnp18 branch. It's stable enough and really not that intrusive.

File:

• protocols/msn/msn.c (modified) (8 diffs)

protocols/msn/msn.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -98 +98 @@
                 g_free( md->lock_key );
                 g_free( md->pp_policy );
+                g_free( md->uuid );
                 
                 while( md->groups )
@@ -139 +140 @@
 static int msn_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
+        struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
+        struct msn_buddy_data *bd = bu ? bu->data : NULL;
         struct msn_switchboard *sb;
         
@@ -148 +151 @@
         else
 #endif
-        if( ( sb = msn_sb_by_handle( ic, who ) ) )
+        if( bd && bd->flags & MSN_BUDDY_FED )
+        {
+                msn_ns_sendmessage( ic, bu, message );
+        }
+        else if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {
                 return( msn_sb_sendmessage( sb, message ) );
@@ -190 +197 @@
                 md->away_state = msn_away_state_list + 1;
         
-        if( !msn_ns_write( ic, -1, "CHG %d %s\r\n", ++md->trId, md->away_state->code ) )
+        if( !msn_ns_write( ic, -1, "CHG %d %s %d:%02d\r\n", ++md->trId, md->away_state->code, MSN_CAP1, MSN_CAP2 ) )
                 return;
         
-        uux = g_markup_printf_escaped( "<Data><PSM>%s</PSM><CurrentMedia></CurrentMedia>"
-                                       "</Data>", message ? message : "" );
+        uux = g_markup_printf_escaped( "<EndpointData><Capabilities>%d:%02d"
+                                       "</Capabilities></EndpointData>",
+                                       MSN_CAP1, MSN_CAP2 );
+        msn_ns_write( ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
+        g_free( uux );
+        
+        uux = g_markup_printf_escaped( "<PrivateEndpointData><EpName>%s</EpName>"
+                                       "<Idle>%s</Idle><ClientType>%d</ClientType>"
+                                       "<State>%s</State></PrivateEndpointData>",
+                                       md->uuid,
+                                       strcmp( md->away_state->code, "IDL" ) ? "false" : "true",
+                                       1, /* ? */
+                                       md->away_state->code );
+        msn_ns_write( ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
+        g_free( uux );
+        
+        uux = g_markup_printf_escaped( "<Data><DDP></DDP><PSM>%s</PSM>"
+                                       "<CurrentMedia></CurrentMedia>"
+                                       "<MachineGuid>%s</MachineGuid></Data>",
+                                       message ? message : "", md->uuid );
         msn_ns_write( ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
         g_free( uux );
@@ -232 +257 @@
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );
-        char buf[1024];
         
         if( sb )
-        {
-                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
-                msn_sb_write( sb, buf, strlen( buf ) );
-        }
+                msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, who );
 }
 
@@ -246 +267 @@
         
         if( sb )
-                msn_sb_write( sb, "OUT\r\n", 5 );
+                msn_sb_write( sb, "OUT\r\n" );
 }
 
@@ -340 +361 @@
 {
         struct msn_data *md = bu->ic->proto_data;
-        bu->data = g_new0( struct msn_buddy_data, 1 );
+        struct msn_buddy_data *bd;
+        char *handle;
+        
+        bd = bu->data = g_new0( struct msn_buddy_data, 1 );
         g_tree_insert( md->domaintree, bu->handle, bu );
+        
+        for( handle = bu->handle; isdigit( *handle ); handle ++ );
+        if( *handle == ':' )
+        {
+                /* Pass a nick hint so hopefully the stupid numeric prefix
+                   won't show up to the user.  */
+                char *s = strchr( ++handle, '@' );
+                if( s )
+                {
+                        handle = g_strndup( handle, s - handle );
+                        imcb_buddy_nick_hint( bu->ic, bu->handle, handle );
+                        g_free( handle );
+                }
+                
+                bd->flags |= MSN_BUDDY_FED;
+        }
 }