Use WriteNumeric() everywhere we send numerics and include the user's nick automatically

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

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 3c9d64d49a598ad5c7822deacdd25985465bdc48..fa9e73bd4b03828921b942b0532a9e93c008caae 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -117,13 +117,13 @@ class DNSBLResolver : public DNS::Request
                                {
                                        if (!ConfEntry->ident.empty())
                                        {
-                                               them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
+                                               them->WriteNumeric(304, ":Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
                                                them->ChangeIdent(ConfEntry->ident);
                                        }
 
                                        if (!ConfEntry->host.empty())
                                        {
-                                               them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
+                                               them->WriteNumeric(304, ":Your host has been set to " + ConfEntry->host + " because you matched " + reason);
                                                them->ChangeDisplayedHost(ConfEntry->host);
                                        }
 
@@ -229,13 +229,6 @@ class ModuleDNSBL : public Module
  public:
        ModuleDNSBL() : DNS(this, "DNS"), nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { }
 
-       void init() CXX11_OVERRIDE
-       {
-               ReadConf();
-               ServerInstance->Modules->AddService(nameExt);
-               ServerInstance->Modules->AddService(countExt);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides handling of DNS blacklists", VF_VENDOR);
@@ -243,7 +236,7 @@ class ModuleDNSBL : public Module
 
        /** Fill our conf vector with data
         */
-       void ReadConf()
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                DNSBLConfEntries.clear();
 
@@ -315,11 +308,6 @@ class ModuleDNSBL : public Module
                }
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
-       {
-               ReadConf();
-       }
-
        void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
        {
                if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET) || !DNS)