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

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

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 332e625e0c50dd3e4a6a5cd27e5f550f05d9b05c..a88324fe2cc9dac19548248e7e25038c1ff63feb 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -50,13 +50,13 @@ class BanRedirect : public ModeWatcher
  public:
        SimpleExtItem<BanRedirectList> extItem;
        BanRedirect(Module* parent)
-               : ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
+               : ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
                , ban(parent, "ban")
                , extItem("banredirect", parent)
        {
        }
 
-       bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
+       bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding)
        {
                /* nick!ident@host -> nick!ident@host
                 * nick!ident@host#chan -> nick!ident@host#chan
@@ -65,7 +65,7 @@ class BanRedirect : public ModeWatcher
                 * nick#chan -> nick!*@*#chan
                 */
 
-               if(channel && (type == MODETYPE_CHANNEL) && param.length())
+               if ((channel) && !param.empty())
                {
                        BanRedirectList* redirects;
 
@@ -228,9 +228,7 @@ class ModuleBanRedirect : public Module
 
        void init() CXX11_OVERRIDE
        {
-               if(!ServerInstance->Modes->AddModeWatcher(&re))
-                       throw ModuleException("Could not add mode watcher");
-
+               ServerInstance->Modes->AddModeWatcher(&re);
                ServerInstance->Modules->AddService(re.extItem);
                Implementation list[] = { I_OnUserPreJoin };
                ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
@@ -246,9 +244,6 @@ class ModuleBanRedirect : public Module
                        if(redirects)
                        {
                                irc::modestacker modestack(false);
-                               std::vector<std::string> stackresult;
-                               std::vector<std::string> mode_junk;
-                               mode_junk.push_back(chan->name);
 
                                for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++)
                                {
@@ -261,11 +256,12 @@ class ModuleBanRedirect : public Module
                                        modestack.Push('b', i->banmask);
                                }
 
-                               while(modestack.GetStackedLine(stackresult))
+                               std::vector<std::string> stackresult;
+                               stackresult.push_back(chan->name);
+                               while (modestack.GetStackedLine(stackresult))
                                {
-                                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
-                                       ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
-                                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
+                                       ServerInstance->Modes->Process(stackresult, ServerInstance->FakeClient, ModeParser::MODE_LOCALONLY);
+                                       stackresult.erase(stackresult.begin() + 1, stackresult.end());
                                }
                        }
                }