Clean up some FJOIN stuff

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

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index eacd9ee04effd3ad2ccde1388d0f0ad8c510f607..d8849ac446fe050a2d17bc17cd6fe33f5f9ed392 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -184,3 +184,24 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
        return true;
 }
 
+/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
+ */
+bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> &params)
+{
+       if (params.size() < 1)
+               return true;
+
+       Channel* c = Instance->FindChan(params[0]);
+
+       if (c)
+       {
+               for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
+               {
+                       ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
+                       if (mh)
+                               mh->RemoveMode(c);
+               }
+       }
+       return true;
+}
+ 

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 7fbf9b4ad3dfc002caa750381f477a668d057b53..beee39a56a49f6ce2065845990028b4ed652ca06 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -50,25 +50,6 @@ bool TreeSocket::Error(std::deque<std::string> &params)
        return false;
 }
 
-/** TODO: This creates a total mess of output and needs to really use irc::modestacker.
- */
-bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string> &params)
-{
-       if (params.size() < 1)
-               return true;
-       Channel* c = Instance->FindChan(params[0]);
-       if (c)
-       {
-               for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
-               {
-                       ModeHandler* mh = Instance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
-                       if (mh)
-                               mh->RemoveMode(c);
-               }
-       }
-       return true;
-}
-
 bool TreeSocket::RemoteServer(const std::string &prefix, std::deque<std::string> &params)
 {
        if (params.size() < 5)
@@ -627,10 +608,6 @@ bool TreeSocket::ProcessLine(std::string &line)
                        {
                                return this->MetaData(prefix,params);
                        }
-                       else if (command == "REMSTATUS")
-                       {
-                               return this->RemoveStatus(prefix,params);
-                       }
                        else if (command == "PING")
                        {
                                return this->LocalPing(prefix,params);