Changeset f7ca587 for irc_send.c

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.

File:

• irc_send.c (modified) (2 diffs)

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 );
 }