Changeset e54112f

Timestamp:

2010-05-02T23:44:33Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6a9d068

Parents:

bce78c8

Message:

Put a channel userlist in irc_channel_user elements so we can save flags
(i.e. modes).

Files:

• irc.h (modified) (2 diffs)
• irc_channel.c (modified) (6 diffs)
• irc_send.c (modified) (2 diffs)

irc.h

@@ -153 +153 @@
 };
 
+typedef enum
+{
+        IRC_CHANNEL_USER_OP = 1,
+        IRC_CHANNEL_USER_HALFOP = 2,
+        IRC_CHANNEL_USER_VOICE = 4,
+} irc_channel_user_flags_t;
+
+typedef struct irc_channel_user
+{
+        irc_user_t *iu;
+        int flags;
+} irc_channel_user_t;
+
 extern const struct bee_ui_funcs irc_ui_funcs;
 
@@ -181 +194 @@
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu );
-gboolean irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu );
+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 );
 gboolean irc_channel_name_ok( const char *name );

irc_channel.c

@@ -26 +26 @@
 #include "bitlbee.h"
 
+static gint irc_channel_user_cmp( gconstpointer a_, gconstpointer b_ );
 static const struct irc_channel_funcs control_channel_funcs;
 
@@ -71 +72 @@
         
         irc->channels = g_slist_remove( irc->channels, ic );
-        g_slist_free( ic->users );
+        while( ic->users )
+        {
+                g_free( ic->users->data );
+                ic->users = g_slist_remove( ic->users, ic->users->data );
+        }
         
         g_free( ic->name );
@@ -82 +87 @@
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu )
 {
+        irc_channel_user_t *icu;
+        
         if( irc_channel_has_user( ic, iu ) )
                 return 0;
         
-        ic->users = g_slist_insert_sorted( ic->users, iu, irc_user_cmp );
+        icu = g_new0( irc_channel_user_t, 1 );
+        icu->iu = iu;
+        
+        ic->users = g_slist_insert_sorted( ic->users, icu, irc_channel_user_cmp );
         
         if( iu == ic->irc->user || ic->flags & IRC_CHANNEL_JOINED )
@@ -98 +108 @@
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu )
 {
-        if( !irc_channel_has_user( ic, iu ) )
+        irc_channel_user_t *icu;
+        
+        if( !( icu = irc_channel_has_user( ic, iu ) ) )
                 return 0;
         
-        ic->users = g_slist_remove( ic->users, iu );
+        ic->users = g_slist_remove( ic->users, icu );
+        g_free( icu );
         
         if( ic->flags & IRC_CHANNEL_JOINED )
@@ -112 +125 @@
 }
 
-/* Currently a fairly stupid one-liner but I fear it's going to get worse. :-) */
-gboolean irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu )
-{
-        return g_slist_find( ic->users, iu ) != NULL;
+irc_channel_user_t *irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu )
+{
+        GSList *l;
+        
+        for( l = ic->users; l; l = l->next )
+        {
+                irc_channel_user_t *icu = l->data;
+                
+                if( icu->iu == iu )
+                        return icu;
+        }
+        
+        return NULL;
 }
 
@@ -140 +162 @@
 {
         return strchr( CTYPES, name[0] ) != NULL && nick_ok( name + 1 );
+}
+
+static gint irc_channel_user_cmp( gconstpointer a_, gconstpointer b_ )
+{
+        const irc_channel_user_t *a = a_, *b = b_;
+        
+        return irc_user_cmp( a->iu, b->iu );
 }
 

irc_send.c

@@ -163 +163 @@
         for( l = ic->users; l; l = l->next )
         {
-                irc_user_t *iu = l->data;
+                irc_channel_user_t *icu = l->data;
+                irc_user_t *iu = icu->iu;
                 
                 if( strlen( namelist ) + strlen( iu->nick ) > sizeof( namelist ) - 4 )
@@ -243 +244 @@
 void irc_send_who( irc_t *irc, GSList *l, const char *channel )
 {
+        gboolean is_channel = strcmp( channel, "**" ) != 0;
+        
         while( l )
         {
                 irc_user_t *iu = l->data;
+                if( is_channel )
+                        iu = ((irc_channel_user_t*)iu)->iu;
                 /* TODO(wilmer): Restore away/channel information here */
                 irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s",