m_operjoin Remove duplicated code

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / fjoin.cpp

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 0fb4468772bb83ea62bc2d58f3e66d59c4ab1ff4..d697af63d52f1d93d37b7d35bf14de6887d34d84 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -73,7 +73,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
        if (!TS)
        {
                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
-               ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", srcuser->server.c_str());
+               ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", srcuser->server->GetName().c_str());
                return CMD_INVALID;
        }
 
@@ -99,16 +99,8 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
                        }
                        else if (ourTS > TS)
                        {
-                               /* Our TS greater than theirs, clear all our modes from the channel, accept theirs. */
-                               if (Utils->AnnounceTSChange)
-                                       chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), channel.c_str(), (unsigned long) ourTS, (unsigned long) TS);
-
-                               // while the name is equal in case-insensitive compare, it might differ in case; use the remote version
-                               chan->name = channel;
-                               chan->age = TS;
-                               chan->ClearInvites();
-
-                               CommandFJoin::RemoveStatus(chan);
+                               // Our TS is greater than theirs, remove all modes, extensions, etc. from the channel
+                               LowerTS(chan, TS, channel);
 
                                // XXX: If the channel does not exist in the chan hash at this point, create it so the remote modes can be applied on it.
                                // This happens to 0-user permanent channels on the losing side, because those are removed (from the chan hash, then
@@ -157,7 +149,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
        }
 
        irc::modestacker modestack(true);
-       TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetSocket();
+       TreeSocket* src_socket = TreeServer::Get(srcuser)->GetSocket();
 
        /* Now, process every 'modes,uuid' pair */
        irc::tokenstream users(*params.rbegin());
@@ -190,8 +182,8 @@ bool CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeSocket* src_
        }
 
        /* Check that the user's 'direction' is correct */
-       TreeServer* route_back_again = Utils->BestRouteTo(who->server);
-       if ((!route_back_again) || (route_back_again->GetSocket() != src_socket))
+       TreeServer* route_back_again = TreeServer::Get(who);
+       if (route_back_again->GetSocket() != src_socket)
        {
                return true;
        }
@@ -248,3 +240,31 @@ void CommandFJoin::ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& s
                stackresult.erase(stackresult.begin() + 1, stackresult.end());
        }
 }
+
+void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
+{
+       if (Utils->AnnounceTSChange)
+               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :TS for %s changed from %lu to %lu", chan->name.c_str(), newname.c_str(), (unsigned long) chan->age, (unsigned long) TS);
+
+       // While the name is equal in case-insensitive compare, it might differ in case; use the remote version
+       chan->name = newname;
+       chan->age = TS;
+
+       // Remove all pending invites
+       chan->ClearInvites();
+
+       // Clear all modes
+       CommandFJoin::RemoveStatus(chan);
+
+       // Unset all extensions
+       chan->FreeAllExtItems();
+
+       // Clear the topic, if it isn't empty then send a topic change message to local users
+       if (!chan->topic.empty())
+       {
+               chan->topic.clear();
+               chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :", chan->name.c_str());
+       }
+       chan->setby.clear();
+       chan->topicset = 0;
+}