Changeset 256899f for root_commands.c

Timestamp:

2007-11-19T23:16:18Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7df5a08

Parents:

cd428e4 (diff), ef5c185 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging Jabber groupchat support.

File:

• root_commands.c (modified) (3 diffs)

root_commands.c

@@ -930 +930 @@
         if( cmd[3] )
         {
-                channel = g_strdup( cmd[3] );
+                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
+                        channel = g_strdup_printf( "&%s", cmd[3] );
+                else
+                        channel = g_strdup( cmd[3] );
         }
         else
@@ -936 +939 @@
                 char *s;
                 
-                channel = g_strdup( chat );
+                channel = g_strdup_printf( "&%s", chat );
                 if( ( s = strchr( channel, '@' ) ) )
                         *s = 0;
@@ -942 +945 @@
         if( cmd[3] && cmd[4] )
                 nick = cmd[4];
+        else
+                nick = irc->nick;
         if( cmd[3] && cmd[4] && cmd[5] )
                 password = cmd[5];
         
-        c = a->prpl->chat_join( ic, chat, nick, password );
-        
-        g_free( channel );
+        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 );
+        }
 }