X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/e2ceb48c3e2accb3402a5021d0d89a6d6d5e74c2..4cac091255d972b0131ffbf0cd278f984bd892d4:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index e329e7bf..db1eb600 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -49,10 +49,15 @@ static const char message_desc[] =
 static void m_message(enum message_type, struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void m_privmsg(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void m_notice(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_echo(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static void echo_msg(struct Client *, struct Client *, enum message_type, const char *);
 
 static void expire_tgchange(void *unused);
 static struct ev_entry *expire_tgchange_event;
 
+static unsigned int CAP_ECHO;
+
 static int
 modinit(void)
 {
@@ -75,10 +80,19 @@ struct Message notice_msgtab = {
 	"NOTICE", 0, 0, 0, 0,
 	{mg_unreg, {m_notice, 0}, {m_notice, 0}, {m_notice, 0}, mg_ignore, {m_notice, 0}}
 };
+struct Message echo_msgtab = {
+	"ECHO", 0, 0, 0, 0,
+	{mg_unreg, mg_ignore, {m_echo, 3}, mg_ignore, mg_ignore, mg_ignore}
+};
 
-mapi_clist_av1 message_clist[] = { &privmsg_msgtab, &notice_msgtab, NULL };
+mapi_clist_av1 message_clist[] = { &privmsg_msgtab, &notice_msgtab, &echo_msgtab, NULL };
+
+mapi_cap_list_av2 message_cap_list[] = {
+	{ MAPI_CAP_SERVER, "ECHO", NULL, &CAP_ECHO },
+	{ 0, NULL, NULL, NULL }
+};
 
-DECLARE_MODULE_AV2(message, modinit, moddeinit, message_clist, NULL, NULL, NULL, NULL, message_desc);
+DECLARE_MODULE_AV2(message, modinit, moddeinit, message_clist, NULL, NULL, message_cap_list, NULL, message_desc);
 
 struct entity
 {
@@ -229,6 +243,26 @@ m_message(enum message_type msgtype, struct MsgBuf *msgbuf_p,
 	}
 }
 
+static void
+m_echo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
+		int parc, const char *parv[])
+{
+	struct Client *target_p = find_person(parv[2]);
+	enum message_type msgtype;
+
+	if (target_p == NULL)
+		return;
+
+	switch (parv[1][0])
+	{
+	case 'P': msgtype = MESSAGE_TYPE_PRIVMSG; break;
+	case 'N': msgtype = MESSAGE_TYPE_NOTICE; break;
+	default: return;
+	}
+
+	echo_msg(source_p, target_p, msgtype, parv[3]);
+}
+
 /*
  * build_target_list
  *
@@ -513,7 +547,7 @@ msg_channel(enum message_type msgtype,
 	if((result = can_send(chptr, source_p, NULL)))
 	{
 		if(result != CAN_SEND_OPV && MyClient(source_p) &&
-		   !IsOper(source_p) &&
+		   !IsOperGeneral(source_p) &&
 		   !add_channel_target(source_p, chptr))
 		{
 			sendto_one(source_p, form_str(ERR_TARGCHANGE),
@@ -531,7 +565,7 @@ msg_channel(enum message_type msgtype,
 			(!(chptr->mode.mode & MODE_NOPRIVMSGS) ||
 			 IsMember(source_p, chptr)))
 	{
-		if(MyClient(source_p) && !IsOper(source_p) &&
+		if(MyClient(source_p) && !IsOperGeneral(source_p) &&
 		   !add_channel_target(source_p, chptr))
 		{
 			sendto_one(source_p, form_str(ERR_TARGCHANGE),
@@ -698,6 +732,33 @@ expire_tgchange(void *unused)
 	}
 }
 
+static void
+echo_msg(struct Client *source_p, struct Client *target_p,
+		enum message_type msgtype, const char *text)
+{
+	if (MyClient(target_p))
+	{
+		if (!IsCapable(target_p, CLICAP_ECHO_MESSAGE))
+			return;
+
+		sendto_one(target_p, ":%s!%s@%s %s %s :%s",
+				target_p->name, target_p->username, target_p->host,
+				cmdname[msgtype],
+				source_p->name,
+				text);
+		return;
+	}
+
+	if (!(target_p->from->serv->caps & CAP_ECHO))
+		return;
+
+	sendto_one(target_p, ":%s ECHO %c %s :%s",
+		use_id(source_p),
+		msgtype == MESSAGE_TYPE_PRIVMSG ? 'P' : 'N',
+		use_id(target_p),
+		text);
+}
+
 /*
  * msg_client
  *
@@ -718,39 +779,13 @@ msg_client(enum message_type msgtype,
 
 	if(MyClient(source_p))
 	{
-		/*
-		 * XXX: Controversial? Allow target users to send replies
-		 * through a +g.  Rationale is that people can presently use +g
-		 * as a way to taunt users, e.g. harass them and hide behind +g
-		 * as a way of griefing.  --nenolod
-		 */
-		if(msgtype != MESSAGE_TYPE_NOTICE &&
-				IsSetCallerId(source_p) &&
-				!accept_message(target_p, source_p) &&
-				!IsOper(target_p))
-		{
-			if(rb_dlink_list_length(&source_p->localClient->allow_list) <
-					(unsigned long)ConfigFileEntry.max_accept)
-			{
-				rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
-				rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
-			}
-			else
-			{
-				sendto_one_numeric(source_p, ERR_OWNMODE,
-						form_str(ERR_OWNMODE),
-						target_p->name, "+g");
-				return;
-			}
-		}
-
 		/* reset idle time for message only if its not to self
 		 * and its not a notice */
 		if(msgtype != MESSAGE_TYPE_NOTICE)
 			source_p->localClient->last = rb_current_time();
 
 		/* auto cprivmsg/cnotice */
-		do_floodcount = !IsOper(source_p) &&
+		do_floodcount = !IsOperGeneral(source_p) &&
 			!find_allowing_channel(source_p, target_p);
 
 		/* target change stuff, dont limit ctcp replies as that
@@ -775,13 +810,10 @@ msg_client(enum message_type msgtype,
 		if (do_floodcount &&
 				flood_attack_client(msgtype, source_p, target_p))
 			return;
-
-		if (IsCapable(source_p, CLICAP_ECHO_MESSAGE) && target_p != source_p)
-			sendto_anywhere_echo(target_p, source_p, cmdname[msgtype], ":%s", text);
 	}
 	else if(source_p->from == target_p->from)
 	{
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
+		sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
 				     "Send message to %s[%s] dropped from %s(Fake Dir)",
 				     target_p->name, target_p->from->name, source_p->name);
 		return;
@@ -791,22 +823,22 @@ msg_client(enum message_type msgtype,
 		sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
 				   target_p->name, target_p->user->away);
 
-	if(MyClient(target_p))
-	{
-		hdata.msgtype = msgtype;
-		hdata.source_p = source_p;
-		hdata.target_p = target_p;
-		hdata.text = text;
-		hdata.approved = 0;
+	hdata.msgtype = msgtype;
+	hdata.source_p = source_p;
+	hdata.target_p = target_p;
+	hdata.text = text;
+	hdata.approved = 0;
 
-		call_hook(h_privmsg_user, &hdata);
+	call_hook(h_privmsg_user, &hdata);
 
-		/* buffer location may have changed. */
-		text = hdata.text;
+	/* buffer location may have changed. */
+	text = hdata.text;
 
-		if (hdata.approved != 0)
-			return;
+	if (hdata.approved != 0)
+		return;
 
+	if(MyClient(target_p))
+	{
 		if (EmptyString(text))
 		{
 			/* could be empty after colour stripping and
@@ -816,50 +848,9 @@ msg_client(enum message_type msgtype,
 			return;
 		}
 
-		/* XXX Controversial? allow opers always to send through a +g */
-		if(!IsServer(source_p) && IsSetCallerId(target_p))
-		{
-			/* Here is the anti-flood bot/spambot code -db */
-			if(accept_message(source_p, target_p) || IsOper(source_p))
-			{
-				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, cmdname[msgtype], target_p->name, text);
-			}
-			else
-			{
-				/* check for accept, flag recipient incoming message */
-				if(msgtype != MESSAGE_TYPE_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())
-				{
-					if(msgtype != MESSAGE_TYPE_NOTICE)
-						sendto_one_numeric(source_p, RPL_TARGNOTIFY,
-								   form_str(RPL_TARGNOTIFY),
-								   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);
-
-					target_p->localClient->last_caller_id_time = rb_current_time();
-				}
-			}
-		}
-		else
-		{
-			add_reply_target(target_p, source_p);
-			sendto_anywhere(target_p, source_p, cmdname[msgtype], ":%s", text);
-		}
+		add_reply_target(target_p, source_p);
+		sendto_anywhere(target_p, source_p, cmdname[msgtype], ":%s", text);
+		echo_msg(target_p, source_p, msgtype, text);
 	}
 	else
 		sendto_anywhere(target_p, source_p, cmdname[msgtype], ":%s", text);
@@ -1025,6 +1016,14 @@ handle_special(enum message_type msgtype, struct Client *client_p,
 			return;
 		}
 
+		if(MyClient(source_p))
+		{
+			sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, "%s sent mass-%s to %s: %s",
+					get_oper_name(source_p),
+					msgtype == MESSAGE_TYPE_PRIVMSG ? "privmsg" : "notice",
+					nick, text);
+		}
+
 		sendto_match_butone(IsServer(client_p) ? client_p : NULL, source_p,
 				    nick + 1,
 				    (*nick == '#') ? MATCH_HOST : MATCH_SERVER,