Changes in root_commands.c [9da0bbf:9334cc2]

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -383 +383 @@
                 }
                 
-                if( cmd[3] )
+                if( cmd[3] && set_name )
                 {
                         set_t *s = set_find( &a->set, set_name );
@@ -912 +912 @@
         if( cmd[3] )
         {
-                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
-                        channel = g_strdup_printf( "&%s", cmd[3] );
-                else
-                        channel = g_strdup( cmd[3] );
+                channel = g_strdup( cmd[3] );
         }
         else
@@ -921 +918 @@
                 char *s;
                 
-                channel = g_strdup_printf( "&%s", chat );
+                channel = g_strdup( chat );
                 if( ( s = strchr( channel, '@' ) ) )
                         *s = 0;
@@ -927 +924 @@
         if( cmd[3] && cmd[4] )
                 nick = cmd[4];
-        else
-                nick = irc->nick;
         if( cmd[3] && cmd[4] && cmd[5] )
                 password = cmd[5];
         
-        if( !nick_ok( channel + 1 ) )
-        {
-                irc_usermsg( irc, "Invalid channel name: %s", channel );
-                g_free( channel );
-                return;
-        }
-        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
-        {
-                irc_usermsg( irc, "Channel already exists: %s", channel );
-                g_free( channel );
-                return;
-        }
-        
-        if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )
-        {
-                g_free( c->channel );
-                c->channel = channel;
-        }
-        else
-        {
-                irc_usermsg( irc, "Tried to join chat, not sure if this was successful" );
-                g_free( channel );
-        }
+        c = a->prpl->chat_join( ic, chat, nick, password );
+        
+        g_free( channel );
 }