Changeset f7ca587

Timestamp:

2010-07-29T18:18:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1521a85

Parents:

2fe5eb9

Message:

Restore default_target setting, kill last_root_cmd variable and just use
the last_channel variable, like for any other user.

Files:

• irc.c (modified) (2 diffs)
• irc.h (modified) (2 diffs)
• irc_channel.c (modified) (2 diffs)
• irc_im.c (modified) (1 diff)
• irc_send.c (modified) (2 diffs)
• irc_user.c (modified) (1 diff)
• root_commands.c (modified) (2 diffs)

irc.c

@@ -244 +244 @@
         g_free( irc->readbuffer );
         g_free( irc->password );
-        g_free( irc->last_root_cmd );
         
         g_free( irc );
@@ -729 +728 @@
                         irc_channel_auto_joins( irc, NULL );
                         
-                        irc->last_root_cmd = g_strdup( ROOT_CHAN );
-                        
-                        irc_send_msg( irc->root, "PRIVMSG", ROOT_CHAN,
-                                      "Welcome to the BitlBee gateway!\n\n"
-                                      "If you've never used BitlBee before, please do read the help "
-                                      "information using the \x02help\x02 command. Lots of FAQs are "
-                                      "answered there.\n"
-                                      "If you already have an account on this server, just use the "
-                                      "\x02identify\x02 command to identify yourself.", NULL );
+                        irc->root->last_channel = irc->default_channel;
+                        
+                        irc_usermsg( irc,
+                                     "Welcome to the BitlBee gateway!\n\n"
+                                     "If you've never used BitlBee before, please do read the help "
+                                     "information using the \x02help\x02 command. Lots of FAQs are "
+                                     "answered there.\n"
+                                     "If you already have an account on this server, just use the "
+                                     "\x02identify\x02 command to identify yourself." );
                         
                         /* This is for bug #209 (use PASS to identify to NickServ). */

irc.h

@@ -67 +67 @@
         struct irc_user *user;
         
-        char *last_root_cmd; /* Either the nickname from which the last root
-                                msg came, or the last channel root was talked
-                                to. */
-
         char *password; /* HACK: Used to save the user's password, but before
                            logging in, this may contain a password we should
@@ -155 +151 @@
         
         GSList *users; /* struct irc_channel_user */
+        struct irc_user *last_target;
         struct set *set;
         

irc_channel.c

@@ -481 +481 @@
 {
         irc_t *irc = ic->irc;
+        irc_user_t *iu;
         const char *s;
         
@@ -489 +490 @@
         {
                 char to[s-msg+1];
-                irc_user_t *iu;
                 
                 memset( to, 0, sizeof( to ) );
                 strncpy( to, msg, s - msg );
                 while( *(++s) && isspace( *s ) ) {}
-                
-                iu = irc_user_by_name( irc, to );
-                if( iu && iu->f->privmsg )
-                {
-                        iu->last_channel = ic;
-                        iu->f->privmsg( iu, s );
-                }
+                msg = s;
+                
+                if( !( iu = irc_user_by_name( irc, to ) ) )
+                        irc_channel_printf( ic, "User does not exist: %s", to );
                 else
-                {
-                        irc_channel_printf( ic, "User does not exist: %s", to );
-                }
-        }
+                        ic->last_target = iu;
+        }
+        else if( g_strcasecmp( set_getstr( &irc->b->set, "default_target" ), "last" ) == 0 &&
+                 ic->last_target && g_slist_find( irc->users, ic->last_target ) )
+                iu = ic->last_target;
         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 );
+                iu = irc->root;
+        
+        if( iu && iu->f->privmsg )
+        {
+                iu->last_channel = ic;
+                iu->f->privmsg( iu, msg );
         }
         

irc_im.c

@@ -215 +215 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
+        /* Too similar to irc_usermsg()... */
         if( iu->last_channel )
         {

irc_send.c

@@ -104 +104 @@
 void irc_usermsg( irc_t *irc, char *format, ... )
 {
-        irc_channel_t *ic;
-        irc_user_t *iu;
+        irc_channel_t *ic = NULL;
+        irc_user_t *iu = irc->root;
         char text[1024];
         va_list params;
+        char *dst;
         
         va_start( params, format );
@@ -113 +114 @@
         va_end( params );
         
-        if( irc->last_root_cmd &&
-            irc_channel_name_ok( irc->last_root_cmd ) && 
-            ( ic = irc_channel_by_name( irc, irc->last_root_cmd ) ) &&
-            ic->flags & IRC_CHANNEL_JOINED )
-                irc_send_msg( irc->root, "PRIVMSG", irc->last_root_cmd, text, NULL );
-        else if( irc->last_root_cmd &&
-                 ( iu = irc_user_by_name( irc, irc->last_root_cmd ) ) &&
-                 iu->f == &irc_user_root_funcs )
-                irc_send_msg( iu, "PRIVMSG", irc->user->nick, text, NULL );
-        else
-        {
-                g_free( irc->last_root_cmd );
-                irc->last_root_cmd = NULL;
-                
-                irc_send_msg( irc->root, "PRIVMSG", irc->user->nick, text, NULL );
-        }
-        
-        /*return( irc_msgfrom( irc, u->nick, text ) );*/
+        /* Too similar to bee_irc_user_msg()... */
+        if( iu->last_channel )
+        {
+                if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
+                        ic = iu->last_channel;
+                else if( irc->default_channel->flags & IRC_CHANNEL_JOINED )
+                        ic = irc->default_channel;
+        }
+        
+        if( ic )
+                dst = ic->name;
+        else
+                dst = irc->user->nick;
+        
+        irc_send_msg( irc->root, "PRIVMSG", dst, text, NULL );
 }
 

irc_user.c

@@ -222 +222 @@
         char cmd[strlen(msg)+1];
         
-        g_free( iu->irc->last_root_cmd );
-        iu->irc->last_root_cmd = g_strdup( iu->nick );
-        
         strcpy( cmd, msg );
         root_command_string( iu->irc, cmd );

root_commands.c

@@ -560 +560 @@
                 /* If this doesn't match any channel, maybe this is the short
                    syntax (only works when used inside a channel). */
-                if( ( len = strlen( cmd[1] ) ) &&
-                    g_strncasecmp( cmd[1], "set", len ) == 0 &&
-                    ( ic = irc_channel_by_name( irc, irc->last_root_cmd ) ) )
+                if( ( ic = irc->root->last_channel ) &&
+                    ( len = strlen( cmd[1] ) ) &&
+                    g_strncasecmp( cmd[1], "set", len ) == 0 )
                         cmd_set_real( irc, cmd + 1, &ic->set, NULL );
                 else
@@ -642 +642 @@
                 char *s, *group = NULL;;
                 
-                if( ( ic = irc_channel_by_name( irc, irc->last_root_cmd ) ) &&
+                if( ( ic = irc->root->last_channel ) &&
                     ( s = set_getstr( &ic->set, "fill_by" ) ) &&
                     strcmp( s, "group" ) == 0 &&