void ListModeBase::DisplayList(User* user, Channel* channel)
{
- ModeList* el = extItem.get(channel);
- if (el)
+ ChanData* cd = extItem.get(channel);
+ if (cd)
{
- for (ModeList::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
+ for (ModeList::reverse_iterator it = cd->list.rbegin(); it != cd->list.rend(); ++it)
{
- user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName.c_str()), it->time.c_str());
+ user->WriteNumeric(listnumeric, "%s %s %s %s %lu", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (!it->setter.empty() ? it->setter.c_str() : ServerInstance->Config->ServerName.c_str()), (unsigned long) it->time);
}
}
user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
}
-void ListModeBase::RemoveMode(Channel* channel, irc::modestacker* stack)
+void ListModeBase::RemoveMode(Channel* channel, irc::modestacker& stack)
{
- ModeList* el = extItem.get(channel);
- if (el)
+ ChanData* cd = extItem.get(channel);
+ if (cd)
{
- irc::modestacker modestack(false);
-
- for (ModeList::iterator it = el->begin(); it != el->end(); it++)
+ for (ModeList::iterator it = cd->list.begin(); it != cd->list.end(); it++)
{
- if (stack)
- stack->Push(this->GetModeChar(), it->mask);
- else
- modestack.Push(this->GetModeChar(), it->mask);
- }
-
- if (stack)
- return;
-
- std::vector<std::string> stackresult;
- stackresult.push_back(channel->name);
- while (modestack.GetStackedLine(stackresult))
- {
- ServerInstance->SendMode(stackresult, ServerInstance->FakeClient);
- stackresult.clear();
- stackresult.push_back(channel->name);
+ stack.Push(this->GetModeChar(), it->mask);
}
}
}
-void ListModeBase::RemoveMode(User*, irc::modestacker* stack)
-{
- /* Listmodes dont get set on users */
-}
-
void ListModeBase::DoRehash()
{
ConfigTagList tags = ServerInstance->Config->ConfTags(configtag);
+ limitlist oldlimits = chanlimits;
chanlimits.clear();
for (ConfigIter i = tags.first; i != tags.second; i++)
{
// For each <banlist> tag
ConfigTag* c = i->second;
- ListLimit limit;
- limit.mask = c->getString("chan");
- limit.limit = c->getInt("limit");
+ ListLimit limit(c->getString("chan"), c->getInt("limit"));
if (limit.mask.size() && limit.limit > 0)
chanlimits.push_back(limit);
}
- if (chanlimits.size() == 0)
+
+ if (chanlimits.empty())
+ chanlimits.push_back(ListLimit("*", 64));
+
+ // Most of the time our settings are unchanged, so we can avoid iterating the chanlist
+ if (oldlimits == chanlimits)
+ return;
+
+ for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
{
- ListLimit limit;
- limit.mask = "*";
- limit.limit = 64;
- chanlimits.push_back(limit);
+ ChanData* cd = extItem.get(i->second);
+ if (cd)
+ cd->maxitems = -1;
}
}
{
ServerInstance->Modules->AddService(extItem);
this->DoRehash();
- Implementation eventlist[] = { I_OnSyncChannel, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, m, sizeof(eventlist)/sizeof(Implementation));
}
-unsigned int ListModeBase::GetLimit(Channel* channel)
+unsigned int ListModeBase::FindLimit(const std::string& channame)
{
for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); ++it)
{
- if (InspIRCd::Match(channel->name, it->mask))
+ if (InspIRCd::Match(channame, it->mask))
{
// We have a pattern matching the channel
return it->limit;
return 64;
}
+unsigned int ListModeBase::GetLimitInternal(const std::string& channame, ChanData* cd)
+{
+ if (cd->maxitems < 0)
+ cd->maxitems = FindLimit(channame);
+ return cd->maxitems;
+}
+
+unsigned int ListModeBase::GetLimit(Channel* channel)
+{
+ ChanData* cd = extItem.get(channel);
+ if (!cd) // just find the limit
+ return FindLimit(channel->name);
+
+ return GetLimitInternal(channel->name, cd);
+}
+
ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding)
{
// Try and grab the list
- ModeList* el = extItem.get(channel);
+ ChanData* cd = extItem.get(channel);
if (adding)
{
return MODEACTION_DENY;
// If there was no list
- if (!el)
+ if (!cd)
{
// Make one
- el = new ModeList;
- extItem.set(channel, el);
+ cd = new ChanData;
+ extItem.set(channel, cd);
}
// Check if the item already exists in the list
- for (ModeList::iterator it = el->begin(); it != el->end(); it++)
+ for (ModeList::iterator it = cd->list.begin(); it != cd->list.end(); it++)
{
if (parameter == it->mask)
{
}
}
- if ((IS_LOCAL(source)) && (el->size() >= GetLimit(channel)))
+ if ((IS_LOCAL(source)) && (cd->list.size() >= GetLimitInternal(channel->name, cd)))
{
/* List is full, give subclass a chance to send a custom message */
TellListTooLong(source, channel, parameter);
if (ValidateParam(source, channel, parameter))
{
// And now add the mask onto the list...
- ListItem e;
- e.mask = parameter;
- e.nick = source->nick;
- e.time = ConvToStr(ServerInstance->Time());
-
- el->push_back(e);
+ cd->list.push_back(ListItem(parameter, source->nick, ServerInstance->Time()));
return MODEACTION_ALLOW;
}
else
else
{
// We're taking the mode off
- if (el)
+ if (cd)
{
- for (ModeList::iterator it = el->begin(); it != el->end(); it++)
+ for (ModeList::iterator it = cd->list.begin(); it != cd->list.end(); ++it)
{
if (parameter == it->mask)
{
- el->erase(it);
- if (el->size() == 0)
- {
- extItem.unset(channel);
- }
+ cd->list.erase(it);
return MODEACTION_ALLOW;
}
}
void ListModeBase::DoSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- ModeList* mlist = extItem.get(chan);
+ ChanData* cd = extItem.get(chan);
+ if (!cd)
+ return;
+
irc::modestacker modestack(true);
std::vector<std::string> stackresult;
std::vector<TranslateType> types;
types.push_back(TR_TEXT);
- if (mlist)
- {
- for (ModeList::iterator it = mlist->begin(); it != mlist->end(); it++)
- {
- modestack.Push(std::string(1, mode)[0], it->mask);
- }
- }
+
+ for (ModeList::iterator it = cd->list.begin(); it != cd->list.end(); it++)
+ modestack.Push(mode, it->mask);
+
while (modestack.GetStackedLine(stackresult))
{
types.assign(stackresult.size(), this->GetTranslateType());