More numerics.h conversion

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

diff --git a/src/commands/cmd_list.cpp b/src/commands/cmd_list.cpp
index 2ead367a4642503864b2e544bc7067300d2cb01a..b2ec1941bed766da04e4c0f6845c2a54148f0b51 100644 (file)
--- a/src/commands/cmd_list.cpp
+++ b/src/commands/cmd_list.cpp
@@ -22,24 +22,22 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandList(Instance);
 }
 
-CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *user)
 {
        int minusers = 0, maxusers = 0;
 
-       user->WriteServ("321 %s Channel :Users Name",user->nick);
+       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
        /* Work around mIRC suckyness. YOU SUCK, KHALED! */
-       if (pcnt == 1)
+       if (parameters.size() == 1)
        {
-               if (*parameters[0] == '<')
+               if (parameters[0][0] == '<')
                {
-                       maxusers = atoi(parameters[0]+1);
-                       pcnt = 0;
+                       maxusers = atoi((parameters[0].c_str())+1);
                }
-               else if (*parameters[0] == '>')
+               else if (parameters[0][0] == '>')
                {
-                       minusers = atoi(parameters[0]+1);
-                       pcnt = 0;
+                       minusers = atoi((parameters[0].c_str())+1);
                }
        }
 
@@ -54,27 +52,27 @@ CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *us
                if (too_many || too_few)
                        continue;
 
-               if (pcnt)
+               if (parameters.size() && (parameters[0][0] != '<' || parameters[0][0] == '>'))
                {
                        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->IsModeSet('p')) && (!n))
+               bool n = (i->second->HasUser(user) || IS_OPER(user));
+               if (!IS_OPER(user) && (i->second->IsModeSet('p')) && (!n))
                {
-                       user->WriteServ("322 %s *",user->nick,i->second->name);
+                       user->WriteNumeric(322, "%s * %ld :",user->nick.c_str(), users);
                }
                else
                {
-                       if (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n))
+                       if (IS_OPER(user) || (((!(i->second->IsModeSet('p'))) && (!(i->second->IsModeSet('s')))) || (n)))
                        {
-                               user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,i->second->ChanModes(n),i->second->topic);
+                               user->WriteNumeric(322, "%s %s %ld :[+%s] %s",user->nick.c_str(),i->second->name.c_str(),users,i->second->ChanModes(n),i->second->topic.c_str());
                        }
                }
        }
-       user->WriteServ("323 %s :End of channel list.",user->nick);
+       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
 
        return CMD_SUCCESS;
 }