X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/61ffa214b4ea6a13b4e9bab4f4ce5fa2ecb338a9..1fe75e33ccfe31692f20633945cea14db888118a:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 2415bb2..c5d852b 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_message.c 3173 2007-01-31 23:57:18Z jilles $
  */
 
 #include "stdinc.h"
@@ -45,6 +44,8 @@
 #include "s_stats.h"
 #include "tgchange.h"
 #include "inline/stringops.h"
+#include "irc_dictionary.h"
+#include "channel.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);
@@ -53,6 +54,8 @@ static int m_notice(struct Client *, struct Client *, int, const char **);
 static void expire_tgchange(void *unused);
 static struct ev_entry *expire_tgchange_event;
 
+struct module_modes ModuleModes;
+
 static int
 modinit(void)
 {
@@ -361,7 +364,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
 
 				msptr = find_channel_membership(chptr, source_p);
 
-				if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr) && !IsOverride(source_p))
+				if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr))
 				{
 					sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
 						   get_id(&me, source_p),
@@ -484,9 +487,11 @@ msg_channel(int p_or_n, const char *command,
 {
 	int result;
 	char text2[BUFSIZE];
-	int contor;
+	size_t contor;
 	int caps = 0;
 	int len = 0;
+	struct membership *msptr = find_channel_membership(chptr, source_p);
+	struct Metadata *md;
 
 	if(MyClient(source_p))
 	{
@@ -495,7 +500,25 @@ msg_channel(int p_or_n, const char *command,
 			source_p->localClient->last = rb_current_time();
 	}
 
-	if(chptr->mode.mode & MODE_NOCOLOR)
+	if(chptr->mode.mode & ModuleModes.MODE_NOREPEAT)
+	{
+		rb_strlcpy(text2, text, BUFSIZE);
+		strip_unprintable(text2);
+		md = channel_metadata_find(chptr, "NOREPEAT");
+		if(md && (!ConfigChannel.exempt_cmode_K || !is_any_op(msptr)))
+		{
+			if(!(strcmp(md->value, text2)))
+			{
+				if(p_or_n != NOTICE)
+					sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Message blocked due to repeating (+K set)", chptr->chname);
+				return;
+			}
+		}
+		channel_metadata_delete(chptr, "NOREPEAT", 0);
+		channel_metadata_add(chptr, "NOREPEAT", text2, 0);
+	}
+
+	if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
 	{
 		rb_strlcpy(text2, text, BUFSIZE);
 		strip_colour(text2);
@@ -516,41 +539,40 @@ msg_channel(int p_or_n, const char *command,
 		if(result == CAN_SEND_OPV ||
 		   !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
 		{
-			if (strlen(text) > 10 && chptr->mode.mode & MODE_NOCAPS)
+			if (strlen(text) > 10 && chptr->mode.mode & ModuleModes.MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
 			{
-				for(contor=0; contor < strlen(text); contor++)
+				rb_strlcpy(text2, text, BUFSIZE);
+				strip_unprintable(text2);
+				for(contor=0; contor < strlen(text2); contor++)
 				{
-					if(IsUpper(text[contor]) && !isdigit(text[contor]))
+					if(IsUpper(text2[contor]) && !isdigit(text2[contor]))
 						caps++; 
 					len++;
 				}
 				if(((caps*100)/(len)) >= 50)
 				{
-					sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-							form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+					sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Your message contains mostly capital letters (+G set)", chptr->chname);
 					return;
 				}
 			}
-			if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE)
+			if (p_or_n != PRIVMSG && chptr->mode.mode & ModuleModes.MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
 			{
-				sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-						form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+				sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Notices are disallowed (+T set)", chptr->chname);
 				return;
 			}
-			if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION &&
-					!strncasecmp(text + 1, "ACTION", 6))
+			if (p_or_n != NOTICE && chptr->mode.mode & ModuleModes.MODE_NOACTION &&
+					!strncasecmp(text + 1, "ACTION", 6) &&
+					(!ConfigChannel.exempt_cmode_D || !is_any_op(msptr)))
 			{
-				sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-						form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+				sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - ACTIONs are disallowed (+D set)", chptr->chname);
 				return;
 			}
 			if (p_or_n != NOTICE && *text == '\001' &&
 					strncasecmp(text + 1, "ACTION", 6))
 			{
-				if (chptr->mode.mode & MODE_NOCTCP)
+				if (chptr->mode.mode & ModuleModes.MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
 				{
-					sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-							   form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
+					sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - CTCPs to this channel are disallowed (+C set)", chptr->chname);
 					return;
 				}
 				else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))
@@ -560,7 +582,7 @@ msg_channel(int p_or_n, const char *command,
 					     "%s %s :%s", command, chptr->chname, text);
 		}
 	}
-	else if(chptr->mode.mode & MODE_OPMODERATE &&
+	else if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE &&
 			(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
 			 IsMember(source_p, chptr)))
 	{
@@ -597,7 +619,7 @@ msg_channel_opmod(int p_or_n, const char *command,
 {
 	char text2[BUFSIZE];
 
-	if(chptr->mode.mode & MODE_NOCOLOR)
+	if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR)
 	{
 		rb_strlcpy(text2, text, BUFSIZE);
 		strip_colour(text2);
@@ -612,7 +634,7 @@ msg_channel_opmod(int p_or_n, const char *command,
 		}
 	}
 
-	if(chptr->mode.mode & MODE_OPMODERATE &&
+	if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE &&
 			(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
 			 IsMember(source_p, chptr)))
 	{
@@ -710,6 +732,10 @@ msg_client(int p_or_n, const char *command,
 	   struct Client *source_p, struct Client *target_p, const char *text)
 {
 	int do_floodcount = 0;
+	struct Metadata *md;
+	struct DictionaryIter iter;
+	int oaccept = 0;
+	char text3[10];
 
 	if(MyClient(source_p))
 	{
@@ -765,58 +791,71 @@ msg_client(int p_or_n, const char *command,
 			            form_str(ERR_NOCTCP),
 			            target_p->name);
 		}
-		/* XXX Controversial? allow opers always to send through a +g */
-		else if(!IsServer(source_p) && (IsSetCallerId(target_p) ||
+		/* If opers want to go through +g, they should load oaccept.*/
+		else if(!IsServer(source_p) && !IsService(source_p) && (IsSetCallerId(target_p) ||
+					(IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) ||
 					(IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])))
 		{
+			if (IsOper(source_p))
+			{
+				rb_snprintf(text3, sizeof(text3), "O%s", source_p->id);
+				DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
+				{
+					if(!strcmp(md->value, "OACCEPT") && !strcmp(md->name, text3))
+					{
+						oaccept = 1;
+						break;
+					}
+				}
+			}
 			/* Here is the anti-flood bot/spambot code -db */
-			if(accept_message(source_p, target_p) || IsOper(source_p))
+			if(accept_message(source_p, target_p) || oaccept)
 			{
 				add_reply_target(target_p, source_p);
 				sendto_one(target_p, ":%s!%s@%s %s %s :%s",
 					   source_p->name,
 					   source_p->username,
 					   source_p->host, command, target_p->name, text);
-				return;
 			}
-			if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
+			else if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
 			{
 				if (p_or_n != NOTICE)
 					sendto_one_numeric(source_p, ERR_NONONREG,
 							form_str(ERR_NONONREG),
 							target_p->name);
-				return;
 			}
-			if (IsSetSCallerId(target_p) && !source_p->user->suser[0])
+			else if (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p))
 			{
 				if (p_or_n != NOTICE)
 					sendto_one_numeric(source_p, ERR_NOCOMMONCHAN,
 							form_str(ERR_NOCOMMONCHAN),
 							target_p->name);
-				return;
-			}
-			/* check for accept, flag recipient incoming message */
-			if(p_or_n != NOTICE)
-			{
-				sendto_one_numeric(source_p, ERR_TARGUMODEG,
-						   form_str(ERR_TARGUMODEG),
-						   target_p->name);
 			}
-
-			if((target_p->localClient->last_caller_id_time +
-			    ConfigFileEntry.caller_id_wait) < rb_current_time())
+			else
 			{
+				/* check for accept, flag recipient incoming message */
 				if(p_or_n != NOTICE)
-					sendto_one_numeric(source_p, RPL_TARGNOTIFY,
-							   form_str(RPL_TARGNOTIFY),
+				{
+					sendto_one_numeric(source_p, ERR_TARGUMODEG,
+							   form_str(ERR_TARGUMODEG),
 							   target_p->name);
+				}
 
-				add_reply_target(target_p, source_p);
-				sendto_one(target_p, form_str(RPL_UMODEGMSG),
-					   me.name, target_p->name, source_p->name,
-					   source_p->username, source_p->host);
+				if((target_p->localClient->last_caller_id_time +
+				    ConfigFileEntry.caller_id_wait) < rb_current_time())
+				{
+					if(p_or_n != NOTICE)
+						sendto_one_numeric(source_p, RPL_TARGNOTIFY,
+								   form_str(RPL_TARGNOTIFY),
+								   target_p->name);
 
-				target_p->localClient->last_caller_id_time = rb_current_time();
+					add_reply_target(target_p, source_p);
+					sendto_one(target_p, form_str(RPL_UMODEGMSG),
+						   me.name, target_p->name, source_p->name,
+						   source_p->username, source_p->host);
+
+					target_p->localClient->last_caller_id_time = rb_current_time();
+				}
 			}
 		}
 		else
@@ -850,7 +889,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p
 	 * and msg user@server.
 	 * -- jilles
 	 */
-	if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p))
+	if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood))
 	{
 		if((target_p->first_received_message_time + 1) < rb_current_time())
 		{
@@ -905,7 +944,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr,
 {
 	int delta;
 
-	if(GlobalSetOptions.floodcount && MyClient(source_p))
+	if(GlobalSetOptions.floodcount && MyClient(source_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood))
 	{
 		if((chptr->first_received_message_time + 1) < rb_current_time())
 		{