Changeset 70ac477

Timestamp:

2010-06-11T11:34:39Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c8e5f7

Parents:

5266354

Message:

Create new MSN groups when necessary.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -104 +104 @@
                 g_free( md->grouplist );
                 
+                while( md->grpq )
+                {
+                        struct msn_groupadd *ga = md->grpq->data;
+                        g_free( ga->group );
+                        g_free( ga->who );
+                        g_free( ga );
+                        md->grpq = g_slist_remove( md->grpq, ga );
+                }
+                
                 g_free( md );
         }
@@ -122 +131 @@
         struct msn_switchboard *sb;
         
+#ifdef DEBUG
+        if( strcmp( who, "raw" ) == 0 )
+        {
+                msn_write( ic, message, strlen( message ) );
+                msn_write( ic, "\r\n", 2 );
+        }
+        else
+#endif
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {

protocols/msn/msn.h

@@ -70 +70 @@
         int trId;
         
-        GSList *msgq;
+        GSList *msgq, *grpq;
         GSList *switchboards;
         int sb_failures;
@@ -119 +119 @@
         char *who;
         char *text;
+};
+
+struct msn_groupadd
+{
+        char *who;
+        char *group;
 };
 

protocols/msn/msn_util.c

@@ -55 +55 @@
         struct msn_data *md = ic->proto_data;
         char buf[1024], *realname, groupid[8];
-        
-        realname = msn_http_encode( realname_ );
         
         *groupid = '\0';
@@ -68 +66 @@
                                 break;
                         }
-        }
-        
+                
+                if( *groupid == '\0' )
+                {
+                        /* Have to create this group, it doesn't exist yet. */
+                        struct msn_groupadd *ga;
+                        GSList *l;
+                        
+                        for( l = md->grpq; l; l = l->next )
+                        {
+                                ga = l->data;
+                                if( g_strcasecmp( ga->group, group ) == 0 )
+                                        break;
+                        }
+                        
+                        ga = g_new0( struct msn_groupadd, 1 );
+                        ga->who = g_strdup( who );
+                        ga->group = g_strdup( group );
+                        md->grpq = g_slist_prepend( md->grpq, ga );
+                        
+                        if( l == NULL )
+                        {
+                                char *groupname = msn_http_encode( group );
+                                g_snprintf( buf, sizeof( buf ), "ADG %d %s %d\r\n", ++md->trId, groupname, 0 );
+                                g_free( groupname );
+                                return msn_write( ic, buf, strlen( buf ) );
+                        }
+                        else
+                        {
+                                /* This can happen if the user's doing lots of adds to a
+                                   new group at once; we're still waiting for the server
+                                   to confirm group creation. */
+                                return 1;
+                        }
+                }
+        }
+        
+        realname = msn_http_encode( realname_ );
         g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
-        if( msn_write( ic, buf, strlen( buf ) ) )
-        {
-                g_free( realname );
-                
-                return( 1 );
-        }
-        
         g_free( realname );
         
-        return( 0 );
+        return msn_write( ic, buf, strlen( buf ) );
 }
 

protocols/msn/ns.c

@@ -612 +612 @@
                 }
         }
+        else if( strcmp( cmd[0], "ADG" ) == 0 )
+        {
+                char *group = g_strdup( cmd[3] );
+                int groupnum, i;
+                GSList *l, *next;
+                
+                http_decode( group );
+                if( sscanf( cmd[4], "%d", &groupnum ) == 1 )
+                {
+                        if( groupnum >= md->groupcount )
+                        {
+                                md->grouplist = g_renew( char *, md->grouplist, groupnum + 1 );
+                                for( i = md->groupcount; i <= groupnum; i ++ )
+                                        md->grouplist[i] = NULL;
+                                md->groupcount = groupnum + 1;
+                        }
+                        g_free( md->grouplist[groupnum] );
+                        md->grouplist[groupnum] = group;
+                }
+                else
+                {
+                        /* Shouldn't happen, but if it does, give up on the group. */
+                        g_free( group );
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return 0;
+                }
+                
+                for( l = md->grpq; l; l = next )
+                {
+                        struct msn_groupadd *ga = l->data;
+                        next = l->next;
+                        if( g_strcasecmp( ga->group, group ) == 0 )
+                        {
+                                if( !msn_buddy_list_add( ic, "FL", ga->who, ga->who, group ) )
+                                        return 0;
+                                
+                                g_free( ga->group );
+                                g_free( ga->who );
+                                g_free( ga );
+                                md->grpq = g_slist_remove( md->grpq, ga );
+                        }
+                }
+        }
         else if( isdigit( cmd[0][0] ) )
         {