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

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

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 26453020f6ce8376d9e576cf9bf956ea75603ac4..34f730c629ce162e7470e4885e4862204b51850a 100644 (file)
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -42,12 +42,14 @@ class ServProtectMode : public ModeHandler
        }
 };
 
-class ModuleServProtectMode : public Module
+class ModuleServProtectMode : public Module, public Whois::EventListener, public Whois::LineEventListener
 {
        ServProtectMode bm;
  public:
        ModuleServProtectMode()
-               : bm(this)
+               : Whois::EventListener(this)
+               , Whois::LineEventListener(this)
+               , bm(this)
        {
        }
 
@@ -56,11 +58,11 @@ class ModuleServProtectMode : public Module
                return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
        }
 
-       void OnWhois(User* user, User* dest) CXX11_OVERRIDE
+       void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
        {
-               if (dest->IsModeSet(bm))
+               if (whois.GetTarget()->IsModeSet(bm))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 310, dest->nick+" :is a Network Service on "+ServerInstance->Config->Network);
+                       whois.SendLine(310, ":is a Network Service on " + ServerInstance->Config->Network);
                }
        }
 
@@ -84,7 +86,7 @@ class ModuleServProtectMode : public Module
                                if (u->IsModeSet(bm) && memb && memb->hasMode(mh->GetModeChar()))
                                {
                                        /* BZZZT, Denied! */
-                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You are not permitted to remove privileges from %s services", chan->name.c_str(), ServerInstance->Config->Network.c_str());
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, InspIRCd::Format("You are not permitted to remove privileges from %s services", ServerInstance->Config->Network.c_str()));
                                        return MOD_RES_DENY;
                                }
                        }
@@ -100,7 +102,7 @@ class ModuleServProtectMode : public Module
 
                if (dst->IsModeSet(bm))
                {
-                       src->WriteNumeric(485, ":You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str());
+                       src->WriteNumeric(485, InspIRCd::Format("You are not permitted to kill %s services!", ServerInstance->Config->Network.c_str()));
                        ServerInstance->SNO->WriteGlobalSno('a', src->nick+" tried to kill service "+dst->nick+" ("+reason+")");
                        return MOD_RES_DENY;
                }
@@ -111,17 +113,16 @@ class ModuleServProtectMode : public Module
        {
                if (memb->user->IsModeSet(bm))
                {
-                       src->WriteNumeric(ERR_RESTRICTED, "%s :You are not permitted to kick services",
-                               memb->chan->name.c_str());
+                       src->WriteNumeric(ERR_RESTRICTED, memb->chan->name, "You are not permitted to kick services");
                        return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnWhoisLine(User* src, User* dst, int &numeric, std::string &text) CXX11_OVERRIDE
+       ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
        {
-               return ((src != dst) && (numeric == 319) && dst->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+               return ((numeric == 319) && whois.GetTarget()->IsModeSet(bm)) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 };