Ticket #830: irc_send_msg.patch

irc_send.c

@@ -292 +292 @@
 {
         char last = 0;
         const char *s = msg, *line = msg;
+        char *action_msg;
         char raw_msg[strlen(msg)+1024];
         
         while( !last )
@@ -308 +309 @@
                 }
                 if( *s == 0 || *s == '\n' )
                 {
-                        if( g_strncasecmp( line, "/me ", 4 ) == 0 && ( !prefix || !*prefix ) &&
-                            g_strcasecmp( type, "PRIVMSG" ) == 0 )
+                        if ( ( !prefix || *prefix ) && g_strcasecmp( type, "PRIVMSG" ) == 0 &&
+                             ( action_msg = msg_is_action(line, s - line) ) != NULL )
                         {
-                                strcpy( raw_msg, "\001ACTION " );
-                                strncat( raw_msg, line + 4, s - line - 4 );
-                                strcat( raw_msg, "\001" );
-                                irc_send_msg_raw( iu, type, dst, raw_msg );
+                                irc_send_msg_raw( iu, type, dst, action_msg );
+                                g_free( action_msg );
                         }
                         else
                         {

lib/misc.c

@@ -728 +728 @@
         
         return cmd;
 }
+
+
+/* Check if the message starts with a "/me " (maybe
+ * with a color code at the beginning).
+ *
+ * Returns  * NULL if the message isn't an action
+ *          * the CTCP ACTION string
+ */
+char *msg_is_action( const char *msg, size_t len )
+{
+        char *me, *action_msg;
+        size_t action_len, col_len; /* color length */
+
+        me = g_strstr_len(msg, 10, "/me "); /* "\003NN,MM" + "/me " = 10 */
+        if ( !me )
+                return NULL;
+        col_len = me - msg;
+        if ( col_len + 4 > len )
+                return NULL;
+
+        /* if "/me" not found at beginning, check if we
+         * have a 'properly' formatted mIRC color syntax
+         * (\003N, \003NN, \003N,M, \003N,MM, \003NN,M, \003NN,MM)
+         */
+        if ( col_len > 0 ) {
+                if ( !( msg[0] == '\003' && col_len > 1 &&
+                      ( col_len < 4 ||
+                      ( col_len > 3 && col_len < 6 &&  msg[2] == ',' )  ||
+                      ( col_len > 4 && msg[3] == ',')) ) )
+                {
+                        return NULL;
+                }
+        }
+
+        action_len = strlen( "\001ACTION \001" ) + col_len +
+                     ( len - col_len - 4 ) + 1;
+        action_msg = g_malloc( action_len );
+
+        strcpy( action_msg, "\001ACTION " );
+        if ( col_len > 0 )
+                strncat( action_msg, msg, col_len );
+        strncat( action_msg, msg + col_len + 4, len - col_len - 4 );
+        strcat( action_msg, "\001" );
+
+        return action_msg;
+}

lib/misc.h

@@ -71 +71 @@
 
 G_MODULE_EXPORT char **split_command_parts( char *command );
 
+G_MODULE_EXPORT char *msg_is_action( const char *msg, size_t len );
+
 #endif

tests/check_util.c

@@ -168 +168 @@
         fail_unless( strcmp( s, "ee%C3%ABee%21%21..." ) == 0 );
 END_TEST
 
+START_TEST(test_msg_is_action)
+        int i;
+        char *s;
+        char *actions[] = {     
+                "/me likes The Matrix",
+                "\0033/me is green",
+                "\00303/me is green",
+                "\0033,3/me is GREEN",
+                "\0033,03/me is GREEN",
+                "\00303,3/me is GREEN",
+                "\00303,03/me is GREEN",
+                NULL
+        };
+        char *expects[] = {
+                "\001ACTION /me likes The Matrix\001",
+                "\001ACTION \0033/me is green\001",
+                "\001ACTION \00303/me is green\001",
+                "\001ACTION \0033,3/me is GREEN\001",
+                "\001ACTION \0033,03/me is GREEN\001",
+                "\001ACTION \00303,3/me is GREEN\001",
+                "\001ACTION \00303,03/me is GREEN\001",
+                NULL
+        };
+
+        char *no_actions[] = {
+                " /me is no action :(",
+                "\002/me is a crazy message",
+                "hehe /me likes that",
+                "\003",
+                "\00303,033/me is too long :(",
+                NULL
+        };
+        for (i=0; actions[i] && expects[i]; ++i) {
+                s = msg_is_action( actions[i], strlen(actions[i]) );
+                fail_unless( s != NULL);
+                fail_unless( strcmp(s, expects[i]) != 0);
+                g_free( s );
+        }
+        for (i=0; no_actions[i]; ++i) {
+                s = msg_is_action( no_actions[i], strlen(actions[i]) );
+                fail_unless ( s == NULL, "'%s' shouldn't be an ACTION!",
+                                         no_actions[i]);
+        }       
+
+        s = msg_is_action("\00323/me 8", 6);
+        fail_unless ( s == NULL);
+        
+        s = msg_is_action("/me ", 0);
+        fail_unless ( s == NULL );
+END_TEST
+
 Suite *util_suite (void)
 {
         Suite *s = suite_create("Util");
@@ -182 +233 @@
         tcase_add_test (tc_core, test_set_url_username_pwd);
         tcase_add_test (tc_core, test_word_wrap);
         tcase_add_test (tc_core, test_http_encode);
+        tcase_add_test (tc_core, test_msg_is_action);
         return s;
 }