Improve UserManager::QuitUser() and related code

[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 7b7c66da2f0d161409ab57a7fa90090081163259..dde9f496e637ede0e897d124967d3412315ef5e3 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
@@ -41,47 +39,41 @@ class CommandRMode : public Command
 
                if (chan == NULL)
                {
-                       user->WriteServ("NOTICE %s :The channel %s does not exist.", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNotice("The channel " + parameters[0] + " does not exist.");
                        return CMD_FAILURE;
                }
 
                mh = ServerInstance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
                if (mh == NULL || parameters[1].size() > 1)
                {
-                       user->WriteServ("NOTICE %s :%s is not a valid channel mode.", user->nick.c_str(), parameters[1].c_str());
+                       user->WriteNotice(parameters[1] + " is not a valid channel mode.");
                        return CMD_FAILURE;
                }
 
                if (chan->GetPrefixValue(user) < mh->GetLevelRequired())
                {
-                       user->WriteServ("NOTICE %s :You do not have access to unset %c on %s.", user->nick.c_str(), modeletter, chan->name.c_str());
+                       user->WriteNotice("You do not have access to unset " + ConvToStr(modeletter) + " on " +  chan->name + ".");
                        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))
-                               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)
                        {
                                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);
                        }
                }
-               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)
                        {
@@ -92,15 +84,15 @@ class CommandRMode : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :Could not remove channel mode %c", user->nick.c_str(), modeletter);
-                       return CMD_FAILURE;
+                       if (chan->IsModeSet(mh))
+                               modestack.Push(modeletter);
                }
 
                parameterlist stackresult;
                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,12 +107,7 @@ class ModuleRMode : public Module
  public:
        ModuleRMode() : cmd(this) { }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows glob-based removal of list modes", VF_VENDOR);
        }