diff options
| author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-08-15 13:52:53 +0000 |
|---|---|---|
| committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-08-15 13:52:53 +0000 |
| commit | 6c5dc5e7b54edceb216a92463bf62387d0ab454b (patch) | |
| tree | 93ed3ab53f05fb1d7f7dba682c6c668ae2fbe6ea | |
| parent | d9482db7e07c3d47b61848849b08375ff1037218 (diff) | |
Partial revert of 1fb8a3f1b120db764375911be9ad8019a807a8ad by dKingston, (adding RPL_NOTOPICSET).
This is *not* defined as a return for JOIN message, and it's a bit annoying too. Keep the define and use it in TOPIC instead of '331' though.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11527 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/channels.cpp | 4 | ||||
| -rw-r--r-- | src/commands/cmd_topic.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 6c70259bc..0ff1298c1 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -466,10 +466,6 @@ 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)); diff --git a/src/commands/cmd_topic.cpp b/src/commands/cmd_topic.cpp index 280b24f4b..00b588179 100644 --- a/src/commands/cmd_topic.cpp +++ b/src/commands/cmd_topic.cpp @@ -48,7 +48,7 @@ CmdResult CommandTopic::Handle (const std::vector<std::string>& parameters, User } else { - user->WriteNumeric(331, "%s %s :No topic is set.", user->nick.c_str(), c->name.c_str()); + user->WriteNumeric(RPL_NOTOPICSET, "%s %s :No topic is set.", user->nick.c_str(), c->name.c_str()); } } return CMD_SUCCESS; |