From d986463c9e026b2a5f003f44db3105aa5449fc27 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 12 Apr 2010 00:31:15 +0200 Subject: Show status msg in /WHOIS, using a hopefully more proper 320 numeric reply. --- irc_send.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'irc_send.c') diff --git a/irc_send.c b/irc_send.c index b78b90bd..3eecf5f4 100644 --- a/irc_send.c +++ b/irc_send.c @@ -228,18 +228,15 @@ void irc_send_whois( irc_user_t *iu ) bu->ic->acc->server && *bu->ic->acc->server ? bu->ic->acc->server : "", bu->ic->acc->prpl->name ); - if( bu->status ) + if( bu->status || bu->status_msg ) { - if( bu->status_msg ) - irc_send_num( irc, 301, "%s :%s (%s)", iu->nick, bu->status, bu->status_msg ); + int num = bu->flags & BEE_USER_AWAY ? 301 : 320; + + if( bu->status && bu->status_msg ) + irc_send_num( irc, num, "%s :%s (%s)", iu->nick, bu->status, bu->status_msg ); else - irc_send_num( irc, 301, "%s :%s", iu->nick, bu->status ); + irc_send_num( irc, num, "%s :%s", iu->nick, bu->status ? : bu->status_msg ); } - - /* - if( u->status_msg ) - irc_send_num( irc, 333, "%s :Status: %s", u->nick, u->status_msg ); - */ } else { -- cgit v1.2.3