Changeset 36562b0

Timestamp:

2010-06-07T00:44:45Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0d9d53e

Parents:

92cb8c4

Message:

Added "channel list" command and the ability to use only part of the
channel name or a number in "chan set"/etc.

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

irc.h

@@ -220 +220 @@
 irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
 irc_channel_t *irc_channel_by_name( irc_t *irc, const char *name );
+irc_channel_t *irc_channel_get( irc_t *irc, char *id );
 int irc_channel_free( irc_channel_t *ic );
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );

irc_channel.c

@@ -49 +49 @@
                 irc_channel_user_set_mode( ic, irc->root, IRC_CHANNEL_USER_OP );
         
-        irc->channels = g_slist_prepend( irc->channels, ic );
+        irc->channels = g_slist_append( irc->channels, ic );
         
         set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
@@ -69 +69 @@
                 irc_channel_t *ic = l->data;
                 
-                if( name[0] == ic->name[0] && nick_cmp( name + 1, ic->name + 1 ) == 0 )
+                if( g_strcasecmp( name, ic->name ) == 0 )
                         return ic;
         }
         
         return NULL;
+}
+
+irc_channel_t *irc_channel_get( irc_t *irc, char *id )
+{
+        irc_channel_t *ic, *ret = NULL;
+        GSList *l;
+        int nr;
+        
+        if( sscanf( id, "%d", &nr ) == 1 && nr < 1000 )
+        {
+                for( l = irc->channels; l; l = l->next )
+                {
+                        ic = l->data;
+                        if( ( nr-- ) == 0 ) 
+                                return ic;
+                }
+                
+                return NULL;
+        }
+        
+        /* Exact match first: Partial match only sucks if there's a channel
+           #aa and #aabb */
+        if( ( ret = irc_channel_by_name( irc, id ) ) )
+                return ret;
+        
+        for( l = irc->channels; l; l = l->next )
+        {
+                ic = l->data;
+                
+                if( strstr( ic->name, id ) )
+                {
+                        /* Make sure it's a unique match. */
+                        if( !ret )
+                                ret = ic;
+                        else
+                                return NULL;
+                }
+        }
+        
+        return ret;
 }
 

root_commands.c

@@ -522 +522 @@
         irc_channel_t *ic;
         
-        if( ( ic = irc_channel_by_name( irc, id ) ) )
+        if( ( ic = irc_channel_get( irc, id ) ) )
                 return &ic->set;
         else
@@ -535 +535 @@
                 
                 cmd_set_real( irc, cmd + 1, cmd_channel_set_findhead, NULL );
+        }
+        else if( g_strcasecmp( cmd[1], "list" ) == 0 )
+        {
+                GSList *l;
+                int i = 0;
+                
+                if( strchr( irc->umode, 'b' ) )
+                        irc_usermsg( irc, "Channel list:" );
+                
+                for( l = irc->channels; l; l = l->next )
+                {
+                        irc_channel_t *ic = l->data;
+                        
+                        irc_usermsg( irc, "%2d. %s, %s channel%s", i, ic->name,
+                                     set_getstr( &ic->set, "type" ),
+                                     ic->flags & IRC_CHANNEL_JOINED ? " (joined)" : "" );
+                        
+                        i ++;
+                }
+                irc_usermsg( irc, "End of channel list" );
         }
         else