Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

[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 9808ab322393a627a46bbcbc7bcda041a19ef5c7..0f4cdbea1d34596cdec1e59d3d6ba2aaf73ac34c 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -31,26 +31,23 @@
 class OperPrefixMode : public ModeHandler
 {
        public:
-               OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+               OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
                {
+                       std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
                        list = true;
-                       prefix = pfx;
+                       prefix = pfx.empty() ? '!' : pfx[0];
                        levelrequired = OPERPREFIX_VALUE;
                        m_paramtype = TR_NICK;
-               }
-
-               unsigned int GetPrefixRank()
-               {
-                       return OPERPREFIX_VALUE;
+                       prefixrank = OPERPREFIX_VALUE;
                }
 
                ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
                {
-                       if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
+                       if (IS_SERVER(source) || ServerInstance->ULine(source->server))
                                return MODEACTION_ALLOW;
                        else
                        {
-                               if (source && channel)
+                               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;
                        }
@@ -59,68 +56,97 @@ class OperPrefixMode : public ModeHandler
                bool NeedsOper() { return true; }
 };
 
-class ModuleOperPrefixMode : public Module
+class ModuleOperPrefixMode;
+class HideOperWatcher : public ModeWatcher
 {
- private:
-       OperPrefixMode* opm;
- public:
-       ModuleOperPrefixMode()  {
-               ConfigReader Conf;
-               std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
+       ModuleOperPrefixMode* parentmod;
 
-               opm = new OperPrefixMode(this, pfx[0]);
-               if ((!ServerInstance->Modes->AddMode(opm)))
-                       throw ModuleException("Could not add a new mode!");
+ public:
+       HideOperWatcher(ModuleOperPrefixMode* parent);
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding);
+};
 
-               Implementation eventlist[] = { I_OnPostJoin, I_OnUserQuit, I_OnUserKick, I_OnUserPart, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
-       }
+class ModuleOperPrefixMode : public Module
+{
+       OperPrefixMode opm;
+       HideOperWatcher hideoperwatcher;
 
-       void PushChanMode(Channel* channel, User* user)
+ public:
+       ModuleOperPrefixMode()
+               : opm(this), hideoperwatcher(this)
        {
-               char modeline[] = "+y";
-               std::vector<std::string> modechange;
-               modechange.push_back(channel->name);
-               modechange.push_back(modeline);
-               modechange.push_back(user->nick);
-               ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
        }
 
-       void OnPostJoin(Membership* memb)
+       void init() CXX11_OVERRIDE
        {
-               if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
-                       PushChanMode(memb->chan, memb->user);
+               ServerInstance->Modules->AddService(opm);
+
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
+               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.
+                */
+
+               ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
        }
 
-       // XXX: is there a better way to do this?
-       ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               /* force event propagation to its ModeHandler */
-               if (!IS_SERVER(user) && chan && (mode == 'y'))
-                       return MOD_RES_ALLOW;
+               if ((user->IsOper()) && (user->IsModeSet('H')))
+                       privs.push_back('y');
                return MOD_RES_PASSTHRU;
        }
 
-       void OnOper(User *user, const std::string&)
+       void SetOperPrefix(User* user, bool add)
        {
-               if (user && !user->IsModeSet('H'))
+               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++)
                {
-                       for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-                       {
-                               PushChanMode(*v, user);
-                       }
+                       modechange[0] = (*v)->name;
+                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
                }
        }
 
+       void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
+       {
+               if (IS_LOCAL(user) && (!user->IsModeSet('H')))
+                       SetOperPrefix(user, true);
+       }
+
+
        ~ModuleOperPrefixMode()
        {
-               delete opm;
+               ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
        }
+
+       void Prioritize()
+       {
+               // 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 (IS_LOCAL(dest))
+               parentmod->SetOperPrefix(dest, !adding);
+}
+
 MODULE_INIT(ModuleOperPrefixMode)