Changeset c8eeadd

Timestamp:

2010-07-04T10:16:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5c7b45c

Parents:

0bd948e

Message:

Added automatic joining of channels. Auto-rejoin functionality for
groupchats not reimplemented yet but that's the next step.

Files:

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

irc.c

@@ -653 +653 @@
                         ic = irc->default_channel = irc_channel_new( irc, ROOT_CHAN );
                         irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
-                        irc_channel_add_user( ic, irc->user );
+                        set_setstr( &ic->set, "auto_join", "true" );
+                        irc_channel_auto_joins( irc, NULL );
                         
                         irc->last_root_cmd = g_strdup( ROOT_CHAN );

irc.h

@@ -237 +237 @@
 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_auto_joins( irc_t *irc, struct account *acc );
 void irc_channel_printf( irc_channel_t *ic, char *format, ... );
 gboolean irc_channel_name_ok( const char *name );

irc_channel.c

@@ -48 +48 @@
         irc->channels = g_slist_append( irc->channels, ic );
         
+        set_add( &ic->set, "auto_join", "false", set_eval_bool, ic );
         set_add( &ic->set, "type", "control", set_eval_channel_type, ic );
         
@@ -309 +310 @@
 }
 
+void irc_channel_auto_joins( irc_t *irc, account_t *acc )
+{
+        GSList *l;
+        
+        for( l = irc->channels; l; l = l->next )
+        {
+                irc_channel_t *ic = l->data;
+                gboolean aj = set_getbool( &ic->set, "auto_join" );
+                char *type;
+                
+                if( acc &&
+                    ( type = set_getstr( &ic->set, "chat_type" ) ) &&
+                    strcmp( type, "room" ) == 0 )
+                {
+                        /* Bit of an ugly special case: Handle chatrooms here, we
+                           can only auto-join them if their account is online. */
+                        char *acc_s;
+                        
+                        if( !aj && !( ic->flags & IRC_CHANNEL_JOINED ) )
+                                /* Only continue if this one's marked as auto_join
+                                   or if we're in it already. (Possible if the
+                                   client auto-rejoined it before identyfing.) */
+                                continue;
+                        else if( !( acc_s = set_getstr( &ic->set, "account" ) ) )
+                                continue;
+                        else if( account_get( irc->b, acc_s ) != acc )
+                                continue;
+                        else if( acc->ic == NULL || !( acc->ic->flags & OPT_LOGGED_IN ) )
+                                continue;
+                        else
+                                ic->f->join( ic );
+                }
+                else if( aj )
+                {
+                        irc_channel_add_user( ic, irc->user );
+                }
+        }
+}
+
 void irc_channel_printf( irc_channel_t *ic, char *format, ... )
 {
@@ -521 +561 @@
                 bee_irc_channel_update( ic->irc, ic, NULL );
         }
+        
+        return TRUE;
+}
+
+static gboolean control_channel_join( irc_channel_t *ic )
+{
+        bee_irc_channel_update( ic->irc, ic, NULL );
         
         return TRUE;
@@ -608 +655 @@
 static const struct irc_channel_funcs control_channel_funcs = {
         control_channel_privmsg,
-        NULL,
+        control_channel_join,
         NULL,
         NULL,

root_commands.c

@@ -157 +157 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
+                irc_channel_auto_joins( irc, NULL );
                 if( load && set_getbool( &irc->b->set, "auto_connect" ) )
                         cmd_account( irc, account_on );