Changeset 0b5cc72

Timestamp:

2010-04-05T00:39:04Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

57c96f7

Parents:

1d39159

Message:

Send nickname change notifications when necessary.

Files:

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

irc.h

@@ -179 +179 @@
 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 );
 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 );
@@ -198 +199 @@
 void irc_send_msg( irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix );
 void irc_send_msg_raw( irc_user_t *iu, const char *type, const char *dst, const char *msg );
+void irc_send_nick( irc_user_t *iu, const char *new );
 
 /* irc_user.c */
@@ -203 +205 @@
 int irc_user_free( irc_t *irc, const char *nick );
 irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
-int irc_user_rename( irc_t *irc, const char *old, const char *new );
+int irc_user_set_nick( irc_t *irc, const char *old, const char *new );
 gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
 

irc_channel.c

@@ -82 +82 @@
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu )
 {
-        if( g_slist_find( ic->users, iu ) != NULL )
+        if( !irc_channel_has_user( ic, iu ) )
                 return 0;
         
@@ -98 +98 @@
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu )
 {
-        if( g_slist_find( ic->users, iu ) == NULL )
+        if( !irc_channel_has_user( ic, iu ) )
                 return 0;
         
@@ -110 +110 @@
         
         return 1;
+}
+
+/* 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_send.c

@@ -311 +311 @@
                    iu->nick, iu->user, iu->host, type, dst, msg );
 }
+
+void irc_send_nick( irc_user_t *iu, const char *new )
+{
+        irc_write( iu->irc, ":%s!%s@%s NICK %s",
+                   iu->nick, iu->user, iu->host, new );
+}

irc_user.c

@@ -83 +83 @@
 }
 
-int irc_user_rename( irc_t *irc, const char *old, const char *new )
+int irc_user_set_nick( irc_t *irc, const char *old, const char *new )
 {
         irc_user_t *iu = irc_user_by_name( irc, old );
         char key[strlen(new)+1];
+        GSList *cl;
         
         strcpy( key, new );
         if( iu == NULL || !nick_lc( key ) || irc_user_by_name( irc, new ) )
                 return 0;
+        
+        for( cl = irc->channels; cl; cl = cl->next )
+        {
+                irc_channel_t *ic = cl->data;
+                
+                /* Send a NICK update if we're renaming our user, or someone
+                   who's in the same channel like our user. */
+                if( iu == irc->user ||
+                    ( irc_channel_has_user( ic, irc->user ) &&
+                      irc_channel_has_user( ic, iu ) ) )
+                {
+                        irc_send_nick( iu, new );
+                        break;
+                }
+        }
         
         irc->users = g_slist_remove( irc->users, iu );