Changeset 449a51d

Timestamp:

2010-03-16T10:18:02Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ec55a7d

Parents:

9fca0657

Message:

Include non-away status messages in blist and whois responses. The whois
change is a complete violation of the IRC protocol but that doesn't seem
to be an uncommon thing.

Files:

• irc_commands.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)
• user.h (modified) (1 diff)

irc_commands.c

@@ -497 +497 @@
                 else if( u->away )
                         irc_reply( irc, 301, "%s :%s", u->nick, u->away );
+                if( u->status_msg )
+                        irc_reply( irc, 333, "%s :Status: %s", u->nick, u->status_msg );
                 
                 irc_reply( irc, 318, "%s :End of /WHOIS list", nick );

protocols/nogaim.c

@@ -647 +647 @@
         oo = u->online;
         
-        if( u->away )
-        {
-                g_free( u->away );
-                u->away = NULL;
-        }
+        g_free( u->away );
+        g_free( u->status_msg );
+        u->away = u->status_msg = NULL;
         
         if( ( flags & OPT_LOGGED_IN ) && !u->online )
@@ -689 +687 @@
                 }
         }
-        /* else waste_any_state_information_for_now(); */
+        else
+        {
+                u->status_msg = g_strdup( message );
+        }
         
         /* LISPy... */

root_commands.c

@@ -914 +914 @@
                 online = 1;
         else
-                online =  away = 1;
+                online = away = 1;
         
         if( strchr( irc->umode, 'b' ) != NULL )
@@ -927 +927 @@
                 if( online == 1 )
                 {
+                        char st[256] = "Online";
+                        
+                        if( u->status_msg )
+                                g_snprintf( st, sizeof( st ) - 1, "Online (%s)", u->status_msg );
+                        
                         g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                        irc_usermsg( irc, format, u->nick, s, st );
                 }
                 

user.h

@@ -34 +34 @@
         
         char *away;
+        char *status_msg; /* Non-IRC extension, but nice on IM. */
         
         char is_private;