Automatically register and unregister mode watchers

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

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 068f503c3b42d6a0033c90de6f944bff551b30a3..d0986b4c69b11b91af741fa5b2213624d6c064f2 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -32,7 +32,7 @@ class ExemptChanOps : public ListModeBase
                // TODO actually make sure there's a prop for this
                if ((word.length() > 35) || (word.empty()))
                {
-                       user->WriteNumeric(955, "%s %s %s :word is too %s for exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
+                       user->WriteNumeric(955, "%s %s :word is too %s for exemptchanops list", chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
                        return false;
                }
 
@@ -41,17 +41,17 @@ class ExemptChanOps : public ListModeBase
 
        void TellListTooLong(User* user, Channel* chan, std::string &word)
        {
-               user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
+               user->WriteNumeric(959, "%s %s :Channel exemptchanops list is full", chan->name.c_str(), word.c_str());
        }
 
        void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
        {
-               user->WriteNumeric(957, "%s %s :The word %s is already on the exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str());
+               user->WriteNumeric(957, "%s :The word %s is already on the exemptchanops list", chan->name.c_str(), word.c_str());
        }
 
        void TellNotSet(User* user, Channel* chan, std::string &word)
        {
-               user->WriteNumeric(958, "%s %s :No such exemptchanops word is set",user->nick.c_str(), chan->name.c_str());
+               user->WriteNumeric(958, "%s :No such exemptchanops word is set", chan->name.c_str());
        }
 };
 
@@ -61,14 +61,16 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
        ExemptChanOps ec;
        ExemptHandler(Module* me) : ec(me) {}
 
-       ModeHandler* FindMode(const std::string& mid)
+       PrefixMode* FindMode(const std::string& mid)
        {
                if (mid.length() == 1)
-                       return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
-               for(char c='A'; c < 'z'; c++)
+                       return ServerInstance->Modes->FindPrefixMode(mid[0]);
+
+               const ModeParser::PrefixModeList& pmlist = ServerInstance->Modes->GetPrefixModes();
+               for (ModeParser::PrefixModeList::const_iterator i = pmlist.begin(); i != pmlist.end(); ++i)
                {
-                       ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
-                       if (mh && mh->name == mid)
+                       PrefixMode* mh = *i;
+                       if (mh->name == mid)
                                return mh;
                }
                return NULL;
@@ -93,7 +95,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
                        }
                }
 
-               ModeHandler* mh = FindMode(minmode);
+               PrefixMode* mh = FindMode(minmode);
                if (mh && mypfx >= mh->GetPrefixRank())
                        return MOD_RES_ALLOW;
                if (mh || minmode == "*")
@@ -132,11 +134,6 @@ class ModuleExemptChanOps : public Module
        {
                eh.ec.DoRehash();
        }
-
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-       {
-               eh.ec.DoSyncChannel(chan, proto, opaque);
-       }
 };
 
 MODULE_INIT(ModuleExemptChanOps)