Revert all presence-related changes

[irc/rqf/shadowircd.git] / modules / core / m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 62db04d783b3c1294391d99c2facada46622921c..c89325038f371b03baf279ff3df74b64b5049b6c 100644 (file)
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -744,7 +744,6 @@ static void
 msg_client(int p_or_n, const char *command,
           struct Client *source_p, struct Client *target_p, const char *text)
 {
-       const char *awaymsg;
        int do_floodcount = 0;
 
        if(MyClient(source_p))
@@ -789,9 +788,9 @@ msg_client(int p_or_n, const char *command,
                return;
        }
 
-       if(MyConnect(source_p) && (p_or_n != NOTICE) && target_p->user && (awaymsg = get_metadata(target_p, "away")) != NULL)
+       if(MyConnect(source_p) && (p_or_n != NOTICE) && target_p->user && target_p->user->away)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
-                                  target_p->name, awaymsg);
+                                  target_p->name, target_p->user->away);
 
        if(MyClient(target_p))
        {