X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=a1839ca41d2751dfc28ae2f72fc5ff162074eace;hb=6f4bf8ffd367f35b96265fea1ad01fb1acf2adcd;hp=e387b6ae345482adf0a77b069ff1ab36507dca36;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index e387b6ae3..a1839ca41 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -28,23 +28,25 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 	return new cmd_privmsg(Instance);
 }
 
-void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *dest;
 	chanrec *chan;
 
+	CUList except_list;
+
 	user->idle_lastmsg = ServerInstance->Time();
 	
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-		return;
+		return CMD_SUCCESS;
 
 	if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
 	{
 		int MOD_RESULT = 0;
 		std::string temp = parameters[1];
-		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_list));
 		if (MOD_RESULT)
-			return;
+			return CMD_FAILURE;
 		parameters[1] = (char*)temp.c_str();
 		// notice to server mask
 		const char* servermask = parameters[0] + 1;
@@ -52,8 +54,8 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		{
 			ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
 		}
-		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
-		return;
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+		return CMD_SUCCESS;
 	}
 	char status = 0;
 	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -64,6 +66,9 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 	if (parameters[0][0] == '#')
 	{
 		chan = ServerInstance->FindChan(parameters[0]);
+
+		except_list[user] = user;
+
 		if (chan)
 		{
 			if (IS_LOCAL(user))
@@ -71,38 +76,47 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 				if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-					return;
+					return CMD_FAILURE;
 				}
 				if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
 				{
 					user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-					return;
+					return CMD_FAILURE;
 				}
 			}
 			int MOD_RESULT = 0;
 
 			std::string temp = parameters[1];
-			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status));
+			FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
 			if (MOD_RESULT) {
-				return;
+				return CMD_FAILURE;
 			}
-			parameters[1] = (char*)temp.c_str();
+			parameters[1] = temp.c_str();
 
 			if (temp == "")
 			{
 				user->WriteServ("412 %s No text to send", user->nick);
-				return;
+				return CMD_FAILURE;
+			}
+
+			if (status)
+			{
+				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+			}
+			else 
+			{
+				chan->WriteAllExcept(user, false, status, except_list, "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));
+
+			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
 		}
 		else
 		{
 			/* no such nick/channel */
 			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			return CMD_FAILURE;
 		}
-		return;
+		return CMD_SUCCESS;
 	}
 
 	dest = ServerInstance->FindNick(parameters[0]);
@@ -117,9 +131,9 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 		int MOD_RESULT = 0;
 		
 		std::string temp = parameters[1];
-		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0));
+		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0,except_list));
 		if (MOD_RESULT) {
-			return;
+			return CMD_FAILURE;
 		}
 		parameters[1] = (char*)temp.c_str();
 
@@ -129,11 +143,14 @@ void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
 		}
 
-		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_list));
 	}
 	else
 	{
 		/* no such nick/channel */
 		user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+		return CMD_FAILURE;
 	}
+	return CMD_SUCCESS;
 }
+