Changes in irc_im.c [934db064:d6657ce]

File:

• irc_im.c (modified) (10 diffs)

irc_im.c

@@ -192 +192 @@
 }
 
-static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at )
+static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at )
 {
         irc_t *irc = bee->ui_data;
@@ -199 +199 @@
         char *wrapped, *ts = NULL;
         irc_channel_t *ic = NULL;
-        char *msg = g_strdup( msg_ );
-        GSList *l;
         
         if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
@@ -226 +224 @@
         }
         
-        for( l = irc_plugins; l; l = l->next )
-        {
-                irc_plugin_t *p = l->data;
-                if( p->filter_msg_in )
-                {
-                        char *s = p->filter_msg_in( iu, msg, 0 );
-                        if( s )
-                        {
-                                if( s != msg )
-                                        g_free( msg );
-                                msg = s;
-                        }
-                        else
-                        {
-                                /* Modules can swallow messages. */
-                                return TRUE;
-                        }
-                }
-        }
-        
-        if( ( g_strcasecmp( set_getstr( &bee->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( bu->ic->flags & OPT_DOES_HTML ) && set_getbool( &bee->set, "strip_html" ) ) )
-        {
-                char *s = g_strdup( msg );
-                strip_html( s );
-                g_free( msg );
-                msg = s;
-        }
-        
         wrapped = word_wrap( msg, 425 );
         irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
@@ -260 +229 @@
         g_free( wrapped );
         g_free( prefix );
-        g_free( msg );
         g_free( ts );
         
@@ -381 +349 @@
         }
         
-        if( iu->pastebuf == NULL )
-                iu->pastebuf = g_string_new( msg );
-        else
-        {
-                b_event_remove( iu->pastebuf_timer );
-                g_string_append_printf( iu->pastebuf, "\n%s", msg );
-        }
-        
         if( set_getbool( &iu->irc->b->set, "paste_buffer" ) )
         {
                 int delay;
+                
+                if( iu->pastebuf == NULL )
+                        iu->pastebuf = g_string_new( msg );
+                else
+                {
+                        b_event_remove( iu->pastebuf_timer );
+                        g_string_append_printf( iu->pastebuf, "\n%s", msg );
+                }
                 
                 if( ( delay = set_getint( &iu->irc->b->set, "paste_buffer_delay" ) ) <= 5 )
@@ -401 +369 @@
         }
         else
-        {
-                bee_irc_user_privmsg_cb( iu, 0, 0 );
-                
-                return TRUE;
-        }
+                return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
 }
 
@@ -411 +375 @@
 {
         irc_user_t *iu = data;
-        char *msg = g_string_free( iu->pastebuf, FALSE );
-        GSList *l;
-        
-        for( l = irc_plugins; l; l = l->next )
-        {
-                irc_plugin_t *p = l->data;
-                if( p->filter_msg_out )
-                {
-                        char *s = p->filter_msg_out( iu, msg, 0 );
-                        if( s )
-                        {
-                                if( s != msg )
-                                        g_free( msg );
-                                msg = s;
-                        }
-                        else
-                        {
-                                /* Modules can swallow messages. */
-                                iu->pastebuf = NULL;
-                                g_free( msg );
-                                return FALSE;
-                        }
-                }
-        }
-        
-        bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
-        
-        g_free( msg );
-        iu->pastebuf = NULL;
+        
+        bee_user_msg( iu->irc->b, iu->bu, iu->pastebuf->str, 0 );
+        
+        g_string_free( iu->pastebuf, TRUE );
+        iu->pastebuf = 0;
         iu->pastebuf_timer = 0;
         
@@ -590 +530 @@
         irc_channel_t *ic = c->ui_data;
         
-        if( ic == NULL )
+        if( ic == NULL || bu == NULL )
                 return FALSE;
         
@@ -753 +693 @@
                 {
                         *s = '\0';
-                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) &&
+                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) && iu->bu &&
                             iu->bu->nick && irc_channel_has_user( ic, iu ) )
                         {
@@ -858 +798 @@
                 c->ic->acc->prpl->chat_topic( c, topic );
                 g_free( topic );
-                return TRUE;
-        }
-                
+        }
+                
+        /* Whatever happened, the IM module should ack the topic change. */
         return FALSE;
 }