X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=e387b6ae345482adf0a77b069ff1ab36507dca36;hb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;hp=1218eca393fd9ebd318f8c3f4df531f31b403c16;hpb=9c213ae9c6f9f694f5f85f22b6af507ceba55acb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 1218eca39..e387b6ae3 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -14,36 +14,31 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "message.h"
 #include "wildcard.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_privmsg.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_privmsg(Instance);
+}
 
 void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	chanrec *chan;
 
-	user->idle_lastmsg = TIME;
+	user->idle_lastmsg = ServerInstance->Time();
 	
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return;
 
-	if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
+	if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
 	{
 		int MOD_RESULT = 0;
 		std::string temp = parameters[1];
@@ -53,9 +48,9 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		parameters[1] = (char*)temp.c_str();
 		// notice to server mask
 		const char* servermask = parameters[0] + 1;
-		if (match(Config->ServerName,servermask))
+		if (match(ServerInstance->Config->ServerName,servermask))
 		{
-			ServerPrivmsgAll("%s",parameters[1]);
+			ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
 		}
 		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
 		return;
@@ -68,19 +63,19 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	}
 	if (parameters[0][0] == '#')
 	{
-		chan = FindChan(parameters[0]);
+		chan = ServerInstance->FindChan(parameters[0]);
 		if (chan)
 		{
 			if (IS_LOCAL(user))
 			{
 				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
 				{
-					WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+					user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
 					return;
 				}
-				if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
+				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
-					WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
 					return;
 				}
 			}
@@ -95,28 +90,28 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 
 			if (temp == "")
 			{
-				WriteServ(user->fd,"412 %s No text to send", user->nick);
+				user->WriteServ("412 %s No text to send", user->nick);
 				return;
 			}
 			
-			ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+			chan->WriteAllExceptSender(user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
 			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
 		}
 		else
 		{
 			/* no such nick/channel */
-			WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 		}
 		return;
 	}
 
-	dest = Find(parameters[0]);
+	dest = ServerInstance->FindNick(parameters[0]);
 	if (dest)
 	{
 		if ((IS_LOCAL(user)) && (*dest->awaymsg))
 		{
 			/* auto respond with aweh msg */
-			WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
+			user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
 		}
 
 		int MOD_RESULT = 0;
@@ -128,10 +123,10 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 		parameters[1] = (char*)temp.c_str();
 
-		if (dest->fd > -1)
+		if (IS_LOCAL(dest))
 		{
 			// direct write, same server
-			WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
 		}
 
 		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
@@ -139,6 +134,6 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	else
 	{
 		/* no such nick/channel */
-		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
 }