Hide the server name/desc better when <options:hideserver> is set.

[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..8208041387a5495dded2262a0671890a54e7a48f 100644 (file)
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -1,6 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -20,8 +23,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
@@ -30,10 +31,10 @@ class CommandRMode : public Command
        CommandRMode(Module* Creator) : Command(Creator,"RMODE", 2, 3)
        {
                allow_empty_last_param = false;
-               syntax = "<channel> <mode> [pattern]";
+               syntax = "<channel> <mode> [<pattern>]";
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                ModeHandler* mh;
                Channel* chan = ServerInstance->FindChan(parameters[0]);
@@ -41,69 +42,57 @@ 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())
+               if (chan->GetPrefixValue(user) < mh->GetLevelRequired(false))
                {
-                       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);
+               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(pm) && !((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->WriteServ("NOTICE %s :Could not remove channel mode %c", user->nick.c_str(), 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,14 +104,9 @@ 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);
+               return Version("Allows removal of channel list modes using glob patterns.", VF_VENDOR);
        }
 };