Remove ProtocolInterface::SendMode()

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 1a02b5ec727a3ba29869d2995244be23cc032ac7..8081188f568e4a6f2ca4874ad6264448148da529 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -35,7 +35,7 @@ ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modelett
 
 CullResult ModeHandler::cull()
 {
-       if (ServerInstance->Modes)
+       if (ServerInstance)
                ServerInstance->Modes->DelMode(this);
        return classbase::cull();
 }
@@ -182,9 +182,9 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ
        }
 }
 
-PrefixMode::PrefixMode(Module* Creator, const std::string& Name, char ModeLetter)
+PrefixMode::PrefixMode(Module* Creator, const std::string& Name, char ModeLetter, unsigned int Rank, char PrefixChar)
        : ModeHandler(Creator, Name, ModeLetter, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_PREFIX)
-       , prefix(0), prefixrank(0)
+       , prefix(PrefixChar), prefixrank(Rank)
 {
        list = true;
        m_paramtype = TR_NICK;
@@ -375,6 +375,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
        LastParse.clear();
        LastParseParams.clear();
        LastParseTranslate.clear();
+       LastChangeList.clear();
 
        if ((!targetchannel) && ((!targetuser) || (IS_SERVER(targetuser))))
        {
@@ -403,10 +404,10 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
                return;
        }
 
-       std::string mode_sequence = parameters[1];
+       const std::string& mode_sequence = parameters[1];
 
        std::string output_mode;
-       std::ostringstream output_parameters;
+       std::string output_parameters;
        LastParseParams.push_back(output_mode);
        LastParseTranslate.push_back(TR_TEXT);
 
@@ -469,12 +470,14 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 
                if (pcnt)
                {
-                       output_parameters << " " << parameter;
+                       output_parameters.push_back(' ');
+                       output_parameters.append(parameter);
                        LastParseParams.push_back(parameter);
                        LastParseTranslate.push_back(mh->GetTranslateType());
                }
+               LastChangeList.push(mh, adding, parameter);
 
-               if ( (output_mode.length() + output_parameters.str().length() > 450)
+               if ((output_mode.length() + output_parameters.length() > 450)
                                || (output_mode.length() > 100)
                                || (LastParseParams.size() > ServerInstance->Config->Limits.MaxModes))
                {
@@ -490,17 +493,14 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
                LastParse = targetchannel ? targetchannel->name : targetuser->nick;
                LastParse.append(" ");
                LastParse.append(output_mode);
-               LastParse.append(output_parameters.str());
-
-               if (!(flags & MODE_LOCALONLY))
-                       ServerInstance->PI->SendMode(user, targetuser, targetchannel, LastParseParams, LastParseTranslate);
+               LastParse.append(output_parameters);
 
                if (targetchannel)
                        targetchannel->WriteChannel(user, "MODE " + LastParse);
                else
                        targetuser->WriteFrom(user, "MODE " + LastParse);
 
-               FOREACH_MOD(OnMode, (user, targetuser, targetchannel, LastParseParams, LastParseTranslate));
+               FOREACH_MOD(OnMode, (user, targetuser, targetchannel, LastChangeList, flags, output_mode));
        }
        else if (targetchannel && parameters.size() == 2)
        {
@@ -511,7 +511,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
        }
 }
 
-void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_sequence)
+void ModeParser::DisplayListModes(User* user, Channel* chan, const std::string& mode_sequence)
 {
        seq++;
 
@@ -693,15 +693,20 @@ bool ModeParser::DelMode(ModeHandler* mh)
        switch (mh->GetModeType())
        {
                case MODETYPE_USER:
-                       for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); )
+               {
+                       const user_hash& users = ServerInstance->Users->GetUsers();
+                       for (user_hash::const_iterator i = users.begin(); i != users.end(); )
                        {
                                User* user = i->second;
                                ++i;
                                mh->RemoveMode(user);
                        }
+               }
                break;
                case MODETYPE_CHANNEL:
-                       for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); )
+               {
+                       const chan_hash& chans = ServerInstance->GetChans();
+                       for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); )
                        {
                                // The channel may not be in the hash after RemoveMode(), see m_permchannels
                                Channel* chan = i->second;
@@ -718,6 +723,7 @@ bool ModeParser::DelMode(ModeHandler* mh)
                                        stackresult.erase(stackresult.begin() + 1, stackresult.end());
                                }
                        }
+               }
                break;
        }
 
@@ -909,8 +915,8 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker& stack)
 
 void PrefixMode::RemoveMode(Channel* chan, irc::modestacker& stack)
 {
-       const UserMembList* userlist = chan->GetUsers();
-       for (UserMembCIter i = userlist->begin(); i != userlist->end(); ++i)
+       const Channel::MemberMap& userlist = chan->GetUsers();
+       for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i)
        {
                if (i->second->hasMode(this->GetModeChar()))
                        stack.Push(this->GetModeChar(), i->first->nick);
@@ -919,13 +925,13 @@ void PrefixMode::RemoveMode(Channel* chan, irc::modestacker& stack)
 
 struct builtin_modes
 {
-       ModeChannelSecret s;
-       ModeChannelPrivate p;
-       ModeChannelModerated m;
-       ModeChannelTopicOps t;
+       SimpleChannelModeHandler s;
+       SimpleChannelModeHandler p;
+       SimpleChannelModeHandler m;
+       SimpleChannelModeHandler t;
 
-       ModeChannelNoExternal n;
-       ModeChannelInviteOnly i;
+       SimpleChannelModeHandler n;
+       SimpleChannelModeHandler i;
        ModeChannelKey k;
        ModeChannelLimit l;
 
@@ -933,10 +939,21 @@ struct builtin_modes
        ModeChannelOp o;
        ModeChannelVoice v;
 
-       ModeUserInvisible ui;
+       SimpleUserModeHandler ui;
        ModeUserOperator uo;
        ModeUserServerNoticeMask us;
 
+       builtin_modes()
+               : s(NULL, "secret", 's')
+               , p(NULL, "private", 'p')
+               , m(NULL, "moderated", 'm')
+               , t(NULL, "topiclock", 't')
+               , n(NULL, "noextmsg", 'n')
+               , i(NULL, "inviteonly", 'i')
+               , ui(NULL, "invisible", 'i')
+       {
+       }
+
        void init()
        {
                ServiceProvider* modes[] = { &s, &p, &m, &t, &n, &i, &k, &l, &b, &o, &v,