X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rmode.cpp;h=8208041387a5495dded2262a0671890a54e7a48f;hb=6cfabb0064cab52bbbab59974e53dc0fa1954da7;hp=dde9f496e637ede0e897d124967d3412315ef5e3;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index dde9f496e..820804138 100644
--- 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
@@ -28,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]);
@@ -50,7 +53,7 @@ class CommandRMode : public Command
 			return CMD_FAILURE;
 		}
 
-		if (chan->GetPrefixValue(user) < mh->GetLevelRequired())
+		if (chan->GetPrefixValue(user) < mh->GetLevelRequired(false))
 		{
 			user->WriteNotice("You do not have access to unset " + ConvToStr(modeletter) + " on " +  chan->name + ".");
 			return CMD_FAILURE;
@@ -60,17 +63,18 @@ class CommandRMode : public Command
 		PrefixMode* pm;
 		ListModeBase* lm;
 		ListModeBase::ModeList* ml;
-		irc::modestacker modestack(false);
+		Modes::ChangeList changelist;
 
 		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 (it->second->hasMode(modeletter) && !((it->first == user) && (pm->GetPrefixRank() > 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 = mh->IsListModeBase()) && ((ml = lm->GetList(chan)) != NULL))
@@ -79,23 +83,16 @@ class CommandRMode : public Command
 			{
 				if (!InspIRCd::Match(it->mask, pattern))
 					continue;
-				modestack.Push(modeletter, it->mask);
+				changelist.push_remove(mh, it->mask);
 			}
 		}
 		else
 		{
 			if (chan->IsModeSet(mh))
-				modestack.Push(modeletter);
-		}
-
-		parameterlist stackresult;
-		stackresult.push_back(chan->name);
-		while (modestack.GetStackedLine(stackresult))
-		{
-			ServerInstance->Modes->Process(stackresult, user);
-			stackresult.erase(stackresult.begin() + 1, stackresult.end());
+				changelist.push_remove(mh);
 		}
 
+		ServerInstance->Modes->Process(user, chan, NULL, changelist);
 		return CMD_SUCCESS;
 	}
 };
@@ -109,7 +106,7 @@ class ModuleRMode : public Module
 
 	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);
 	}
 };