Merge branch 'master+sslconnmsg'

[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 3d2a34bdb22425da2cd238987d398c80f559240e..51281a528b6867e102c8ccd0dfdad43ed5835528 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -29,12 +29,12 @@
 class OperPrefixMode : public PrefixMode
 {
        public:
-               OperPrefixMode(Module* Creator) : PrefixMode(Creator, "operprefix", 'y')
+               OperPrefixMode(Module* Creator)
+                       : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
                {
                        std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
                        prefix = pfx.empty() ? '!' : pfx[0];
                        levelrequired = INT_MAX;
-                       prefixrank = OPERPREFIX_VALUE;
                }
 };
 
@@ -58,17 +58,11 @@ class ModuleOperPrefixMode : public Module
        ModuleOperPrefixMode()
                : opm(this), hideoperwatcher(this)
                , hideopermode(this, "hideoper")
-       {
-       }
-
-       void init() CXX11_OVERRIDE
        {
                /* 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);
        }
 
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
@@ -78,18 +72,26 @@ class ModuleOperPrefixMode : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       void OnPostJoin(Membership* memb)
+       {
+               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.
+               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 ? "+" : "-");
-               modechange[1].push_back(opm.GetModeChar());
-               modechange.push_back(user->nick);
-               for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-               {
-                       modechange[0] = (*v)->name;
-                       ServerInstance->Modes->Process(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) CXX11_OVERRIDE
@@ -98,12 +100,6 @@ class ModuleOperPrefixMode : public Module
                        SetOperPrefix(user, true);
        }
 
-
-       ~ModuleOperPrefixMode()
-       {
-               ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
@@ -125,7 +121,8 @@ HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
 
 void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
 {
-       if (IS_LOCAL(dest))
+       // If hideoper is being unset because the user is deopering, don't set +y
+       if (IS_LOCAL(dest) && dest->IsOper())
                parentmod->SetOperPrefix(dest, !adding);
 }