From 3dc2055bb03658cb2a1ecab7177519290f8532af Mon Sep 17 00:00:00 2001 From: w00t Date: Sat, 12 May 2007 20:55:43 +0000 Subject: While I'm on the macro warpath: start using IS_AWAY. Also, show the away message all the time, don't check IS_LOCAL. We used to not propegate away messages, but that hasn't been the case for ..fucking years? :p. WHOIS works correctly. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7002 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_privmsg.cpp | 2 +- src/cmd_who.cpp | 2 +- src/cmd_whois.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 1614a62dc..6eedf5276 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -126,7 +126,7 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user) dest = ServerInstance->FindNick(parameters[0]); if (dest) { - if ((IS_LOCAL(user)) && (*dest->awaymsg)) + if (IS_AWAY(dest)) { /* auto respond with aweh msg */ user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg); diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index bdbca597e..de504faf2 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -147,7 +147,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch " " + u->nick + " "; /* away? */ - if (*u->awaymsg) + if (IS_AWAY(u)) { wholine.append("G"); } diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp index 43b39108b..a634e5967 100644 --- a/src/cmd_whois.cpp +++ b/src/cmd_whois.cpp @@ -57,7 +57,7 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick, dest->nick, dest->server, ServerInstance->GetServerDescription(dest->server).c_str()); } - if (*dest->awaymsg) + if (IS_AWAY(dest)) { ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick, dest->nick, dest->awaymsg); } -- cgit v1.2.3