Fix small typo found by danieldg

[user/henk/code/inspircd.git] / src / cmd_ison.cpp

diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index 1fefeab1c08140b367732432e515ce3250ca0fe6..d050af9827c8312e61ad1c7ae1426313cccee13e 100644 (file)
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -2,45 +2,88 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "ctables.h"
-#include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
+#include "users.h"
 #include "commands/cmd_ison.h"
 
-extern InspIRCd* ServerInstance;
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_ison(Instance);
+}
 
-void cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /ISON
+ */
+CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       char retbuf[MAXBUF];
+       std::map<userrec*,userrec*> ison_already;
        userrec *u;
-
-       snprintf(retbuf, MAXBUF, "303 %s :", user->nick);
+       std::string reply = std::string("303 ") + user->nick + " :";
 
        for (int i = 0; i < pcnt; i++)
        {
                u = ServerInstance->FindNick(parameters[i]);
+               if (ison_already.find(u) != ison_already.end())
+                       continue;
 
                if (u)
                {
-                       strlcat(retbuf, u->nick, MAXBUF);
-                       charlcat(retbuf, ' ', MAXBUF);
+                       if (u->Visibility && !u->Visibility->VisibleTo(user))
+                               continue;
+
+                       reply.append(u->nick).append(" ");
+                       if (reply.length() > 450)
+                       {
+                               user->WriteServ(reply);
+                               reply = std::string("303 ") + user->nick + " :";
+                       }
+                       ison_already[u] = u;
+               }
+               else
+               {
+                       if ((i == pcnt-1) && (strchr(parameters[i],' ')))
+                       {
+                               /* Its a space seperated list of nicks (RFC1459 says to support this)
+                                */
+                               irc::spacesepstream list(parameters[i]);
+                               std::string item("*");
+                               while (((item = list.GetToken()) != ""))
+                               {
+                                       u = ServerInstance->FindNick(item);
+                                       if (ison_already.find(u) != ison_already.end())
+                                               continue;
+
+                                       if (u)
+                                       {
+                                               if (u->Visibility && !u->Visibility->VisibleTo(user))
+                                                       continue;
+
+                                               reply.append(u->nick).append(" ");
+                                               if (reply.length() > 450)
+                                               {
+                                                       user->WriteServ(reply);
+                                                       reply = std::string("303 ") + user->nick + " :";
+                                               }
+                                               ison_already[u] = u;
+                                       }
+                               }
+                       }
+                       /* There will only be one of these, we can bail after. */
+                       break;
                }
        }
 
-       user->WriteServ( retbuf);
+       if (!reply.empty())
+               user->WriteServ(reply);
+
+       return CMD_SUCCESS;
 }
+