INFO now looks much prettier than it did 5 seconds ago :o

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

diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index f89b549ca874749a3df3b17f83a4083193c50b70..4ca319afcd21a8a187518c867bbc382501fe58b2 100644 (file)
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -11,11 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
 #include "inspircd.h"
 #include "commands/cmd_ison.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_ison(Instance);
 }
@@ -36,6 +35,9 @@ CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (u)
                {
+                       if (u->Visibility && !u->Visibility->VisibleTo(user))
+                               continue;
+
                        reply.append(u->nick).append(" ");
                        if (reply.length() > 450)
                        {
@@ -44,6 +46,37 @@ CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        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 (list.GetToken(item))
+                               {
+                                       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;
+                                       }
+                               }
+                       }
+               }
        }
 
        if (!reply.empty())