Changeset c5aefa4 for irc_channel.c

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.

File:

• irc_channel.c (modified) (4 diffs)

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;
 }