1 files changed, 32 insertions, 89 deletions

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 9f1f6cc5e..51281a528 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -22,148 +22,85 @@
  * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru
  */
 
-/* $ModDesc: Gives opers cmode +y which provides a staff prefix. */
-
 #include "inspircd.h"
 
 #define OPERPREFIX_VALUE 1000000
 
-class OperPrefixMode : public ModeHandler
+class OperPrefixMode : public PrefixMode
 {
 	public:
-		OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+		OperPrefixMode(Module* Creator)
+			: PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
 		{
 			std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-			list = true;
 			prefix = pfx.empty() ? '!' : pfx[0];
-			levelrequired = OPERPREFIX_VALUE;
-			m_paramtype = TR_NICK;
-		}
-
-		unsigned int GetPrefixRank()
-		{
-			return OPERPREFIX_VALUE;
+			levelrequired = INT_MAX;
 		}
-
-		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-		{
-			if (IS_SERVER(source) || ServerInstance->ULine(source->server))
-				return MODEACTION_ALLOW;
-			else
-			{
-				if (channel)
-					source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only servers are permitted to change channel mode '%c'", source->nick.c_str(), channel->name.c_str(), 'y');
-				return MODEACTION_DENY;
-			}
-		}
-
-		bool NeedsOper() { return true; }
 };
 
 class ModuleOperPrefixMode;
 class HideOperWatcher : public ModeWatcher
 {
 	ModuleOperPrefixMode* parentmod;
+
  public:
-	HideOperWatcher(ModuleOperPrefixMode* parent) : ModeWatcher((Module*) parent, 'H', MODETYPE_USER), parentmod(parent) {}
-	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
+	HideOperWatcher(ModuleOperPrefixMode* parent);
+	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
 };
 
 class ModuleOperPrefixMode : public Module
 {
- private:
 	OperPrefixMode opm;
-	bool mw_added;
 	HideOperWatcher hideoperwatcher;
+	UserModeReference hideopermode;
+
  public:
 	ModuleOperPrefixMode()
-		: opm(this), mw_added(false), hideoperwatcher(this)
-	{
-	}
-
-	void init()
+		: opm(this), hideoperwatcher(this)
+		, hideopermode(this, "hideoper")
 	{
-		ServerInstance->Modules->AddService(opm);
-
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule, I_OnPostJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
 		/* To give clients a chance to learn about the new prefix we don't give +y to opers
 		 * right now. That means if the module was loaded after opers have joined channels
 		 * they need to rejoin them in order to get the oper prefix.
 		 */
-
-		if (ServerInstance->Modules->Find("m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
-	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		/* The user may have the +H umode on himself, but +H does not necessarily correspond
-		 * to the +H of m_hideoper.
-		 * However we only add the modewatcher when m_hideoper is loaded, so these
-		 * conditions (mw_added and the user being +H) together mean the user is a hidden oper.
-		 */
-
-		if (IS_OPER(user) && (!mw_added || !user->IsModeSet('H')))
+		if ((user->IsOper()) && (!user->IsModeSet(hideopermode)))
 			privs.push_back('y');
 		return MOD_RES_PASSTHRU;
 	}
 
 	void OnPostJoin(Membership* memb)
 	{
-		if ((!IS_LOCAL(memb->user)) || (!IS_OPER(memb->user)) || (((mw_added) && (memb->user->IsModeSet('H')))))
+		if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode)))
 			return;
 
 		if (memb->hasMode(opm.GetModeChar()))
 			return;
 
 		// The user was force joined and OnUserPreJoin() did not run. Set the operprefix now.
-		std::vector<std::string> modechange;
-		modechange.push_back(memb->chan->name);
-		modechange.push_back("+y");
-		modechange.push_back(memb->user->nick);
-		ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
+		Modes::ChangeList changelist;
+		changelist.push_add(&opm, memb->user->nick);
+		ServerInstance->Modes.Process(ServerInstance->FakeClient, memb->chan, NULL, changelist);
 	}
 
 	void SetOperPrefix(User* user, bool add)
 	{
-		std::vector<std::string> modechange;
-		modechange.push_back("");
-		modechange.push_back(add ? "+y" : "-y");
-		modechange.push_back(user->nick);
-		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-		{
-			modechange[0] = (*v)->name;
-			ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
-		}
+		Modes::ChangeList changelist;
+		changelist.push(&opm, add, user->nick);
+		for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
+			ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist);
 	}
 
-	void OnPostOper(User* user, const std::string& opername, const std::string& opertype)
+	void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
 	{
-		if (IS_LOCAL(user) && (!mw_added || !user->IsModeSet('H')))
+		if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode)))
 			SetOperPrefix(user, true);
 	}
 
-	void OnLoadModule(Module* mod)
-	{
-		if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so"))
-			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
-	}
-
-	void OnUnloadModule(Module* mod)
-	{
-		if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher)))
-			mw_added = false;
-	}
-
-	~ModuleOperPrefixMode()
-	{
-		if (mw_added)
-			ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
 	}
@@ -176,10 +113,16 @@ class ModuleOperPrefixMode : public Module
 	}
 };
 
-void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding, ModeType type)
+HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
+	: ModeWatcher(parent, "hideoper", MODETYPE_USER)
+	, parentmod(parent)
+{
+}
+
+void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
 {
 	// If hideoper is being unset because the user is deopering, don't set +y
-	if (IS_LOCAL(dest) && IS_OPER(dest))
+	if (IS_LOCAL(dest) && dest->IsOper())
 		parentmod->SetOperPrefix(dest, !adding);
 }