Use ERR_BANLISTFULL in the chanfilter and exemptchanops modules.

diff --git a/src/listmode.cpp b/src/listmode.cpp
index d5dbec30e63a3f56a9731f536edf6fe8dcf8f5b1..78908a727015036c25cdb8bd30a47f532da1e77a 100644 (file)
--- a/src/listmode.cpp
+++ b/src/listmode.cpp
@@ -227,7 +227,7 @@ void ListModeBase::OnParameterMissing(User*, User*, Channel*)
 
 void ListModeBase::TellListTooLong(User* source, Channel* channel, std::string& parameter)
 {
-       source->WriteNumeric(ERR_BANLISTFULL, channel->name, parameter, mode, "Channel ban list is full");
+       source->WriteNumeric(ERR_BANLISTFULL, channel->name, parameter, mode, InspIRCd::Format("Channel %s list is full", name.c_str()));
 }
 
 void ListModeBase::TellAlreadyOnList(User*, Channel*, std::string&)

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 903aab33a8eeb2f5f2e724a0225a6188849152b1..5591c7ef959788331465e2b3bf9d196c91f2d84f 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -31,8 +31,7 @@ enum
 {
        // InspIRCd-specific.
        ERR_ALREADYCHANFILTERED = 937,
-       ERR_NOSUCHCHANFILTER = 938,
-       ERR_CHANFILTERFULL = 939
+       ERR_NOSUCHCHANFILTER = 938
 };
 
 /** Handles channel mode +g
@@ -55,11 +54,6 @@ class ChanFilter : public ListModeBase
                return true;
        }
 
-       void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
-       {
-               user->WriteNumeric(ERR_CHANFILTERFULL, chan->name, word, "Channel spamfilter list is full");
-       }
-
        void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
        {
                user->WriteNumeric(ERR_ALREADYCHANFILTERED, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index b1d7b35dfc31aa2066649c81a961723af2b3e829..411d0dd1568113f77f552ce3fb84d52dbe6ff411 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -52,11 +52,6 @@ class ExemptChanOps : public ListModeBase
                return true;
        }
 
-       void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
-       {
-               user->WriteNumeric(959, chan->name, word, "Channel exemptchanops list is full");
-       }
-
        void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
        {
                user->WriteNumeric(957, chan->name, InspIRCd::Format("The word %s is already on the exemptchanops list", word.c_str()));