X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/67aeaba5930fdaa9b991471a578b94528ce94420..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index b2934e9f..daff1b5b 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -479,7 +479,6 @@ msg_channel(enum message_type msgtype,
 	    const char *text)
 {
 	int result;
-	char text2[BUFSIZE];
 	hook_data_privmsg_channel hdata;
 
 	if(MyClient(source_p))
@@ -527,18 +526,6 @@ msg_channel(enum message_type msgtype,
 		if(result == CAN_SEND_OPV ||
 		   !flood_attack_channel(msgtype, source_p, chptr, chptr->chname))
 		{
-			if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001' &&
-					strncasecmp(text + 1, "ACTION ", 7))
-			{
-				if (chptr->mode.mode & MODE_NOCTCP)
-				{
-					sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-							   form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
-					return;
-				}
-				else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))
-					source_p->large_ctcp_sent = rb_current_time();
-			}
 			sendto_channel_flags(client_p, ALL_MEMBERS, source_p, chptr,
 					     "%s %s :%s", cmdname[msgtype], chptr->chname, text);
 		}
@@ -584,7 +571,6 @@ msg_channel_opmod(enum message_type msgtype,
 		  struct Client *client_p, struct Client *source_p,
 		  struct Channel *chptr, const char *text)
 {
-	char text2[BUFSIZE];
 	hook_data_privmsg_channel hdata;
 
 	hdata.msgtype = msgtype;
@@ -646,7 +632,6 @@ static void
 msg_channel_flags(enum message_type msgtype, struct Client *client_p,
 		  struct Client *source_p, struct Channel *chptr, int flags, const char *text)
 {
-	char text2[BUFSIZE];
 	int type;
 	char c;
 	hook_data_privmsg_channel hdata;
@@ -692,25 +677,6 @@ msg_channel_flags(enum message_type msgtype, struct Client *client_p,
 		return;
 	}
 
-	if (msgtype != MESSAGE_TYPE_NOTICE && *text == '\001' &&
-			strncasecmp(text + 1, "ACTION ", 7))
-	{
-		if (chptr->mode.mode & MODE_NOCTCP)
-		{
-			sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
-					   form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
-			return;
-		}
-		else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))
-		{
-			/* This overestimates the number of users the CTCP
-			 * is being sent to, so large_ctcp_sent might be
-			 * set inappropriately. This should not be a problem.
-			 */
-			source_p->large_ctcp_sent = rb_current_time();
-		}
-	}
-
 	sendto_channel_flags(client_p, type, source_p, chptr, "%s %c%s :%s",
 			     cmdname[msgtype], c, chptr->chname, text);
 }