Changeset 934db064 for irc_im.c

Timestamp:

2010-09-01T22:09:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2dcaf9a

Parents:

0c85c08

Message:

Do encryption and decryption. Somehow SMP and other things aren't working
so well yet, at least when testing with Pidgin on the other side. Not sure
where the bug is.

File:

• irc_im.c (modified) (7 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" ) )
@@ -224 +226 @@
         }
         
+        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 );
@@ -229 +260 @@
         g_free( wrapped );
         g_free( prefix );
+        g_free( msg );
         g_free( ts );
         
@@ -349 +381 @@
         }
         
+        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 )
@@ -369 +401 @@
         }
         else
-                return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
+        {
+                bee_irc_user_privmsg_cb( iu, 0, 0 );
+                
+                return TRUE;
+        }
 }
 
@@ -375 +411 @@
 {
         irc_user_t *iu = data;
-        
-        bee_user_msg( iu->irc->b, iu->bu, iu->pastebuf->str, 0 );
-        
-        g_string_free( iu->pastebuf, TRUE );
-        iu->pastebuf = 0;
+        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;
         iu->pastebuf_timer = 0;