X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2498a1b577ac3901abbff2612d3647f8aef038b7..5b71b8ec50ffe1889f7502472cc89b73272353f3:/modules/core/m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index df3d97d..162cef6 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"
@@ -46,6 +45,7 @@
 #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 **);
@@ -54,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)
 {
@@ -498,7 +500,7 @@ msg_channel(int p_or_n, const char *command,
 			source_p->localClient->last = rb_current_time();
 	}
 
-	if(chptr->mode.mode & MODE_NOREPEAT)
+	if(chptr->mode.mode & ModuleModes.MODE_NOREPEAT)
 	{
 		rb_strlcpy(text2, text, BUFSIZE);
 		strip_unprintable(text2);
@@ -516,7 +518,7 @@ msg_channel(int p_or_n, const char *command,
 		channel_metadata_add(chptr, "NOREPEAT", text2, 0);
 	}
 
-	if(chptr->mode.mode & MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
+	if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
 	{
 		rb_strlcpy(text2, text, BUFSIZE);
 		strip_colour(text2);
@@ -537,7 +539,7 @@ 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 && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
+			if (strlen(text) > 10 && chptr->mode.mode & ModuleModes.MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr)))
 			{
 				rb_strlcpy(text2, text, BUFSIZE);
 				strip_unprintable(text2);
@@ -553,12 +555,12 @@ msg_channel(int p_or_n, const char *command,
 					return;
 				}
 			}
-			if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
+			if (p_or_n != PRIVMSG && chptr->mode.mode & ModuleModes.MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
 			{
 				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 &&
+			if (p_or_n != NOTICE && chptr->mode.mode & ModuleModes.MODE_NOACTION &&
 					!strncasecmp(text + 1, "ACTION", 6) &&
 					(!ConfigChannel.exempt_cmode_D || !is_any_op(msptr)))
 			{
@@ -568,7 +570,7 @@ msg_channel(int p_or_n, const char *command,
 			if (p_or_n != NOTICE && *text == '\001' &&
 					strncasecmp(text + 1, "ACTION", 6))
 			{
-				if (chptr->mode.mode & MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
+				if (chptr->mode.mode & ModuleModes.MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
 				{
 					sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - CTCPs to this channel are disallowed (+C set)", chptr->chname);
 					return;
@@ -580,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)))
 	{
@@ -617,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);
@@ -632,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)))
 	{
@@ -781,6 +783,17 @@ msg_client(int p_or_n, const char *command,
 		sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
 				   target_p->name, target_p->user->away);
 
+	/*
+	 * 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(MyClient(source_p) && IsSetCallerId(source_p) && !accept_message(target_p, source_p))
+	{
+		rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
+		rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
+	}
+
 	if(MyClient(target_p))
 	{
 		if (IsSetNoCTCP(target_p) && p_or_n != NOTICE && *text == '\001' && strncasecmp(text + 1, "ACTION", 6))