Changeset fef6116

Timestamp:

2006-07-01T19:17:42Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

96863f6

Parents:

5100caa (diff), 3f9440d (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:

Fixed check in set_eval_account() and merging from main (better NAMES replies).

Files:

• account.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• set.h (modified) (1 diff)

account.c

@@ -72 +72 @@
         
         /* Double-check: We refuse to edit on-line accounts. */
-        if( acc->gc )
+        if( set->flags & ACC_SET_OFFLINE_ONLY && acc->gc )
                 return NULL;
         

irc.c

@@ -649 +649 @@
 void irc_names( irc_t *irc, char *channel )
 {
-        user_t *u = irc->users;
-        char *s;
-        int control = ( g_strcasecmp( channel, irc->channel ) == 0 );
+        user_t *u;
+        char namelist[385] = "";
         struct conversation *c = NULL;
-        
-        if( !control )
-                c = conv_findchannel( channel );
         
         /* RFCs say there is no error reply allowed on NAMES, so when the
            channel is invalid, just give an empty reply. */
         
-        if( control || c ) while( u )
-        {
-                if( u->online )
-                {
-                        if( u->gc && control )
+        if( g_strcasecmp( channel, irc->channel ) == 0 )
+        {
+                for( u = irc->users; u; u = u->next ) if( u->online )
+                {
+                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
                         {
-                                if( set_getint( &irc->set, "away_devoice" ) && !u->away )
-                                        s = "+";
-                                else
-                                        s = "";
-                                
-                                irc_reply( irc, 353, "= %s :%s%s", channel, s, u->nick );
+                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
+                                *namelist = 0;
                         }
-                        else if( !u->gc )
+                        
+                        if( u->gc && !u->away && set_getbool( &irc->set, "away_devoice" ) )
+                                strcat( namelist, "+" );
+                        
+                        strcat( namelist, u->nick );
+                        strcat( namelist, " " );
+                }
+        }
+        else if( ( c = conv_findchannel( channel ) ) )
+        {
+                GList *l;
+                char *ops = set_getstr( &irc->set, "ops" );
+                
+                /* root and the user aren't in the channel userlist but should
+                   show up in /NAMES, so list them first: */
+                sprintf( namelist, "%s%s %s%s ", strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->mynick,
+                                                 strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->nick );
+                
+                for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->gc, l->data ) ) )
+                {
+                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
                         {
-                                if( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( set_getstr( &irc->set, "ops" ), "root" ) == 0 || strcmp( set_getstr( &irc->set, "ops" ), "both" ) == 0 ) )
-                                        s = "@";
-                                else if( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( set_getstr( &irc->set, "ops" ), "user" ) == 0 || strcmp( set_getstr( &irc->set, "ops" ), "both" ) == 0 ) )
-                                        s = "@";
-                                else
-                                        s = "";
-                                
-                                irc_reply( irc, 353, "= %s :%s%s", channel, s, u->nick );
+                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
+                                *namelist = 0;
                         }
-                }
-                
-                u = u->next;
-        }
-        
-        /* For non-controlchannel channels (group conversations) only root and
-           you are listed now. Time to show the channel people: */
-        if( !control && c )
-        {
-                GList *l;
-                
-                for( l = c->in_room; l; l = l->next )
-                        if( ( u = user_findhandle( c->gc, l->data ) ) )
-                                irc_reply( irc, 353, "= %s :%s%s", channel, "", u->nick );
-        }
+                        
+                        strcat( namelist, u->nick );
+                        strcat( namelist, " " );
+                }
+        }
+        
+        if( *namelist )
+                irc_reply( irc, 353, "= %s :%s", channel, namelist );
         
         irc_reply( irc, 366, "%s :End of /NAMES list", channel );

set.h

@@ -45 +45 @@
 G_MODULE_EXPORT char *set_getstr( set_t **head, char *key );
 G_MODULE_EXPORT int set_getint( set_t **head, char *key );
+G_MODULE_EXPORT int set_getbool( set_t **head, char *key );
 int set_setstr( set_t **head, char *key, char *value );
 int set_setint( set_t **head, char *key, int value );