]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Remove JOIN sending, all should be FJOIN
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Mon, 5 May 2008 21:21:13 +0000 (21:21 +0000)
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Mon, 5 May 2008 21:21:13 +0000 (21:21 +0000)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9651 e03df62e-2008-0410-955e-edbf42e46eb7

src/modules/m_spanningtree/main.cpp

index 480d5266df4a14e18997832889fee704a1d03efc..4a401b8c882ead4a12e0f314299ccb8ca51df5ff 100644 (file)
@@ -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);
        }
 }