Changeset 65016a6

Timestamp:

2010-08-04T19:45:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

23d6165

Parents:

bce2014

Message:

Set channel mode +C for control channels.

Files:

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

irc.c

@@ -764 +764 @@
 }
 
+/* TODO: This is a mess, but this function is a bit too complicated to be
+   converted to something more generic. */
 void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv )
 {

irc.h

@@ -36 +36 @@
 #define UMODES_PRIV "Ro"   /* Allowed, but not by user directly */
 #define UMODES_KEEP "R"    /* Don't allow unsetting using /MODE */
-#define CMODES "nt"        /* Allowed modes */
+#define CMODES "ntC"       /* Allowed modes */
 #define CMODE "t"          /* Default mode */
 #define UMODE "s"          /* Default mode */
@@ -250 +250 @@
 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 );
+void irc_channel_set_mode( irc_channel_t *ic, const char *s );
 void irc_channel_auto_joins( irc_t *irc, struct account *acc );
 void irc_channel_printf( irc_channel_t *ic, char *format, ... );

irc_channel.c

@@ -322 +322 @@
         
         icu->flags = flags;
+}
+
+void irc_channel_set_mode( irc_channel_t *ic, const char *s )
+{
+        irc_t *irc = ic->irc;
+        char m[128], st = 1;
+        const char *t;
+        int i;
+        char changes[512], *p, st2 = 2;
+        
+        memset( m, 0, sizeof( m ) );
+        
+        for( t = ic->mode; *t; t ++ )
+                if( *t < sizeof( m ) )
+                        m[(int)*t] = 1;
+        
+        p = changes;
+        for( t = s; *t; t ++ )
+        {
+                if( *t == '+' || *t == '-' )
+                        st = *t == '+';
+                else if( strchr( CMODES, *t ) )
+                {
+                        if( m[(int)*t] != st)
+                        {
+                                if( st != st2 )
+                                        st2 = st, *p++ = st ? '+' : '-';
+                                *p++ = *t;
+                        }
+                        m[(int)*t] = st;
+                }
+        }
+        *p = '\0';
+        
+        memset( ic->mode, 0, sizeof( ic->mode ) );
+        
+        for( i = 'A'; i <= 'z' && strlen( ic->mode ) < ( sizeof( ic->mode ) - 1 ); i ++ )
+                if( m[i] )
+                        ic->mode[strlen(ic->mode)] = i;
+        
+        if( *changes && ( ic->flags & IRC_CHANNEL_JOINED ) )
+                irc_write( irc, ":%s!%s@%s MODE %s :%s", irc->root->nick,
+                           irc->root->user, irc->root->host, ic->name,
+                           changes );
 }
 
@@ -560 +604 @@
         set_setstr( &ic->set, "show_users", "online+,away" );
         
+        /* For scripts that care. */
+        irc_channel_set_mode( ic, "+C" );
+        
         return TRUE;
 }
@@ -691 +738 @@
         ic->data = NULL;
         
+        /* For scripts that care. */
+        irc_channel_set_mode( ic, "-C" );
+        
         return TRUE;
 }