Second attempt at time() -> SI->Time(), now problems with the original were fixed...

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

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 49296ca42d8864150866c52aa83e4b4ee23f9e1e..1a70fbe0e0b9a6e108235034dfffc18a8dea3f9a 100644 (file)
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -21,52 +21,38 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INVITE
  */
-CmdResult CommandInvite::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, User *user)
 {
        int MOD_RESULT = 0;
 
-       if (pcnt == 2 || pcnt == 3)
+       if (parameters.size() == 2 || parameters.size() == 3)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
                time_t timeout = 0;
-               if (pcnt == 3)
+               if (parameters.size() == 3)
                {
-                       timeout = time(NULL) + ServerInstance->Duration(parameters[2]);
+                       if (IS_LOCAL(user))
+                               timeout = ServerInstance->Time() + ServerInstance->Duration(parameters[2]);
+                       else
+                               timeout = ConvToInt(parameters[2]);
                }
 
                if ((!c) || (!u))
                {
-                       if (!c)
-                       {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
-                       }
-                       else
-                       {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
-                       }
-
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), c ? parameters[0].c_str() : parameters[1].c_str());
                        return CMD_FAILURE;
                }
 
-               if ((c->IsModeSet('i')) && (IS_LOCAL(user)))
-               {
-                       if (c->GetStatus(user) < STATUS_HOP)
-                       {
-                               user->WriteServ("482 %s %s :You must be a channel %soperator", user->nick, c->name, c->GetStatus(u) == STATUS_HOP ? "" : "half-");
-                               return CMD_FAILURE;
-                       }
-               }
-
                if (c->HasUser(u))
                {
-                       user->WriteServ("443 %s %s %s :is already on channel",user->nick,u->nick,c->name);
+                       user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
                        return CMD_FAILURE;
                }
 
                if ((IS_LOCAL(user)) && (!c->HasUser(user)))
                {
-                       user->WriteServ("442 %s %s :You're not on that channel!",user->nick, c->name);
+                       user->WriteNumeric(ERR_NOTONCHANNEL, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
 
@@ -76,23 +62,34 @@ CmdResult CommandInvite::Handle (const char* const* parameters, int pcnt, User *
                {
                        return CMD_FAILURE;
                }
+               else if (MOD_RESULT == 0)
+               {
+                       if (IS_LOCAL(user))
+                       {
+                               if (c->GetStatus(user) < STATUS_HOP)
+                               {
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-");
+                                       return CMD_FAILURE;
+                               }
+                       }
+               }
 
-               u->InviteTo(c->name, timeout);
-               u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name);
-               user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name);
+               u->InviteTo(c->name.c_str(), timeout);
+               u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
+               user->WriteNumeric(RPL_INVITING, "%s %s %s",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
                switch (ServerInstance->Config->AnnounceInvites)
                {
                        case ServerConfig::INVITE_ANNOUNCE_ALL:
-                               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
                        break;
                        case ServerConfig::INVITE_ANNOUNCE_OPS:
-                               c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                               c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
                        break;
                        case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
                                if (c->IsModeSet('i'))
-                                       c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                                       c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
                                else
-                                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
                        break;
                        default:
                                /* Nobody */
@@ -107,9 +104,9 @@ CmdResult CommandInvite::Handle (const char* const* parameters, int pcnt, User *
                InvitedList* il = user->GetInviteList();
                for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
                {
-                       user->WriteServ("346 %s :%s",user->nick,i->first.c_str());
+                       user->WriteNumeric(RPL_INVITELIST, "%s :%s",user->nick.c_str(),i->first.c_str());
                }
-               user->WriteServ("347 %s :End of INVITE list",user->nick);
+               user->WriteNumeric(RPL_ENDOFINVITELIST, "%s :End of INVITE list",user->nick.c_str());
        }
        return CMD_SUCCESS;
 }