Changeset e180c59

Timestamp:

2008-09-28T10:56:46Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

94acdd0

Parents:

2bebe15

Message:

Fixed irc_cmd_join(). Giving a more proper response to invalid channel
names, and checking if an account is on-line before attempting to join
one of its chatrooms.

File:

• irc_commands.c (modified) (1 diff)

irc_commands.c

@@ -197 +197 @@
                 
                 if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 )
-                {
+                        irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] );
+                else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic )
+                        chat_join( irc, c );
+                else
                         irc_reply( irc, 403, "%s :No such channel", cmd[1] );
-                        return;
-                }
-                
-                if( ( c = chat_bychannel( irc, cmd[1] ) ) )
-                {
-                        chat_join( irc, c );
-                }
-                else
-                {
-                        irc_reply( irc, 403, "%s :No such channel", cmd[1] );
-                }
         }
 }