From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Thu, 13 Aug 2009 22:44:07 +0000 (+0000)
Subject: Merge patch from dKingston for missing TOPIC numeric, also replace the literal 331... 
X-Git-Tag: v2.0.23~1724
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=1fb8a3f1b120db764375911be9ad8019a807a8ad;p=user%2Fhenk%2Fcode%2Finspircd.git

Merge patch from dKingston for missing TOPIC numeric, also replace the literal 331 with an RPL_* enum value, thanks!


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11510 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/include/numerics.h b/include/numerics.h
index 662d1a8b3..b437397cb 100644
--- 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
index 0ff1298c1..6c70259bc 100644
--- 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));