From 3b2aed3757500450351ee2195b29afa39dacd346 Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 5 May 2008 21:21:13 +0000 Subject: Remove JOIN sending, all should be FJOIN git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9651 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/main.cpp | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) 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 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 params; - params.push_back(channel->name); - params.push_back(ConvToStr(channel->age)); - Utils->DoOneToMany(user->uuid,"JOIN",params); - } + std::deque 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); } } -- cgit v1.2.3