Changeset 1f0224c

Timestamp:

2010-06-06T01:11:13Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

88eaf4b

Parents:

18da20b

Message:

Send one /QUIT instead of one or more /PARTs for a user that is being
removed. Also restored netsplit simulation.

Files:

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

irc.h

@@ -239 +239 @@
 void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
 void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );
+void irc_send_quit( irc_user_t *iu, const char *reason );
 void irc_send_names( irc_channel_t *ic );
 void irc_send_topic( irc_channel_t *ic, gboolean topic_change );

irc_send.c

@@ -153 +153 @@
 }
 
+void irc_send_quit( irc_user_t *iu, const char *reason )
+{
+        irc_write( iu->irc, ":%s!%s@%s QUIT :%s", iu->nick, iu->user, iu->host, reason ? : "" );
+}
+
 void irc_send_names( irc_channel_t *ic )
 {

irc_user.c

@@ -50 +50 @@
 {
         GSList *l;
+        gboolean send_quit = FALSE;
         
         if( !iu )
@@ -58 +59 @@
         
         for( l = irc->channels; l; l = l->next )
-                irc_channel_del_user( (irc_channel_t*) l->data, iu, FALSE, NULL );
+                send_quit |= irc_channel_del_user( (irc_channel_t*) l->data, iu, TRUE, NULL );
+        
+        if( send_quit )
+        {
+                static struct im_connection *last_ic;
+                static char *msg;
+                
+                if( iu->bu &&
+                    ( iu->bu->ic->flags & OPT_LOGGING_OUT ) &&
+                    iu->bu->ic != last_ic )
+                {
+                        char host_prefix[] = "bitlbee.";
+                        char *s;
+                        
+                        /* Irssi recognises netsplits by quitmsgs with two
+                           hostnames, where a hostname is a "word" with one
+                           of more dots. Mangle no-dot hostnames a bit. */
+                        if( strchr( irc->root->host, '.' ) )
+                                *host_prefix = '\0';
+                        
+                        last_ic = iu->bu->ic;
+                        g_free( msg );
+                        if( !set_getbool( &irc->b->set, "simulate_netsplit" ) )
+                                msg = g_strdup( "Account off-line" );
+                        else if( ( s = strchr( iu->bu->ic->acc->user, '@' ) ) )
+                                msg = g_strdup_printf( "%s%s %s", host_prefix,
+                                        irc->root->host, s + 1 );
+                        else
+                                msg = g_strdup_printf( "%s%s %s.%s",
+                                        host_prefix, irc->root->host,
+                                        iu->bu->ic->acc->prpl->name, irc->root->host );
+                }
+                else if( !iu->bu || !( iu->bu->ic->flags & OPT_LOGGING_OUT ) )
+                {
+                        g_free( msg );
+                        msg = g_strdup( "Removed" );
+                        last_ic = NULL;
+                }
+                irc_send_quit( iu, msg );
+        }
         
         g_free( iu->nick );