Changeset c5aefa4

Timestamp:

2010-06-07T15:39:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

70f69ecc

Parents:

0e8b3e8

Message:

Restore "ops" command completely, and set user op status *just* before
s/he joins.

Files:

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

irc.c

@@ -107 +107 @@
         s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc );
         s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
-        s = set_add( &b->set, "ops", "both", NULL/*set_eval_ops*/, irc );
+        s = set_add( &b->set, "ops", "both", set_eval_irc_channel_ops, irc );
         s = set_add( &b->set, "paste_buffer", "false", set_eval_bool, irc );
         s->old_key = g_strdup( "buddy_sendbuffer" );
@@ -663 +663 @@
                         irc_channel_add_user( ic, irc->user );
                         
-                        if( strcmp( set_getstr( &irc->b->set, "ops" ), "both" ) == 0 ||
-                            strcmp( set_getstr( &irc->b->set, "ops" ), "user" ) == 0 )
-                                irc_channel_user_set_mode( ic, irc->user, IRC_CHANNEL_USER_OP );
-                        
                         irc->last_root_cmd = g_strdup( ROOT_CHAN );
                         

irc.h

@@ -229 +229 @@
 void irc_channel_printf( irc_channel_t *ic, char *format, ... );
 gboolean irc_channel_name_ok( const char *name );
+void irc_channel_update_ops( irc_channel_t *ic, char *value );
+char *set_eval_irc_channel_ops( struct set *set, char *value );
 
 /* irc_commands.c */

irc_channel.c

@@ -45 +45 @@
         
         irc_channel_add_user( ic, irc->root );
-        if( strcmp( set_getstr( &irc->b->set, "ops" ), "both" ) == 0 ||
-            strcmp( set_getstr( &irc->b->set, "ops" ), "root" ) == 0 )
-                irc_channel_user_set_mode( ic, irc->root, IRC_CHANNEL_USER_OP );
         
         irc->channels = g_slist_append( irc->channels, ic );
@@ -173 +170 @@
         ic->users = g_slist_insert_sorted( ic->users, icu, irc_channel_user_cmp );
         
+        irc_channel_update_ops( ic, set_getstr( &ic->irc->b->set, "ops" ) );
+        
         if( iu == ic->irc->user || ic->flags & IRC_CHANNEL_JOINED )
         {
@@ -239 +238 @@
         irc_channel_user_t *icu = irc_channel_has_user( ic, iu );
         
-        if( icu->flags == flags )
+        if( !icu || icu->flags == flags )
                 return;
         
@@ -282 +281 @@
         
         return irc_user_cmp( a->iu, b->iu );
+}
+
+void irc_channel_update_ops( irc_channel_t *ic, char *value )
+{
+        irc_channel_user_set_mode( ic, ic->irc->root,
+                ( strcmp( value, "both" ) == 0 ||
+                  strcmp( value, "root" ) == 0 ) ? IRC_CHANNEL_USER_OP : 0 );
+        irc_channel_user_set_mode( ic, ic->irc->user,
+                ( strcmp( value, "both" ) == 0 ||
+                  strcmp( value, "user" ) == 0 ) ? IRC_CHANNEL_USER_OP : 0 );
+}
+
+char *set_eval_irc_channel_ops( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        GSList *l;
+        
+        if( strcmp( value, "both" ) != 0 && strcmp( value, "none" ) != 0 && 
+            strcmp( value, "user" ) != 0 && strcmp( value, "root" ) != 0 )
+                return SET_INVALID;
+        
+        for( l = irc->channels; l; l = l->next )
+                irc_channel_update_ops( l->data, value );
+        
+        return value;
 }