X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/631b4a542a4a68a4a1d8a59d163768b9100aeb0f..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index 7e6206e4..9effb2ab 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -39,6 +39,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "tgchange.h"
 
 static int m_topic(struct Client *, struct Client *, int, const char **);
 static int ms_topic(struct Client *, struct Client *, int, const char **);
@@ -86,13 +87,6 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	if(!IsChannelName(name))
-	{
-		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-				   form_str(ERR_NOSUCHCHANNEL), name);
-		return 0;
-	}
-
 	chptr = find_channel(name);
 
 	if(chptr == NULL)
@@ -114,7 +108,19 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 			return 0;
 		}
 
-		if((chptr->mode.mode & MODE_TOPICLIMIT) == 0 || is_chanop(msptr))
+		if(MyClient(source_p) && !is_chanop_voiced(msptr) &&
+				!IsOper(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;
+		}
+
+		if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
+					get_channel_access(source_p, msptr) >= CHFL_CHANOP) &&
+				(!MyClient(source_p) ||
+				 can_send(chptr, source_p, msptr)))
 		{
 			char topic_info[USERHOST_REPLYLEN];
 			rb_sprintf(topic_info, "%s!%s@%s",
@@ -157,7 +163,8 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 			sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
 					me.name, source_p->name, chptr->chname,
-					chptr->topic_info, chptr->topic_time);
+					chptr->topic_info,
+					(unsigned long)chptr->topic_time);
 		}
 	}
 
@@ -178,17 +185,14 @@ ms_topic(struct Client *client_p, struct Client *source_p, int parc, const char
 {
 	struct Channel *chptr = NULL;
 
-	if(IsChannelName(parv[1]))
-	{
-		if((chptr = find_channel(parv[1])) == NULL)
-			return 0;
+	if((chptr = find_channel(parv[1])) == NULL)
+		return 0;
 
-		set_channel_topic(chptr, parv[4], parv[2], atoi(parv[3]));
+	set_channel_topic(chptr, parv[4], parv[2], atoi(parv[3]));
 
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
-				     source_p->name, parv[1], 
-				     chptr->topic == NULL ? "" : chptr->topic);
-	}
+	sendto_channel_local(ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
+			     source_p->name, parv[1], 
+			     chptr->topic == NULL ? "" : chptr->topic);
 
 	return 0;
 }