m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

[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 b0cb0e4e9d8876b4183528eb5bbf316adec3b61a..3bf4c8434352e985d3d39dda126489ce8ed6d628 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -22,106 +22,100 @@
  * 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) || (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")
        {
+               /* 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.
+                */
        }
 
-       void init()
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
-               ServerInstance->Modules->AddService(opm);
-
-               Implementation eventlist[] = { I_OnPostJoin, I_OnOper };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               if ((user->IsOper()) && (!user->IsModeSet(hideopermode)))
+                       privs.push_back('y');
+               return MOD_RES_PASSTHRU;
        }
 
-       void PushChanMode(Channel* channel, User* user)
+       void SetOperPrefix(User* user, bool add)
        {
-               char modeline[] = "+y";
                std::vector<std::string> modechange;
-               modechange.push_back(channel->name);
-               modechange.push_back(modeline);
+               modechange.push_back("");
+               modechange.push_back(add ? "+" : "-");
+               modechange[1].push_back(opm.GetModeChar());
                modechange.push_back(user->nick);
-               ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
+               for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+               {
+                       modechange[0] = (*v)->chan->name;
+                       ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
+               }
        }
 
-       void OnPostJoin(Membership* memb)
+       void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
        {
-               if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
-                       PushChanMode(memb->chan, memb->user);
+               if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode)))
+                       SetOperPrefix(user, true);
        }
 
-       // 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)
+       Version GetVersion() CXX11_OVERRIDE
        {
-               /* force event propagation to its ModeHandler */
-               if (!IS_SERVER(user) && chan && (mode == 'y'))
-                       return MOD_RES_ALLOW;
-               return MOD_RES_PASSTHRU;
+               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
        }
 
-       void OnOper(User *user, const std::string&)
+       void Prioritize()
        {
-               if (user && !user->IsModeSet('H'))
-               {
-                       for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-                       {
-                               PushChanMode(*v, user);
-                       }
-               }
+               // 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);
        }
+};
 
-       ~ModuleOperPrefixMode()
-       {
-       }
+HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
+       : ModeWatcher(parent, "hideoper", MODETYPE_USER)
+       , parentmod(parent)
+{
+}
 
-       Version GetVersion()
-       {
-               return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
-       }
-};
+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)