From b407e94ea31323adccbea3ada80d16def9ed61eb Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 14 Aug 2007 03:56:46 +0000 Subject: [PATCH] Move whisper()'s away message checking to the cprivmsg path. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1830 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/s_user.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49c14fe..c357292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-08-13 Michael Poole + + * ircd/s_user.c (whipser): CNOTICEs should not trigger away + messages, only CPRIVMSGs. + 2007-08-13 Michael Poole * ircd/m_who.c (m_who): Reorder responses and change the diff --git a/ircd/s_user.c b/ircd/s_user.c index a859ef8..b6d5d41 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -796,12 +796,14 @@ int whisper(struct Client* source, const char* nick, const char* channel, if (is_silenced(source, dest)) return 0; - if (cli_user(dest)->away) - send_reply(source, RPL_AWAY, cli_name(dest), cli_user(dest)->away); if (is_notice) sendcmdto_one(source, CMD_NOTICE, dest, "%C :%s", dest, text); else + { + if (cli_user(dest)->away) + send_reply(source, RPL_AWAY, cli_name(dest), cli_user(dest)->away); sendcmdto_one(source, CMD_PRIVATE, dest, "%C :%s", dest, text); + } return 0; } -- 2.20.1