X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3f76eb8a8c867e52c99353b14035222b9e36557a..45b9f1cbc0e0be0cc8801be9f61796fa603ad462:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index f09021c..6ed4471 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -153,6 +153,14 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
+	if (IsSetNoInvite(target_p))
+	{
+		sendto_one_numeric(source_p, ERR_NOINVITE,
+				form_str(ERR_NOINVITE),
+				target_p->name);
+		return 0;
+	}
+
 	/* store invites when they could affect the ability to join
 	 * for +l/+j just check if the mode is set, this varies over time
 	 */
@@ -169,7 +177,7 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			sendto_one(source_p, form_str(ERR_TARGCHANGE),
 				   me.name, source_p->name, target_p->name);
-			return;
+			return 0;
 		}
 		sendto_one(source_p, form_str(RPL_INVITING), 
 			   me.name, source_p->name,
@@ -188,6 +196,33 @@ 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,