Fix not propagating rehashes properly across the network.

[user/henk/code/inspircd.git] / src / listmode.cpp

diff --git a/src/listmode.cpp b/src/listmode.cpp
index b416d4a69e6c09dc23821c7255faadcbd7884426..61fadcade8c87ccef6baaa5beeb9b176653637ac 100644 (file)
--- a/src/listmode.cpp
+++ b/src/listmode.cpp
@@ -69,7 +69,7 @@ void ListModeBase::DoRehash()
        {
                // For each <banlist> tag
                ConfigTag* c = i->second;
-               ListLimit limit(c->getString("chan"), c->getInt("limit"));
+               ListLimit limit(c->getString("chan"), c->getUInt("limit", 0));
 
                if (limit.mask.size() && limit.limit > 0)
                        chanlimits.push_back(limit);
@@ -121,6 +121,17 @@ unsigned int ListModeBase::GetLimit(Channel* channel)
        return GetLimitInternal(channel->name, cd);
 }
 
+unsigned int ListModeBase::GetLowerLimit()
+{
+       unsigned int limit = UINT_MAX;
+       for (limitlist::iterator iter = chanlimits.begin(); iter != chanlimits.end(); ++iter)
+       {
+               if (iter->limit < limit)
+                       limit = iter->limit;
+       }
+       return limit == UINT_MAX ? DEFAULT_LIST_SIZE : limit;
+}
+
 ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
        // Try and grab the list
@@ -210,15 +221,22 @@ bool ListModeBase::ValidateParam(User*, Channel*, std::string&)
        return true;
 }
 
+void ListModeBase::OnParameterMissing(User*, User*, Channel*)
+{
+       // Intentionally left blank.
+}
+
 void ListModeBase::TellListTooLong(User* source, Channel* channel, std::string& parameter)
 {
-       source->WriteNumeric(ERR_BANLISTFULL, channel->name, parameter, "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&)
+void ListModeBase::TellAlreadyOnList(User* source, Channel* channel, std::string& parameter)
 {
+       source->WriteNumeric(ERR_LISTMODEALREADYSET, channel->name, parameter, mode, InspIRCd::Format("Channel %s list already contains %s", name.c_str(), parameter.c_str()));
 }
 
-void ListModeBase::TellNotSet(User*, Channel*, std::string&)
+void ListModeBase::TellNotSet(User* source, Channel* channel, std::string& parameter)
 {
+       source->WriteNumeric(ERR_LISTMODENOTSET, channel->name, parameter, mode, InspIRCd::Format("Channel %s list does not contain %s", name.c_str(), parameter.c_str()));
 }