Changeset bb151f7

Timestamp:

2010-11-20T20:25:44Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

748bcdd

Parents:

d68365c

Message:

Added irc_channel_with_user() function to find a suitable channel to show
a user's message in, instead of just &bitlbee by default.

Files:

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

irc.h

@@ -287 +287 @@
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, irc_channel_del_user_type_t type, const char *msg );
 irc_channel_user_t *irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu );
+struct irc_channel *irc_channel_with_user( irc_t *irc, 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 );

irc_channel.c

@@ -287 +287 @@
                 if( icu->iu == iu )
                         return icu;
+        }
+        
+        return NULL;
+}
+
+/* Find a channel we're currently in, that currently has iu in it. */
+struct irc_channel *irc_channel_with_user( irc_t *irc, irc_user_t *iu )
+{
+        GSList *l;
+        
+        for( l = irc->channels; l; l = l->next )
+        {
+                irc_channel_t *ic = l->data;
+                
+                if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 )
+                        continue;
+                
+                if( ( ic->flags & IRC_CHANNEL_JOINED ) &&
+                    irc_channel_has_user( ic, iu ) )
+                        return ic;
+        }
+        
+        /* If there was no match, try once more but just see if the user
+           *would* be in the channel, i.e. if s/he were online. */
+        if( iu->bu == NULL )
+                return NULL;
+        
+        for( l = irc->channels; l; l = l->next )
+        {
+                irc_channel_t *ic = l->data;
+                
+                if( strcmp( set_getstr( &ic->set, "type" ), "control" ) != 0 )
+                        continue;
+                
+                if( ( ic->flags & IRC_CHANNEL_JOINED ) &&
+                    irc_channel_wants_user( ic, iu ) )
+                        return ic;
         }
         

irc_im.c

@@ -54 +54 @@
         bu->ui_data = iu = irc_user_new( irc, nick );
         iu->bu = bu;
+        
+        if( set_getbool( &irc->b->set, "private" ) )
+                iu->last_channel = NULL;
+        else
+                iu->last_channel = irc_channel_with_user( irc, iu );
         
         if( ( s = strchr( bu->handle, '@' ) ) )
@@ -210 +215 @@
                 if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
                         ic = iu->last_channel;
-                else if( irc->default_channel->flags & IRC_CHANNEL_JOINED )
-                        ic = irc->default_channel;
+                else
+                        ic = irc_channel_with_user( irc, iu );
         }
         

irc_send.c

@@ -127 +127 @@
                 if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
                         ic = iu->last_channel;
-                else if( irc->default_channel->flags & IRC_CHANNEL_JOINED )
-                        ic = irc->default_channel;
+                else
+                        ic = irc_channel_with_user( irc, irc->root );
         }
         

irc_user.c

@@ -34 +34 @@
         iu->nick = g_strdup( nick );
         iu->user = iu->host = iu->fullname = iu->nick;
-        
-        if( set_getbool( &irc->b->set, "private" ) )
-                iu->last_channel = NULL;
-        else
-                iu->last_channel = irc->default_channel;
         
         iu->key = g_strdup( nick );