X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..ea41b24fd4807e3565bf5f8f293e2efc4c20b62d:/modules/m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index 106c689f..e4e734b2 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -41,8 +41,11 @@
 #include "logger.h"
 #include "inline/stringops.h"
 
-static int m_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char topic_desc[] =
+	"Provides the TOPIC command to set, remove, and inspect channel topics";
+
+static void m_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message topic_msgtab = {
 	"TOPIC", 0, 0, 0, 0,
@@ -50,14 +53,14 @@ struct Message topic_msgtab = {
 };
 
 mapi_clist_av1 topic_clist[] = { &topic_msgtab, NULL };
-DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(topic, NULL, NULL, topic_clist, NULL, NULL, NULL, NULL, topic_desc);
 
 /*
  * m_topic
  *      parv[1] = channel name
  *	parv[2] = new topic, if setting topic
  */
-static int
+static void
 m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
@@ -80,7 +83,7 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		{
 			sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
 					me.name, source_p->name, "TOPIC");
-			return 0;
+			return;
 		}
 	}
 
@@ -93,7 +96,7 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				form_str(ERR_NOSUCHCHANNEL), name);
-		return 0;
+		return;
 	}
 
 	/* setting topic */
@@ -105,16 +108,16 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
 					form_str(ERR_NOTONCHANNEL), name);
-			return 0;
+			return;
 		}
 
 		if(MyClient(source_p) && !is_chanop_voiced(msptr) &&
-				!IsOper(source_p) &&
+				!IsOperGeneral(source_p) &&
 				!add_channel_target(source_p, chptr))
 		{
 			sendto_one(source_p, form_str(ERR_TARGCHANGE),
 				   me.name, source_p->name, chptr->chname);
-			return 0;
+			return;
 		}
 
 		if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
@@ -137,7 +140,7 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 					":%s TOPIC %s :%s",
 					use_id(source_p), chptr->chname,
 					chptr->topic == NULL ? "" : chptr->topic);
-			sendto_channel_local(ALL_MEMBERS,
+			sendto_channel_local(source_p, ALL_MEMBERS,
 					chptr, ":%s!%s@%s TOPIC %s :%s",
 					source_p->name, source_p->username,
 					source_p->host, chptr->chname,
@@ -157,7 +160,7 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		{
 			sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
 					form_str(ERR_NOTONCHANNEL), name);
-			return 0;
+			return;
 		}
 		if(chptr->topic == NULL)
 			sendto_one(source_p, form_str(RPL_NOTOPIC),
@@ -173,8 +176,6 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 					(unsigned long)chptr->topic_time);
 		}
 	}
-
-	return 0;
 }
 
 /*
@@ -186,19 +187,17 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
  *
  * Let servers always set a topic
  */
-static int
+static void
 ms_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
 
 	if((chptr = find_channel(parv[1])) == NULL)
-		return 0;
+		return;
 
 	set_channel_topic(chptr, parv[4], parv[2], atoi(parv[3]));
 
-	sendto_channel_local(ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
+	sendto_channel_local(source_p, ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
 			     source_p->name, parv[1],
 			     chptr->topic == NULL ? "" : chptr->topic);
-
-	return 0;
 }