Changeset 39f93f0 for irc_commands.c

Timestamp:

2008-08-31T13:42:33Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d995c9b

Parents:

0e639f5

Message:

/join can now be used to join chatrooms, join_chat should not be used
anymore. /join should not be used for unnamed groupchats anymore, use
"chat with" instead.

File:

• irc_commands.c (modified) (2 diffs)

irc_commands.c

@@ -125 +125 @@
 static void irc_cmd_mode( irc_t *irc, char **cmd )
 {
-        if( *cmd[1] == '#' || *cmd[1] == '&' )
+        if( strchr( CTYPES, *cmd[1] ) )
         {
                 if( cmd[2] )
@@ -193 +193 @@
         else if( cmd[1] )
         {
-                if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] )
-                {
-                        user_t *u = user_find( irc, cmd[1] + 1 );
-                        
-                        if( u && u->ic && u->ic->acc->prpl->chat_with )
-                        {
-                                irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
-                                
-                                if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
-                                {
-                                        irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
-                                }
-                        }
-                        else if( u )
-                        {
-                                irc_reply( irc, 403, "%s :Groupchats are not possible with %s", cmd[1], cmd[1]+1 );
-                        }
-                        else
-                        {
-                                irc_reply( irc, 403, "%s :No such nick", cmd[1] );
+                struct groupchat *gc;
+                struct chat *c;
+                user_t *u;
+                
+                if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 )
+                {
+                        irc_reply( irc, 403, "%s :No such channel", cmd[1] );
+                        return;
+                }
+                
+                if( ( c = chat_bychannel( irc, cmd[1] ) ) )
+                {
+                        char *nick = set_getstr( &c->set, "nick" );
+                        
+                        if( nick == NULL )
+                                nick = irc->nick;
+                        
+                        if( ( gc = c->acc->prpl->chat_join( c->acc->ic, c->handle, nick, NULL ) ) )
+                        {
+                                g_free( gc->channel );
+                                gc->channel = g_strdup( c->channel );
                         }
                 }