X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f06c147c70cf72b40e4ec0ec3b5aca86662beb80..c0e2aa60b850b95f90d1d268b80e8d8165263ff5:/modules/core/m_part.c

diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index 64e9b35..3159a3f 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -58,7 +58,6 @@ static void part_one_client(struct Client *client_p,
 
 /*
 ** m_part
-**      parv[0] = sender prefix
 **      parv[1] = channel
 **      parv[2] = reason
 */
@@ -80,8 +79,6 @@ m_part(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	strip_colour(reason);
-
 	while(name)
 	{
 		part_one_client(client_p, source_p, name, reason);
@@ -104,6 +101,7 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
 {
 	struct Channel *chptr;
 	struct membership *msptr;
+	char reason2[BUFSIZE];
 
 	if((chptr = find_channel(name)) == NULL)
 	{
@@ -125,15 +123,19 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
 	 *  Remove user from the old channel (if any)
 	 *  only allow /part reasons in -m chans
 	 */
-	if(reason[0] && (is_chanop(msptr) || !MyConnect(source_p) ||
+	if(reason[0] && (is_any_op(msptr) || !MyConnect(source_p) ||
 			 ((can_send(chptr, source_p, msptr) > 0 &&
 			   (source_p->localClient->firsttime +
 			    ConfigFileEntry.anti_spam_exit_message_time) < rb_current_time()))))
 	{
+		if(chptr->mode.mode & MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr)))
+		{
+			rb_strlcpy(reason2, reason, BUFSIZE);
+			strip_colour(reason2);
+			reason = reason2;
+		}
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s PART %s :%s", use_id(source_p), chptr->chname, reason);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s PART %s :%s", source_p->name, chptr->chname, reason);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
 				     source_p->name, source_p->username,
 				     source_p->host, chptr->chname, reason);
@@ -142,8 +144,6 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
 	{
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s PART %s", use_id(source_p), chptr->chname);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s PART %s", source_p->name, chptr->chname);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
 				     source_p->name, source_p->username,
 				     source_p->host, chptr->chname);