Merge insp20

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

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index 8259d406cbc9e7cda1147675eebaa3aea69a0439..feb17383dc4954cb4c33b8c8c290abb9e3aba5d2 100644 (file)
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -20,8 +20,6 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-/* $ModDesc: Provides support for the RMODE command - Makes mass removal of chan listmodes by glob pattern possible */
-
 /** Handle /RMODE
  */
 class CommandRMode : public Command
@@ -58,52 +56,40 @@ class CommandRMode : public Command
                        return CMD_FAILURE;
                }
 
-               unsigned int prefixrank;
-               char prefixchar;
                std::string pattern = parameters.size() > 2 ? parameters[2] : "*";
+               PrefixMode* pm;
                ListModeBase* lm;
                ListModeBase::ModeList* ml;
-               irc::modestacker modestack(false);
+               Modes::ChangeList changelist;
 
-               if (!mh->IsListMode())
-               {
-                       if (chan->IsModeSet(modeletter))
-                               modestack.Push(modeletter);
-               }
-               else if (((prefixrank = mh->GetPrefixRank()) && (prefixchar = mh->GetPrefix())))
+               if ((pm = mh->IsPrefixMode()))
                {
                        // As user prefix modes don't have a GetList() method, let's iterate through the channel's users.
-                       for (UserMembIter it = chan->userlist.begin(); it != chan->userlist.end(); ++it)
+                       const Channel::MemberMap& users = chan->GetUsers();
+                       for (Channel::MemberMap::const_iterator it = users.begin(); it != users.end(); ++it)
                        {
                                if (!InspIRCd::Match(it->first->nick, pattern))
                                        continue;
-                               if (((strchr(chan->GetAllPrefixChars(user), prefixchar)) != NULL) && !(it->first == user && prefixrank > VOICE_VALUE))
-                                       modestack.Push(modeletter, it->first->nick);
+                               if (it->second->hasMode(modeletter) && !((it->first == user) && (pm->GetPrefixRank() > VOICE_VALUE)))
+                                       changelist.push_remove(mh, it->first->nick);
                        }
                }
-               else if (((lm = dynamic_cast<ListModeBase*>(mh)) != NULL) && ((ml = lm->GetList(chan)) != NULL))
+               else if ((lm = mh->IsListModeBase()) && ((ml = lm->GetList(chan)) != NULL))
                {
                        for (ListModeBase::ModeList::iterator it = ml->begin(); it != ml->end(); ++it)
                        {
                                if (!InspIRCd::Match(it->mask, pattern))
                                        continue;
-                               modestack.Push(modeletter, it->mask);
+                               changelist.push_remove(mh, it->mask);
                        }
                }
                else
                {
-                       user->WriteNotice("Could not remove channel mode " + ConvToStr(modeletter));
-                       return CMD_FAILURE;
-               }
-
-               parameterlist stackresult;
-               stackresult.push_back(chan->name);
-               while (modestack.GetStackedLine(stackresult))
-               {
-                       ServerInstance->SendMode(stackresult, user);
-                       stackresult.erase(stackresult.begin() + 1, stackresult.end());
+                       if (chan->IsModeSet(mh))
+                               changelist.push_remove(mh);
                }
 
+               ServerInstance->Modes->Process(user, chan, NULL, changelist);
                return CMD_SUCCESS;
        }
 };
@@ -115,11 +101,6 @@ class ModuleRMode : public Module
  public:
        ModuleRMode() : cmd(this) { }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows glob-based removal of list modes", VF_VENDOR);