Changeset b919363 for irc_commands.c

Timestamp:

2010-03-27T14:31:03Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2f53ada

Parents:

9b69eb7

Message:

Mode stuff. Also disallow unsetting +R umode which was possible so far
(and shouldn't be).

File:

• irc_commands.c (modified) (3 diffs)

irc_commands.c

@@ -184 +184 @@
 }
 
+static void irc_cmd_mode( irc_t *irc, char **cmd )
+{
+        if( irc_channel_name_ok( cmd[1] ) )
+        {
+                irc_channel_t *ic;
+                
+                if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+                        irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+                else if( cmd[2] )
+                {
+                        if( *cmd[2] == '+' || *cmd[2] == '-' )
+                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
+                        else if( *cmd[2] == 'b' )
+                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
+                }
+                else
+                        irc_send_num( irc, 324, "%s +%s", cmd[1], ic->mode );
+        }
+        else
+        {
+                if( nick_cmp( cmd[1], irc->user->nick ) == 0 )
+                {
+                        if( cmd[2] )
+                                irc_umode_set( irc, cmd[2], 0 );
+                        else
+                                irc_send_num( irc, 221, "+%s", irc->umode );
+                }
+                else
+                        irc_send_num( irc, 502, ":Don't touch their modes" );
+        }
+}
+
 #if 0
 //#if 0
@@ -199 +231 @@
         {
                 irc_send_num( irc, 432, ":Incorrect password" );
-        }
-}
-
-static void irc_cmd_mode( irc_t *irc, char **cmd )
-{
-        if( strchr( CTYPES, *cmd[1] ) )
-        {
-                if( cmd[2] )
-                {
-                        if( *cmd[2] == '+' || *cmd[2] == '-' )
-                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
-                        else if( *cmd[2] == 'b' )
-                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
-                }
-                else
-                        irc_send_num( irc, 324, "%s +%s", cmd[1], CMODE );
-        }
-        else
-        {
-                if( nick_cmp( cmd[1], irc->nick ) == 0 )
-                {
-                        if( cmd[2] )
-                                irc_umode_set( irc, cmd[2], 0 );
-                        else
-                                irc_send_num( irc, 221, "+%s", irc->umode );
-                }
-                else
-                        irc_send_num( irc, 502, ":Don't touch their modes" );
         }
 }
@@ -566 +570 @@
         { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
         { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
+        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
 #if 0
         { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
-        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
         { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
         { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },