presence: If CLICAP_PRESENCE is enabled, then RPL_AWAY is replaced by the "away"...

As such, only fall back to legacy RPL_AWAY if CLICAP_PRESENCE is not set on source_p.

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c188a9ae872e54ae2c1b52c22d4260150dd54d31..04423f725755e1cafc7147b3dc977ca860e22a66 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -305,7 +305,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                           target_p->name, target_p->servptr->name,
                           target_p->servptr->info);
 
-       if((awaymsg = get_metadata(target_p, "away")) != NULL)
+       if(!IsCapable(source_p, CLICAP_PRESENCE) && (awaymsg = get_metadata(target_p, "away")) != NULL)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
                                   target_p->name, awaymsg);