Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_silence.c

diff --git a/ircd/m_silence.c b/ircd/m_silence.c
index 25867e9fb44d3f0457435841ad027f05b59b4ee0..21df5b600736c056d9116354cd2cb419febd4abd 100644 (file)
--- a/ircd/m_silence.c
+++ b/ircd/m_silence.c
@@ -79,14 +79,8 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
+#include "config.h"
+
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
@@ -130,11 +124,11 @@ int m_silence(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   acptr = sptr;
 
   if (parc < 2 || EmptyString(parv[1]) || (acptr = FindUser(parv[1]))) {
-    if (!(acptr->user))
+    if (!(cli_user(acptr)))
       return 0;
-    for (lp = acptr->user->silence; lp; lp = lp->next)
-      send_reply(sptr, RPL_SILELIST, acptr->name, lp->value.cp);
-    send_reply(sptr, RPL_ENDOFSILELIST, acptr->name);
+    for (lp = cli_user(acptr)->silence; lp; lp = lp->next)
+      send_reply(sptr, RPL_SILELIST, cli_name(acptr), lp->value.cp);
+    send_reply(sptr, RPL_ENDOFSILELIST, cli_name(acptr));
     return 0;
   }
   cp = parv[1];
@@ -170,12 +164,9 @@ int ms_silence(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   struct Client* acptr;
 
   if (IsServer(sptr)) {
-    /* PROTOCOL WARNING */
-    /* bail, don't core */
-    return 0;
+    return protocol_violation(sptr,"Server trying to silence a user");
   }
   if (parc < 3 || EmptyString(parv[2])) {
-    /* PROTOCOL WARNING */
     return need_more_params(sptr, "SILENCE");
   }
 
@@ -190,95 +181,9 @@ int ms_silence(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   }
   else {
     add_silence(sptr, parv[2]);
-    if (acptr && IsServer(acptr->from)) {
+    if (acptr && IsServer(cli_from(acptr))) {
       sendcmdto_one(sptr, CMD_SILENCE, acptr, "%C %s", acptr, parv[2]);
     }
   }
   return 0;
 }
-
-
-#if 0
-/*
- * m_silence() - Added 19 May 1994 by Run.
- *
- *   parv[0] = sender prefix
- * From local client:
- *   parv[1] = mask (NULL sends the list)
- * From remote client:
- *   parv[1] = Numeric nick that must be silenced
- *   parv[2] = mask
- */
-int m_silence(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
-{
-  struct SLink *lp;
-  struct Client *acptr;
-  char c, *cp;
-
-  if (MyUser(sptr))
-  {
-    acptr = sptr;
-    if (parc < 2 || *parv[1] == '\0' || (acptr = FindUser(parv[1])))
-    {
-      if (!(acptr->user))
-        return 0;
-      for (lp = acptr->user->silence; lp; lp = lp->next)
-        sendto_one(sptr, rpl_str(RPL_SILELIST), me.name, /* XXX DEAD */
-            sptr->name, acptr->name, lp->value.cp);
-      sendto_one(sptr, rpl_str(RPL_ENDOFSILELIST), me.name, sptr->name, /* XXX DEAD */
-          acptr->name);
-      return 0;
-    }
-    cp = parv[1];
-    c = *cp;
-    if (c == '-' || c == '+')
-      cp++;
-    else if (!(strchr(cp, '@') || strchr(cp, '.') ||
-        strchr(cp, '!') || strchr(cp, '*')))
-    {
-      sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], parv[1]); /* XXX DEAD */
-      return -1;
-    }
-    else
-      c = '+';
-    cp = pretty_mask(cp);
-    if ((c == '-' && !del_silence(sptr, cp)) ||
-        (c != '-' && !add_silence(sptr, cp)))
-    {
-      sendto_prefix_one(sptr, sptr, ":%s SILENCE %c%s", parv[0], c, cp); /* XXX DEAD */
-      if (c == '-')
-        sendto_serv_butone(0, ":%s SILENCE * -%s", sptr->name, cp); /* XXX DEAD */
-    }
-  }
-  else if (parc < 3 || *parv[2] == '\0')
-    return need_more_params(sptr, "SILENCE");
-
-  else
-  {
-    if (*parv[1])        /* can be a server */
-      acptr = findNUser(parv[1]);
-    else
-      acptr = FindNServer(parv[1]);
-
-    if (*parv[2] == '-')
-    {
-      if (!del_silence(sptr, parv[2] + 1))
-        sendto_serv_butone(cptr, ":%s SILENCE * %s", parv[0], parv[2]); /* XXX DEAD */
-    }
-    else
-    {
-      add_silence(sptr, parv[2]);
-      if (acptr && IsServer(acptr->from))
-      {
-        if (IsServer(acptr))
-          sendto_one(acptr, ":%s SILENCE %s %s", /* XXX DEAD */
-              parv[0], NumServ(acptr), parv[2]);
-        else
-          sendto_one(acptr, ":%s SILENCE %s%s %s", /* XXX DEAD */
-              parv[0], NumNick(acptr), parv[2]);
-      }
-    }
-  }
-  return 0;
-}
-#endif /* 0 */