m_modenotice Use WriteNotice()

[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..6d17820a5a4ab95e2be156df4a5d2445f3984437 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,26 +56,25 @@ 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);
 
                if (!mh->IsListMode())
                {
-                       if (chan->IsModeSet(modeletter))
+                       if (chan->IsModeSet(mh))
                                modestack.Push(modeletter);
                }
-               else if (((prefixrank = mh->GetPrefixRank()) && (prefixchar = mh->GetPrefix())))
+               else 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)
                        {
                                if (!InspIRCd::Match(it->first->nick, pattern))
                                        continue;
-                               if (((strchr(chan->GetAllPrefixChars(user), prefixchar)) != NULL) && !(it->first == user && prefixrank > VOICE_VALUE))
+                               if (it->second->hasMode(modeletter) && !((it->first == user) && (pm->GetPrefixRank() > VOICE_VALUE)))
                                        modestack.Push(modeletter, it->first->nick);
                        }
                }
@@ -100,7 +97,7 @@ class CommandRMode : public Command
                stackresult.push_back(chan->name);
                while (modestack.GetStackedLine(stackresult))
                {
-                       ServerInstance->SendMode(stackresult, user);
+                       ServerInstance->Modes->Process(stackresult, user);
                        stackresult.erase(stackresult.begin() + 1, stackresult.end());
                }
 
@@ -115,11 +112,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);