m_spanningtree Remove remains of the KeepNickTS workaround

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

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index c52dffa4124d1f29a85365b1a0d0e3a6524d18e0..dc48c87df43534d1af9c9c8dc55520225346ff4c 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -151,8 +151,8 @@ void TreeSocket::SendCapabilities(int phase)
                        " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
                        extra+
                        " PREFIX="+ServerInstance->Modes->BuildPrefixes()+
-                       " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
-                       " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)
+                       " CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+
+                       " USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)
                        );
 
        this->WriteLine("CAPAB END");
@@ -283,7 +283,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                }
                else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end())
                {
-                       if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MASK_CHANNEL))
+                       if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL))
                                reason = "One or more of the channel modes on the remote server are invalid on this server.";
                }
 
@@ -305,7 +305,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                }
                else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end())
                {
-                       if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MASK_USER))
+                       if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_USER))
                                reason = "One or more of the user modes on the remote server are invalid on this server.";
                }