X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4562c604897f18f08e1bee993d455d9c1774f9ad..b225bf93b7eaf8d4d6b1ac172463d280b48a782f:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 04e04f06..e3190747 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -39,6 +39,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "tgchange.h"
 
 static int m_invite(struct Client *, struct Client *, int, const char **);
 
@@ -52,7 +53,6 @@ DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 343
 static void add_invite(struct Channel *, struct Client *);
 
 /* m_invite()
- *      parv[0] - sender prefix
  *      parv[1] - user to invite
  *      parv[2] - channel name
  */
@@ -92,14 +92,6 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
-	if(!IsChannelName(parv[2]))
-	{
-		if(MyClient(source_p))
-			sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-					   form_str(ERR_NOSUCHCHANNEL), parv[2]);
-		return 0;
-	}
-
 	/* Do not send local channel invites to users if they are not on the
 	 * same server as the person sending the INVITE message. 
 	 */
@@ -110,6 +102,16 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
+	if(((MyConnect(source_p) && !IsExemptResv(source_p)) ||
+			(MyConnect(target_p) && !IsExemptResv(target_p))) &&
+		hash_find_resv(parv[2]))
+	{
+		sendto_one_numeric(source_p, ERR_BADCHANNAME,
+				   form_str(ERR_BADCHANNAME),
+				   parv[2]);
+		return 0;
+	}
+
 	if((chptr = find_channel(parv[2])) == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
@@ -153,6 +155,14 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(MyConnect(source_p))
 	{
+		if (ConfigFileEntry.target_change && !IsOper(source_p) &&
+				!find_allowing_channel(source_p, target_p) &&
+				!add_target(source_p, target_p))
+		{
+			sendto_one(source_p, form_str(ERR_TARGCHANGE),
+				   me.name, source_p->name, target_p->name);
+			return 0;
+		}
 		sendto_one(source_p, form_str(RPL_INVITING), 
 			   me.name, source_p->name,
 			   target_p->name, parv[2]);
@@ -170,6 +180,34 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(MyConnect(target_p))
 	{
+		if(!IsOper(source_p) && (IsSetCallerId(target_p) ||
+					(IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])) &&
+				!accept_message(source_p, target_p))
+		{
+			if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
+			{
+				sendto_one_numeric(source_p, ERR_NONONREG,
+						form_str(ERR_NONONREG),
+						target_p->name);
+				return 0;
+			}
+			else
+			{
+				/* instead of sending RPL_UMODEGMSG,
+				 * just let the invite through
+				 */
+				if((target_p->localClient->last_caller_id_time +
+				    ConfigFileEntry.caller_id_wait) >= rb_current_time())
+				{
+					sendto_one_numeric(source_p, ERR_TARGUMODEG,
+							   form_str(ERR_TARGUMODEG),
+							   target_p->name);
+					return 0;
+				}
+				target_p->localClient->last_caller_id_time = rb_current_time();
+			}
+		}
+		add_reply_target(target_p, source_p);
 		sendto_one(target_p, ":%s!%s@%s INVITE %s :%s", 
 			   source_p->name, source_p->username, source_p->host, 
 			   target_p->name, chptr->chname);