X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistmode.cpp;h=555f75fa39caa6ded6e871c7215066b9fa294c70;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=adae627f16fae9d824c159a1991ff5b794dfaba1;hpb=ebe5b201aab71cf2ead1e068889be736314fbb73;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listmode.cpp b/src/listmode.cpp index adae627f1..555f75fa3 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -29,12 +29,12 @@ ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modech 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()); @@ -47,12 +47,12 @@ void ListModeBase::DisplayEmptyList(User* user, Channel* channel) 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); @@ -83,25 +83,31 @@ 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 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; } } @@ -113,11 +119,11 @@ void ListModeBase::DoImplements(Module* m) 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; @@ -126,10 +132,26 @@ unsigned int ListModeBase::GetLimit(Channel* channel) 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) { @@ -140,15 +162,15 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std 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) { @@ -160,7 +182,7 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std } } - 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); @@ -181,12 +203,7 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std 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 @@ -198,17 +215,13 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std 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; } } @@ -223,18 +236,18 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std 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 stackresult; std::vector 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());