X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_invite.cpp;h=db1c64eac51b87a283fbe87a41c7ef74ca7e14f7;hb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;hp=42905d9bf3f77e9c8e2ea296bc704ac4294fb9fb;hpb=18154f4d229cf8ebdcec0dac671ad6e2e0049fee;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 42905d9bf..db1c64eac 100644
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -21,31 +21,23 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INVITE
  */
-CmdResult CommandInvite::Handle (const char** 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 ((!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(401, "%s %s :No such nick/channel",user->nick, c ? parameters[0].c_str() : parameters[1].c_str());
 			return CMD_FAILURE;
 		}
 
@@ -53,20 +45,20 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *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-");
+				user->WriteNumeric(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(443, "%s %s %s :is already on channel",user->nick,u->nick,c->name);
 	 		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(442, "%s %s :You're not on that channel!",user->nick, c->name);
 	  		return CMD_FAILURE;
 		}
 
@@ -79,7 +71,7 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
 
 		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);
+		user->WriteNumeric(341, "%s %s %s",user->nick,u->nick,c->name);
 		switch (ServerInstance->Config->AnnounceInvites)
 		{
 			case ServerConfig::INVITE_ANNOUNCE_ALL:
@@ -107,9 +99,9 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *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(346, "%s :%s",user->nick,i->first.c_str());
 		}
-		user->WriteServ("347 %s :End of INVITE list",user->nick);
+		user->WriteNumeric(347, "%s :End of INVITE list",user->nick);
 	}
 	return CMD_SUCCESS;
 }