Merge patch from dKingston for missing TOPIC numeric, also replace the literal 331...

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 662d1a8b3a5e46e3ea86dc40fbed52ca978ca83e..b437397cbc6068f6ac8877a282d2257d50cf3791 100644 (file)
--- 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 0ff1298c118729fd23187ea09a6ba7336d6efce5..6c70259bcea4a78bbfc5379d27c81629edd87ae9 100644 (file)
--- 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));