Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

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

diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 19a8640e794befcc46fa21ec463802958d798acf..6a4db18227def74a42c5c3c8b8f0e546acf2ed72 100644 (file)
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it) */
-
 class AllowInvite : public SimpleChannelModeHandler
 {
  public:
@@ -34,18 +32,14 @@ class ModuleAllowInvite : public Module
 
        ModuleAllowInvite() : ni(this)
        {
-               if (!ServerInstance->Modes->AddMode(&ni))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreInvite, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('A');
+               tokens["EXTBAN"].push_back('A');
        }
 
-       virtual ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
+       ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE
        {
                if (IS_LOCAL(user))
                {
@@ -53,10 +47,10 @@ class ModuleAllowInvite : public Module
                        if (res == MOD_RES_DENY)
                        {
                                // Matching extban, explicitly deny /invite
-                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You are banned from using INVITE", user->nick.c_str(), channel->name.c_str());
+                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You are banned from using INVITE");
                                return res;
                        }
-                       if (channel->IsModeSet('A') || res == MOD_RES_ALLOW)
+                       if (channel->IsModeSet(ni) || res == MOD_RES_ALLOW)
                        {
                                // Explicitly allow /invite
                                return MOD_RES_ALLOW;
@@ -66,13 +60,9 @@ class ModuleAllowInvite : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleAllowInvite()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_VENDOR);
+               return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR);
        }
 };