Changeset bce78c8

Timestamp:

2010-05-02T18:48:26Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e54112f

Parents:

a4cdf43

Message:

Restored classical control channel behaviour (the ability to talk to
contacts in there).

Files:

• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (1 diff)

irc_channel.c

@@ -145 +145 @@
 static gboolean control_channel_privmsg( irc_channel_t *ic, const char *msg )
 {
-        char cmd[strlen(msg)+1];
+        irc_t *irc = ic->irc;
+        const char *s;
         
-        g_free( ic->irc->last_root_cmd );
-        ic->irc->last_root_cmd = g_strdup( ic->name );
+        /* Scan for non-whitespace chars followed by a colon: */
+        for( s = msg; *s && !isspace( *s ) && *s != ':'; s ++ ) {}
         
-        strcpy( cmd, msg );
-        root_command_string( ic->irc, cmd );
+        if( *s == ':' )
+        {
+                char to[s-msg+1];
+                irc_user_t *iu;
+                
+                strncpy( to, msg, s - msg );
+                while( *(++s) && isspace( *s ) ) {}
+                
+                iu = irc_user_by_name( irc, to );
+                if( iu && iu->f->privmsg )
+                {
+                        iu->flags &= ~IRC_USER_PRIVATE;
+                        iu->f->privmsg( iu, s );
+                }
+        }
+        else
+        {
+                /* TODO: Maybe just use root->privmsg here now? */
+                char cmd[strlen(msg)+1];
+                
+                g_free( ic->irc->last_root_cmd );
+                ic->irc->last_root_cmd = g_strdup( ic->name );
+                
+                strcpy( cmd, msg );
+                root_command_string( ic->irc, cmd );
+        }
         
         return TRUE;

irc_commands.c

@@ -288 +288 @@
                 }
                 else if( iu->f->privmsg )
+                {
+                        iu->flags |= IRC_USER_PRIVATE;
                         iu->f->privmsg( iu, cmd[2] );
+                }
         }
         else

irc_im.c

@@ -126 +126 @@
         {
                 dst = ic->name;
-                prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts );
+                prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }