Changeset 39f93f0 for root_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:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -1051 +1051 @@
                 cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead );
         }
+        else if( g_strcasecmp( cmd[1], "with" ) == 0 )
+        {
+                user_t *u;
+
+                if( !cmd[2] )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
+                        return;
+                }
+                
+                if( ( u = user_find( irc, cmd[2] ) ) && u->ic && u->ic->acc->prpl->chat_with )
+                {
+                        if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
+                        {
+                                irc_usermsg( irc, "(Possible) failure while trying to open "
+                                                  "a groupchat with %s.", u->nick );
+                        }
+                }
+                else
+                {
+                        irc_usermsg( irc, "Can't open a groupchat with %s.", cmd[2] );
+                }
+        }
         else
         {
@@ -1084 +1107 @@
         if( cmd[3] )
         {
-                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
+                if( strchr( CTYPES, cmd[3][0] ) == NULL )
                         channel = g_strdup_printf( "&%s", cmd[3] );
                 else