Move topic and NAMES sending on join from core into core_channel

1 files changed, 17 insertions, 0 deletions

diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index 47f722e1e..ac590ebcc 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -34,6 +34,23 @@ class CoreModChannel : public Module
 	{
 	}
 
+	void OnPostJoin(Membership* memb) CXX11_OVERRIDE
+	{
+		Channel* const chan = memb->chan;
+		LocalUser* const localuser = IS_LOCAL(memb->user);
+		if (localuser)
+		{
+			if (chan->topicset)
+				Topic::ShowTopic(localuser, chan);
+			chan->UserList(localuser);
+		}
+	}
+
+	void Prioritize() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules.SetPriority(this, I_OnPostJoin, PRIORITY_FIRST);
+	}
+
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the INVITE, JOIN, KICK, NAMES, and TOPIC commands", VF_VENDOR|VF_CORE);