Changeset 4f22a68c

Timestamp:

2010-07-18T20:12:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

94d5da9c

Parents:

3e59c8d

Message:

Automatically operate on the current channel if just using "channel set".

Files:

• doc/user-guide/commands.xml (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

doc/user-guide/commands.xml

@@ -211 +211 @@
 
                 <bitlbee-command name="set">
-                        <syntax>channel &lt;channel id&gt; set</syntax>
-                        <syntax>channel &lt;channel id&gt; set &lt;setting&gt;</syntax>
-                        <syntax>channel &lt;channel id&gt; set &lt;setting&gt; &lt;value&gt;</syntax>
-                        <syntax>channel &lt;channel id&gt; set -del &lt;setting&gt;</syntax>
+                        <syntax>channel [&lt;channel id&gt;] set</syntax>
+                        <syntax>channel [&lt;channel id&gt;] set &lt;setting&gt;</syntax>
+                        <syntax>channel [&lt;channel id&gt;] set &lt;setting&gt; &lt;value&gt;</syntax>
+                        <syntax>channel [&lt;channel id&gt;] set -del &lt;setting&gt;</syntax>
 
                         <description>
@@ -226 +226 @@
                                 
                                 <para>
-                                        The channel ID can be a number (see <emphasis>channel list</emphasis>), or (part of) its name, as long as it matches only one channel.
+                                        The channel ID can be a number (see <emphasis>channel list</emphasis>), or (part of) its name, as long as it matches only one channel. If you want to change settings of the current channel, you can omit the channel ID.
                                 </para>
                         </description>

root_commands.c

@@ -550 +550 @@
         }
         
+        if( ( ic = irc_channel_get( irc, cmd[1] ) ) == NULL )
+        {
+                /* If this doesn't match any channel, maybe this is the short
+                   syntax (only works when used inside a channel). */
+                if( ( len = strlen( cmd[1] ) ) &&
+                    g_strncasecmp( cmd[1], "set", len ) == 0 &&
+                    ( ic = irc_channel_by_name( irc, irc->last_root_cmd ) ) )
+                        cmd_set_real( irc, cmd + 1, &ic->set, NULL );
+                else
+                        irc_usermsg( irc, "Could not find channel `%s'", cmd[1] );
+                
+                return;
+        }
+        
         MIN_ARGS( 2 );
         len = strlen( cmd[2] );
-        
-        if( ( ic = irc_channel_get( irc, cmd[1] ) ) == NULL )
-        {
-                irc_usermsg( irc, "Could not find channel `%s'", cmd[1] );
-                return;
-        }
         
         if( len >= 1 && g_strncasecmp( cmd[2], "set", len ) == 0 )