Changeset 208db4b

Timestamp:

2012-09-29T19:38:18Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4c9d377

Parents:

3901b5d

Message:

Support for sending messages to federated contacts. They don't seem to arrive
but Pidgin seems to have the same problem.

Location:

protocols/msn

Files:

• msn.c (modified) (3 diffs)
• msn.h (modified) (1 diff)
• ns.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -140 +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;
         
@@ -149 +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 ) );
@@ -355 +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;
+        }
 }
 

protocols/msn/msn.h

@@ -198 +198 @@
         MSN_BUDDY_PL = 16,
         MSN_BUDDY_ADL_SYNCED = 256,
+        MSN_BUDDY_FED = 512,
 } msn_buddy_flags_t;
 

protocols/msn/ns.c

@@ -972 +972 @@
 {
         struct msn_data *md = ic->proto_data;
-        char *buf;
+        int type = 0;
+        char *buf, *handle;
         
         if( strncmp( text, "\r\r\r", 3 ) == 0 )
@@ -979 +980 @@
                 return 1;
         
+        /* This might be a federated contact. Get its network number,
+           prefixed to bu->handle with a colon. Default is 1. */
+        for( handle = bu->handle; isdigit( *handle ); handle ++ )
+                type = type * 10 + *handle - '0';
+        if( *handle == ':' )
+                handle ++;
+        else
+                type = 1;
+        
         buf = g_strdup_printf( "%s%s", MSN_MESSAGE_HEADERS, text );
         
         if( msn_ns_write( ic, -1, "UUM %d %s %d %d %zd\r\n%s",
-                                  ++md->trId, bu->handle,
-                                  1, /* type == MSN (offline) message */
+                                  ++md->trId, handle, type,
                                   1, /* type == IM (not nudge/typing) */
                                   strlen( buf ), buf ) )