Merge patch from dKingston for missing TOPIC numeric, also replace th…

…e literal 331 with an RPL_* enum value, thanks! git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11510 e03df62e-2008-0410-955e-edbf42e46eb7
inspircd · Aug 13, 2009 · 1fb8a3f · 1fb8a3f
1 parent 911e33e
commit 1fb8a3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/include/numerics.h b/include/numerics.h
@@ -66,6 +66,7 @@ enum Numerics
 	RPL_RULESEND					=	309, // unrealircd
 	RPL_CHANNELMODEIS				=	324,
 	RPL_CHANNELCREATED				=	329, // ???
+	RPL_NOTOPICSET					=	331,
 	RPL_TOPIC					=	332,
 	RPL_TOPICTIME					=	333, // not RFC, extremely common though
 

diff --git a/src/channels.cpp b/src/channels.cpp
@@ -466,6 +466,10 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
 			user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
 			user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
 		}
+		else
+		{
+			user->WriteNumeric(RPL_NOTOPICSET, "%s %s :No topic is set", user->nick.c_str(), Ptr->name.c_str());
+		}
 		Ptr->UserList(user);
 	}
 	FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));