Changeset 58646d9

Timestamp:

2010-06-28T09:37:11Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7a6ba50

Parents:

a670aeb

Message:

Allow joining multiple channels at once. Although BitlBee doesn't advertise
support for this, irssi tries to do this anyway.

File:

• irc_commands.c (modified) (1 diff)

irc_commands.c

@@ -128 +128 @@
 static void irc_cmd_join( irc_t *irc, char **cmd )
 {
-        irc_channel_t *ic;
-        
-        if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
-                ic = irc_channel_new( irc, cmd[1] );
-        
-        if( ic == NULL )
-        {
-                irc_send_num( irc, 479, "%s :Invalid channel name", cmd[1] );
-                return;
-        }
-        
-        if( ic->flags & IRC_CHANNEL_JOINED )
-                return; /* Dude, you're already there...
-                           RFC doesn't have any reply for that though? */
-        
-        if( ic->f->join && !ic->f->join( ic ) )
-                /* The story is: FALSE either means the handler showed an error
-                   message, or is doing some work before the join should be
-                   confirmed. (In the latter case, the caller should take care
-                   of that confirmation.)
-                   TRUE means all's good, let the user join the channel right away. */
-                return;
-        
-        irc_channel_add_user( ic, irc->user );
+        char *comma, *s = cmd[1];
+        
+        while( s )
+        {
+                irc_channel_t *ic;
+                
+                if( ( comma = strchr( s, ',' ) ) )
+                        *comma = '\0';
+                
+                if( ( ic = irc_channel_by_name( irc, s ) ) == NULL )
+                        ic = irc_channel_new( irc, s );
+                
+                if( ic == NULL )
+                {
+                        irc_send_num( irc, 479, "%s :Invalid channel name", s );
+                        goto next;
+                }
+                
+                if( ic->flags & IRC_CHANNEL_JOINED )
+                        /* Dude, you're already there...
+                           RFC doesn't have any reply for that though? */
+                        goto next;
+                
+                if( ic->f->join && !ic->f->join( ic ) )
+                        /* The story is: FALSE either means the handler
+                           showed an error message, or is doing some work
+                           before the join should be confirmed. (In the
+                           latter case, the caller should take care of that
+                           confirmation.) TRUE means all's good, let the
+                           user join the channel right away. */
+                        goto next;
+                
+                irc_channel_add_user( ic, irc->user );
+                
+next:
+                if( comma )
+                {
+                        s = comma + 1;
+                        *comma = ',';
+                }
+                else
+                        break;
+        }
 }