Changeset 13c1a9f

Timestamp:

2010-05-09T21:52:17Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4e608d6

Parents:

3130e70

Message:

/join &groupname and all people in that group will be in that channel.

Files:

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

irc.h

@@ -261 +261 @@
 char *irc_format_timestamp( irc_t *irc, time_t msg_ts );
 
+/* irc_im.c */
+void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu );
+
 #endif

irc_channel.c

@@ -263 +263 @@
         icc->type = IRC_CC_TYPE_DEFAULT;
         
+        if( ( icc->group = bee_group_by_name( ic->irc->b, ic->name + 1, FALSE ) ) )
+                icc->type = IRC_CC_TYPE_GROUP;
+        
+        bee_irc_channel_update( ic->irc, ic, NULL );
+        
         return TRUE;
 }

irc_im.c

@@ -81 +81 @@
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = bu->ui_data;
-        irc_channel_t *ic = irc->default_channel;
         
         /* Do this outside the if below since away state can change without
@@ -96 +95 @@
                                 irc_send_num( irc, 600, "%s %s %s %d :%s", iu->nick, iu->user,
                                               iu->host, (int) time( NULL ), "logged online" );
-                        
-                        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
@@ -108 +101 @@
                                 irc_send_num( irc, 601, "%s %s %s %d :%s", iu->nick, iu->user,
                                               iu->host, (int) time( NULL ), "logged offline" );
-                        
-                        irc_channel_del_user( ic, iu );
-                }
-        }
-        
-        return TRUE;
+                }
+        }
+        
+        bee_irc_channel_update( irc, NULL, iu );
+        
+        return TRUE;
+}
+
+void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu )
+{
+        struct irc_control_channel *icc;
+        GSList *l;
+        gboolean show;
+        
+        if( ic == NULL )
+        {
+                for( l = irc->channels; l; l = l->next )
+                {
+                        ic = l->data;
+                        /* TODO: Just add a type flag or so.. */
+                        if( ic->f == irc->default_channel->f )
+                                bee_irc_channel_update( irc, ic, iu );
+                }
+                return;
+        }
+        if( iu == NULL )
+        {
+                for( l = irc->users; l; l = l->next )
+                {
+                        iu = l->data;
+                        if( iu->bu )
+                                bee_irc_channel_update( irc, ic, l->data );
+                }
+                return;
+        }
+        
+        icc = ic->data;
+        
+        if( !( iu->bu->flags & BEE_USER_ONLINE ) )
+                show = FALSE;
+        else if( icc->type == IRC_CC_TYPE_DEFAULT )
+                show = TRUE;
+        else if( icc->type == IRC_CC_TYPE_GROUP )
+                show = iu->bu->group == icc->group;
+        
+        if( !show )
+        {
+                irc_channel_del_user( ic, iu );
+        }
+        else
+        {
+                irc_channel_add_user( ic, iu );
+                
+                if( set_getbool( &irc->b->set, "away_devoice" ) )
+                        irc_channel_user_set_mode( ic, iu, ( iu->bu->flags & BEE_USER_AWAY ) ?
+                                                   0 : IRC_CHANNEL_USER_VOICE );
+        }
 }