X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d99380b61b3fa166d2105bc017508392dbb38939..377b98f0794834938a3fc1e5959236a7927d19d7:/modules/m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index bc2bc16..d8ad5b9 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -28,10 +28,11 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
+#include "s_newconf.h"
 #include "s_conf.h"
 #include "s_serv.h"
 #include "msg.h"
@@ -52,7 +53,6 @@ DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $
 
 /*
  * m_topic
- *      parv[0] = sender prefix
  *      parv[1] = channel name
  *	parv[2] = new topic, if setting topic
  */
@@ -62,26 +62,43 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 	struct Channel *chptr = NULL;
 	struct membership *msptr;
 	char *p = NULL;
+	const char *name;
+	int operspy = 0;
 
 	if((p = strchr(parv[1], ',')))
 		*p = '\0';
 
+	name = parv[1];
+
+	if(IsOperSpy(source_p) && parv[1][0] == '!')
+	{
+		name++;
+		operspy = 1;
+
+		if(EmptyString(name))
+		{
+			sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
+					me.name, source_p->name, "TOPIC");
+			return 0;
+		}
+	}
+
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	if(!IsChannelName(parv[1]))
+	if(!IsChannelName(name))
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
+				   form_str(ERR_NOSUCHCHANNEL), name);
 		return 0;
 	}
 
-	chptr = find_channel(parv[1]);
+	chptr = find_channel(name);
 
 	if(chptr == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-				form_str(ERR_NOSUCHCHANNEL), parv[1]);
+				form_str(ERR_NOSUCHCHANNEL), name);
 		return 0;
 	}
 
@@ -93,7 +110,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		if(msptr == NULL)
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
-					form_str(ERR_NOTONCHANNEL), parv[1]);
+					form_str(ERR_NOTONCHANNEL), name);
 			return 0;
 		}
 
@@ -108,10 +125,6 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 					":%s TOPIC %s :%s",
 					use_id(source_p), chptr->chname,
 					chptr->topic == NULL ? "" : chptr->topic);
-			sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-					":%s TOPIC %s :%s",
-					source_p->name, chptr->chname,
-					chptr->topic == NULL ? "" : chptr->topic);
 			sendto_channel_local(ALL_MEMBERS,
 					chptr, ":%s!%s@%s TOPIC %s :%s",
 					source_p->name, source_p->username,
@@ -120,19 +133,22 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		}
 		else
 			sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-					me.name, source_p->name, parv[1]);
+					me.name, source_p->name, name);
 	}
 	else if(MyClient(source_p))
 	{
-		if(!IsMember(source_p, chptr) && SecretChannel(chptr))
+		if(operspy)
+			report_operspy(source_p, "TOPIC", chptr->chname);
+		if(!IsMember(source_p, chptr) && SecretChannel(chptr) &&
+				!operspy)
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
-					form_str(ERR_NOTONCHANNEL), parv[1]);
+					form_str(ERR_NOTONCHANNEL), name);
 			return 0;
 		}
 		if(chptr->topic == NULL)
 			sendto_one(source_p, form_str(RPL_NOTOPIC),
-					me.name, source_p->name, parv[1]);
+					me.name, source_p->name, name);
 		else
 		{
 			sendto_one(source_p, form_str(RPL_TOPIC),
@@ -149,7 +165,6 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_topic
- *      parv[0] = sender prefix
  *      parv[1] = channel name
  *	parv[2] = topic_info
  *	parv[3] = topic_info time