Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index eaf96c097a7ab9fbb93627846d6d780ca4a93ace..0e97d0db182ca9c577e17a9e3d4504b781e4af2d 100644 (file)
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -2,48 +2,83 @@
  *       | 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 "users.h"
 #include "inspircd.h"
 #include "commands/cmd_list.h"
 #include "wildcard.h"
 
 /** Handle /LIST
  */
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_list(Instance);
+       return new CommandList(Instance);
 }
 
-CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandList::Handle (const char** parameters, int pcnt, User *user)
 {
+       int minusers = 0, maxusers = 0;
+
        user->WriteServ("321 %s Channel :Users Name",user->nick);
-       for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
+
+       /* Work around mIRC suckyness. YOU SUCK, KHALED! */
+       if (pcnt == 1)
+       {
+               if (*parameters[0] == '<')
+               {
+                       maxusers = atoi(parameters[0]+1);
+                       pcnt = 0;
+               }
+               else if (*parameters[0] == '>')
+               {
+                       minusers = atoi(parameters[0]+1);
+                       pcnt = 0;
+               }
+       }
+
+       for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
        {
                // attempt to match a glob pattern
-               if (pcnt && !match(i->second->name, parameters[0]))
+               long users = i->second->GetUserCounter();
+
+               bool too_few = (minusers && (users <= minusers));
+               bool too_many = (maxusers && (users >= maxusers));
+
+               if (too_many || too_few)
                        continue;
+
+               if (pcnt)
+               {
+                       if (!match(i->second->name, parameters[0]) && !match(i->second->topic, parameters[0]))
+                               continue;
+               }
+
                // if the channel is not private/secret, OR the user is on the channel anyway
                bool n = i->second->HasUser(user);
-               if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
+               if ((i->second->IsModeSet('p')) && (!n))
                {
-                       long users = i->second->GetUserCounter();
                        if (users)
-                               user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                               user->WriteServ("322 %s *",user->nick,i->second->name);
+               }
+               else
+               {
+                       if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
+                       {
+                               long users = i->second->GetUserCounter();
+                               if (users)
+                                       user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                       }
                }
        }
        user->WriteServ("323 %s :End of channel list.",user->nick);
 
        return CMD_SUCCESS;
 }
+