Remove special CAP presence handling of /whois away message.

[irc/rqf/shadowircd.git] / modules / m_away.c

diff --git a/modules/m_away.c b/modules/m_away.c
index 6cd488d71948430e94fc96fb9d1031e3135ff5ef..d8eb876409a1c26ea5fbc9c534239ec7ada9a1d7 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -64,7 +64,6 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $"
 
 /*
 ** m_away
-**      parv[0] = sender prefix
 **      parv[1] = away message
 */
 static int
@@ -79,34 +78,22 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
        if(parc < 2 || EmptyString(parv[1]))
        {
                /* Marking as not away */
-               if(source_p->user->away != NULL)
+               if(get_metadata(source_p, "away") != NULL)
                {
                        /* we now send this only if they were away before --is */
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                                      ":%s AWAY", use_id(source_p));
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-                                     ":%s AWAY", source_p->name);
-                       free_away(source_p);
+                       delete_metadata(source_p, "away");
                }
                if(MyConnect(source_p))
                        sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
                return 0;
        }
 
-
-       if(source_p->user->away == NULL)
-       {
-               allocate_away(source_p);
-               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
-               sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
-                             ":%s AWAY :%s", use_id(source_p), source_p->user->away);
-               sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-                             ":%s AWAY :%s", source_p->name, source_p->user->away);
+       set_metadata(source_p, "away", parv[1]);
+       sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
+                     ":%s AWAY :%s", use_id(source_p), parv[1]);
                        
-       } else {
-               rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
-       }
-       
        if(MyConnect(source_p))
                sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));