m_spanningtree Update comments around collision handling

[user/henk/code/inspircd.git] / src / modules / m_operprefix.cpp

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 6a380c3462e3b8feb6089ccec1ab5eac4d4b7304..3f05dd086fe4a16f9d8beec6f5d27b5aa5c8eac8 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -22,70 +22,52 @@
  * 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')
                {
                        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;
+                       prefixrank = OPERPREFIX_VALUE;
                }
+};
 
-               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 (source && 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;
-                       }
-               }
+class ModuleOperPrefixMode;
+class HideOperWatcher : public ModeWatcher
+{
+       ModuleOperPrefixMode* parentmod;
 
-               bool NeedsOper() { return true; }
+ public:
+       HideOperWatcher(ModuleOperPrefixMode* parent);
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
 };
 
 class ModuleOperPrefixMode : public Module
 {
- private:
        OperPrefixMode opm;
+       HideOperWatcher hideoperwatcher;
+       UserModeReference hideopermode;
+
  public:
        ModuleOperPrefixMode()
-               : opm(this)
+               : opm(this), hideoperwatcher(this)
+               , hideopermode(this, "hideoper")
        {
-       }
-
-       void init()
-       {
-               ServerInstance->Modules->AddService(opm);
-
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-
                /* 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.
                 */
        }
 
-       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
        {
-               if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
+               if ((user->IsOper()) && (!user->IsModeSet(hideopermode)))
                        privs.push_back('y');
                return MOD_RES_PASSTHRU;
        }
@@ -94,29 +76,46 @@ class ModuleOperPrefixMode : public Module
        {
                std::vector<std::string> modechange;
                modechange.push_back("");
-               modechange.push_back(add ? "+y" : "-y");
+               modechange.push_back(add ? "+" : "-");
+               modechange[1].push_back(opm.GetModeChar());
                modechange.push_back(user->nick);
-               for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+               for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
                {
-                       modechange[0] = (*v)->name;
-                       ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
+                       modechange[0] = (*v)->chan->name;
+                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
                }
        }
 
-       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))
+               if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode)))
                        SetOperPrefix(user, true);
        }
 
-       ~ModuleOperPrefixMode()
+       Version GetVersion() CXX11_OVERRIDE
        {
+               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
        }
 
-       Version GetVersion()
+       void Prioritize()
        {
-               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
+               // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
+               Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");
+               ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes);
        }
 };
 
+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) && dest->IsOper())
+               parentmod->SetOperPrefix(dest, !adding);
+}
+
 MODULE_INIT(ModuleOperPrefixMode)