Fix REMOVE maxparams

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

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 811c85e0dfb5dfa978df299365e04bbbeb24b842..d1ba487a6504972ada82056a0d07f213acc1e341 100644 (file)
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -34,38 +34,24 @@ class ModuleQuietBan : public Module
                return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
+               if (!IS_LOCAL(user) || target_type != TYPE_CHANNEL)
+                       return MOD_RES_PASSTHRU;
 
-               if (target_type == TYPE_CHANNEL)
+               Channel* chan = static_cast<Channel*>(dest);
+               if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
                {
-                       if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-                       {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-                               return 1;
-                       }
+                       user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)", user->nick.c_str(), chan->name.c_str());
+                       return MOD_RES_DENY;
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
-
-               if (target_type == TYPE_CHANNEL)
-               {
-                       if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-                       {
-                               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-                               return 1;
-                       }
-               }
-
-               return 0;
+               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
 
        virtual void On005Numeric(std::string &output)