summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2018-12-09 06:27:44 +0000
committerPeter Powell <petpow@saberuk.com>2018-12-09 06:29:48 +0000
commita5b9f37d62670a49e81c5a53f93bdf485aace4a6 (patch)
treed9c6d5577385e2d580ddff75631e66f6372cd098 /src
parent16864d18713b2ec9ed613d1fe7fedd198268fd5d (diff)
Use ERR_BANLISTFULL in the chanfilter and exemptchanops modules.
Diffstat (limited to 'src')
-rw-r--r--src/listmode.cpp2
-rw-r--r--src/modules/m_chanfilter.cpp8
-rw-r--r--src/modules/m_exemptchanops.cpp5
3 files changed, 2 insertions, 13 deletions
diff --git a/src/listmode.cpp b/src/listmode.cpp
index d5dbec30e..78908a727 100644
--- 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 903aab33a..5591c7ef9 100644
--- 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 b1d7b35df..411d0dd15 100644
--- 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()));