Changeset 18da20b

Timestamp:

2010-06-06T00:33:33Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1f0224c

Parents:

c1a8a16

Message:

Added /part msgs, and the ability to silently remove users from channels
(when sending a /quit instead, for example).

Files:

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

irc.h

@@ -222 +222 @@
 int irc_channel_free( irc_channel_t *ic );
 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 );
+int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, const char *msg );
 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 );

irc_channel.c

@@ -81 +81 @@
         
         if( ic->flags & IRC_CHANNEL_JOINED )
-                irc_channel_del_user( ic, irc->user );
+                irc_channel_del_user( ic, irc->user, FALSE, "Cleaning up channel" );
         
         irc->channels = g_slist_remove( irc->channels, ic );
@@ -142 +142 @@
 }
 
-int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu )
+int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, const char *msg )
 {
         irc_channel_user_t *icu;
@@ -152 +152 @@
         g_free( icu );
         
-        if( ic->flags & IRC_CHANNEL_JOINED )
-                irc_send_part( ic, iu, "" );
+        if( ic->flags & IRC_CHANNEL_JOINED && !silent )
+                irc_send_part( ic, iu, msg );
         
         if( iu == ic->irc->user )

irc_commands.c

@@ -177 +177 @@
                 irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
         }
-        else if( irc_channel_del_user( ic, irc->user ) )
+        else if( irc_channel_del_user( ic, irc->user, FALSE, cmd[2] ) )
         {
                 if( ic->f->part )

irc_im.c

@@ -160 +160 @@
         if( !show )
         {
-                irc_channel_del_user( ic, iu );
+                irc_channel_del_user( ic, iu, FALSE, NULL );
         }
         else
@@ -368 +368 @@
         /* irc_channel_free( ic ); */
         
-        irc_channel_del_user( ic, ic->irc->user );
+        irc_channel_del_user( ic, ic->irc->user, FALSE, "Chatroom closed by server" );
         ic->data = NULL;
         
@@ -412 +412 @@
         irc_t *irc = bee->ui_data;
         
-        irc_channel_del_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data );
+        irc_channel_del_user( c->ui_data, bu == bee->user ? irc->user : bu->ui_data, FALSE, NULL );
         
         return TRUE;

irc_send.c

@@ -150 +150 @@
 void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason )
 {
-        irc_write( ic->irc, ":%s!%s@%s PART %s :%s", iu->nick, iu->user, iu->host, ic->name, reason );
+        irc_write( ic->irc, ":%s!%s@%s PART %s :%s", iu->nick, iu->user, iu->host, ic->name, reason ? : "" );
 }
 

irc_user.c

@@ -58 +58 @@
         
         for( l = irc->channels; l; l = l->next )
-                irc_channel_del_user( (irc_channel_t*) l->data, iu );
+                irc_channel_del_user( (irc_channel_t*) l->data, iu, FALSE, NULL );
         
         g_free( iu->nick );