Changeset 92c8d41

Timestamp:

2010-06-26T21:26:41Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e907683

Parents:

41d415b

Message:

Remember in which channel the user talked to someone and show responses in
that same channel.

Files:

• irc.h (modified) (4 diffs)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (6 diffs)
• irc_user.c (modified) (1 diff)

irc.h

@@ -66 +66 @@
         struct irc_user *user;
         
-        char *last_root_cmd;
+        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
@@ -80 +82 @@
         struct irc_channel *default_channel;
         GHashTable *nick_user_hash;
-        GHashTable *watches;
+        GHashTable *watches; /* See irc_cmd_watch() */
 
         gint r_watch_source_id;
@@ -91 +93 @@
 typedef enum
 {
-        IRC_USER_PRIVATE = 1,
+        /* Replaced with iu->last_channel IRC_USER_PRIVATE = 1, */
         IRC_USER_AWAY = 2,
 } irc_user_flags_t;
@@ -108 +110 @@
         
         irc_user_flags_t flags;
+        struct irc_channel *last_channel;
         
         GString *pastebuf; /* Paste buffer (combine lines into a multiline msg). */

irc_channel.c

@@ -375 +375 @@
                 if( iu && iu->f->privmsg )
                 {
-                        iu->flags &= ~IRC_USER_PRIVATE;
+                        iu->last_channel = ic;
                         iu->f->privmsg( iu, s );
                 }

irc_commands.c

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

irc_im.c

@@ -34 +34 @@
 {
         irc_user_t *iu;
+        irc_t *irc = (irc_t*) bee->ui_data;
         char nick[MAX_NICK_LENGTH+1], *s;
         
@@ -39 +40 @@
         strcpy( nick, nick_get( bu->ic->acc, bu->handle ) );
         
-        bu->ui_data = iu = irc_user_new( (irc_t*) bee->ui_data, nick );
+        bu->ui_data = iu = irc_user_new( irc, nick );
         iu->bu = bu;
         
@@ -63 +64 @@
         }
         
-        if( set_getbool( &bee->set, "private" ) )
-                iu->flags |= IRC_USER_PRIVATE;
-        
         if( bu->flags & BEE_USER_LOCAL )
         {
@@ -71 +69 @@
                 
                 if( strcmp( s, "add_private" ) == 0 )
-                        iu->flags |= IRC_USER_PRIVATE;
+                        iu->last_channel = NULL;
                 else if( strcmp( s, "add_channel" ) == 0 )
-                        iu->flags &= ~IRC_USER_PRIVATE;
+                        iu->last_channel = irc->default_channel;
         }
         
         iu->f = &irc_user_im_funcs;
-        //iu->last_typing_notice = 0;
         
         return TRUE;
@@ -180 +177 @@
 {
         irc_t *irc = bee->ui_data;
-        irc_channel_t *ic = irc->default_channel;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         char *dst, *prefix = NULL;
@@ -188 +184 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
-        if( iu->flags & IRC_USER_PRIVATE )
+        if( iu->last_channel )
+        {
+                dst = iu->last_channel->name;
+                prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
+        }
+        else
         {
                 dst = irc->user->nick;
                 prefix = ts;
                 ts = NULL;
-        }
-        else
-        {
-                dst = ic->name;
-                prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }
         

irc_user.c

@@ -34 +34 @@
         iu->user = iu->host = iu->fullname = iu->nick;
         
-        iu->flags = set_getbool( &irc->b->set, "private" ) ? IRC_USER_PRIVATE : 0;
+        if( set_getbool( &irc->b->set, "private" ) )
+                iu->last_channel = NULL;
+        else
+                iu->last_channel = irc->default_channel;
         
         iu->key = g_strdup( nick );