From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 5 May 2008 21:21:13 +0000 (+0000)
Subject: Remove JOIN sending, all should be FJOIN
X-Git-Tag: v2.0.23~3231
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=3b2aed3757500450351ee2195b29afa39dacd346;p=user%2Fhenk%2Fcode%2Finspircd.git

Remove JOIN sending, all should be FJOIN


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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 480d5266d..4a401b8c8 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -578,25 +578,15 @@ void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, boo
 	// Only do this for local users
 	if (IS_LOCAL(user))
 	{
-		if (channel->GetUserCounter() == 1)
-		{
-			std::deque<std::string> params;
-			// set up their permissions and the channel TS with FJOIN.
-			// All users are FJOINed now, because a module may specify
-			// new joining permissions for the user.
-			params.push_back(channel->name);
-			params.push_back(ConvToStr(channel->age));
-			params.push_back(std::string("+") + channel->ChanModes(true));
-			params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid));
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
-		}
-		else
-		{
-			std::deque<std::string> params;
-			params.push_back(channel->name);
-			params.push_back(ConvToStr(channel->age));
-			Utils->DoOneToMany(user->uuid,"JOIN",params);
-		}
+		std::deque<std::string> params;
+		// set up their permissions and the channel TS with FJOIN.
+		// All users are FJOINed now, because a module may specify
+		// new joining permissions for the user.
+		params.push_back(channel->name);
+		params.push_back(ConvToStr(channel->age));
+		params.push_back(std::string("+") + channel->ChanModes(true));
+		params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid));
+		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
 	}
 }