X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rmode.cpp;h=dde9f496e637ede0e897d124967d3412315ef5e3;hb=52e4d9c96c83ca4bbbeb487966ac2897a384907d;hp=542df70a536afca414643073e4eb3c24d9a0026d;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index 542df70a5..dde9f496e 100644
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -56,30 +56,24 @@ 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(mh))
-				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)
 			{
@@ -90,8 +84,8 @@ class CommandRMode : public Command
 		}
 		else
 		{
-			user->WriteNotice("Could not remove channel mode " + ConvToStr(modeletter));
-			return CMD_FAILURE;
+			if (chan->IsModeSet(mh))
+				modestack.Push(modeletter);
 		}
 
 		parameterlist stackresult;
@@ -113,11 +107,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);