X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/06a7954fa1271648acba974c2dfa157bd4d0a54f..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_topic.c?ds=sidebyside

diff --git a/modules/m_topic.c b/modules/m_topic.c
index da5a8c2..ff72fb4 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -32,6 +32,7 @@
 #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,46 +62,86 @@ 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;
 	}
 
 	/* setting topic */
 	if(parc > 2)
 	{
+		char topic_info[USERHOST_REPLYLEN];
+
 		msptr = find_channel_membership(chptr, source_p);
 
 		if(msptr == NULL)
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
-					form_str(ERR_NOTONCHANNEL), parv[1]);
+					form_str(ERR_NOTONCHANNEL), name);
 			return 0;
 		}
 
-		if((chptr->mode.mode & MODE_TOPICLIMIT) == 0 || is_chanop(msptr))
+		if(MyClient(source_p) && (chptr->mode.mode & MODE_TOPICLIMIT) && !is_chanop(msptr))
 		{
-			char topic_info[USERHOST_REPLYLEN];
-			rb_sprintf(topic_info, "%s!%s@%s",
-					source_p->name, source_p->username, source_p->host);
+			if(IsOverride(source_p))
+			{
+				sendto_wallops_flags(UMODE_WALLOP, &me,
+						"%s is overriding TOPIC on [%s]",
+						get_oper_name(source_p), chptr->chname);
+				sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+						":%s WALLOPS :%s is overriding TOPIC on [%s]",
+						me.name, get_oper_name(source_p), chptr->chname);
+			}
+			else
+			{
+				sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+						me.name, source_p->name, parv[1]);
+				return 0;
+			}
+
+		}
+
+			if(ConfigChannel.host_in_topic)
+				rb_sprintf(topic_info, "%s!%s@%s",
+						source_p->name, source_p->username, source_p->host);
+			else
+				rb_strlcpy(topic_info, source_p->name, sizeof(topic_info));
+
 			set_channel_topic(chptr, parv[2], topic_info, rb_current_time());
 
 			sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
@@ -113,22 +153,22 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 					source_p->name, source_p->username,
 					source_p->host, chptr->chname,
 					chptr->topic == NULL ? "" : chptr->topic);
-		}
-		else
-			sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-					me.name, source_p->name, parv[1]);
+
 	}
 	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),
@@ -145,7 +185,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