Changeset 6a9d068

Timestamp:

2010-05-03T00:39:39Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f924563

Parents:

e54112f

Message:

Restore away_devoice.

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (2 diffs)
• irc_channel.c (modified) (2 diffs)
• irc_im.c (modified) (1 diff)
• irc_send.c (modified) (3 diffs)

irc.c

@@ -640 +640 @@
                         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

@@ -196 +196 @@
 irc_channel_user_t *irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu );
 int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *who );
+void irc_channel_user_set_mode( irc_channel_t *ic, irc_user_t *iu, irc_channel_user_flags_t flags );
 gboolean irc_channel_name_ok( const char *name );
 
@@ -216 +217 @@
 void irc_send_msg_f( irc_user_t *iu, const char *type, const char *dst, const char *format, ... ) G_GNUC_PRINTF( 4, 5 );
 void irc_send_nick( irc_user_t *iu, const char *new );
+void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
+                                      irc_channel_user_flags_t old, irc_channel_user_flags_t new );
 
 /* irc_user.c */

irc_channel.c

@@ -43 +43 @@
         
         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_prepend( irc->channels, ic );
@@ -157 +160 @@
         
         return 1;
+}
+
+void irc_channel_user_set_mode( irc_channel_t *ic, irc_user_t *iu, irc_channel_user_flags_t flags )
+{
+        irc_channel_user_t *icu = irc_channel_has_user( ic, iu );
+        
+        if( icu->flags == flags )
+                return;
+        
+        if( ic->flags & IRC_CHANNEL_JOINED )
+                irc_send_channel_user_mode_diff( ic, iu, icu->flags, flags );
+        
+        icu->flags = flags;
 }
 

irc_im.c

@@ -92 +92 @@
                         
                         irc_channel_add_user( ic, iu );
+                        
+                        if( set_getbool( &bee->set, "away_devoice" ) )
+                                irc_channel_user_set_mode( ic, iu, ( bu->flags & BEE_USER_AWAY ) ?
+                                                           0 : IRC_CHANNEL_USER_VOICE );
                 }
                 else

irc_send.c

@@ -157 +157 @@
         GSList *l;
         char namelist[385] = "";
-        //char *ops = set_getstr( &ic->irc->b->set, "ops" );
         
         /* RFCs say there is no error reply allowed on NAMES, so when the
@@ -172 +171 @@
                 }
                 
-                /*
-                if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
+                if( icu->flags & IRC_CHANNEL_USER_OP )
+                        strcat( namelist, "@" );
+                else if( icu->flags & IRC_CHANNEL_USER_HALFOP )
+                        strcat( namelist, "%" );
+                else if( icu->flags & IRC_CHANNEL_USER_VOICE )
                         strcat( namelist, "+" );
-                else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
-                         ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
-                        strcat( namelist, "@" );
-                */
                 
                 strcat( namelist, iu->nick );
@@ -327 +325 @@
                    iu->nick, iu->user, iu->host, new );
 }
+
+/* Send an update of a user's mode inside a channel, compared to what it was. */
+void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
+        irc_channel_user_flags_t old, irc_channel_user_flags_t new )
+{
+        char changes[3*(5+strlen(iu->nick))];
+        char from[strlen(ic->irc->root->nick)+strlen(ic->irc->root->user)+strlen(ic->irc->root->host)+3];
+        int n;
+        
+        *changes = '\0'; n = 0;
+        if( ( old & IRC_CHANNEL_USER_OP ) != ( new & IRC_CHANNEL_USER_OP ) )
+        {
+                n ++;
+                if( new & IRC_CHANNEL_USER_OP )
+                        strcat( changes, "+o" );
+                else
+                        strcat( changes, "-o" );
+        }
+        if( ( old & IRC_CHANNEL_USER_HALFOP ) != ( new & IRC_CHANNEL_USER_HALFOP ) )
+        {
+                n ++;
+                if( new & IRC_CHANNEL_USER_HALFOP )
+                        strcat( changes, "+h" );
+                else
+                        strcat( changes, "-h" );
+        }
+        if( ( old & IRC_CHANNEL_USER_VOICE ) != ( new & IRC_CHANNEL_USER_VOICE ) )
+        {
+                n ++;
+                if( new & IRC_CHANNEL_USER_VOICE )
+                        strcat( changes, "+v" );
+                else
+                        strcat( changes, "-v" );
+        }
+        while( n )
+        {
+                strcat( changes, " " );
+                strcat( changes, iu->nick );
+                n --;
+        }
+        
+        if( set_getbool( &ic->irc->b->set, "simulate_netsplit" ) )
+                g_snprintf( from, sizeof( from ), "%s", ic->irc->root->host );
+        else
+                g_snprintf( from, sizeof( from ), "%s!%s@%s", ic->irc->root->nick,
+                            ic->irc->root->user, ic->irc->root->host );
+        
+        irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
+}