Change allocation of InspIRCd::BanCache to be physically part of the object containing it

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

diff --git a/src/listmode.cpp b/src/listmode.cpp
index b7b1cbc51c2afc9f033414b3410bac3ed4efdf4c..0f139bb0129c42a2d44f5dcf6ecc499723fc8c82 100644 (file)
--- a/src/listmode.cpp
+++ b/src/listmode.cpp
@@ -20,7 +20,7 @@
 #include "listmode.h"
 
 ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag)
-       : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL),
+       : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST),
        listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy),
        configtag(ctag), extItem("listbase_mode_" + name + "_list", Creator)
 {
@@ -34,15 +34,15 @@ void ListModeBase::DisplayList(User* user, Channel* channel)
        {
                for (ModeList::reverse_iterator it = cd->list.rbegin(); it != cd->list.rend(); ++it)
                {
-                       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(listnumeric, "%s %s %s %lu", 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", channel->name.c_str(), endofliststring.c_str());
 }
 
 void ListModeBase::DisplayEmptyList(User* user, Channel* channel)
 {
-       user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
+       user->WriteNumeric(endoflistnumeric, "%s :%s", channel->name.c_str(), endofliststring.c_str());
 }
 
 void ListModeBase::RemoveMode(Channel* channel, irc::modestacker& stack)
@@ -81,7 +81,8 @@ void ListModeBase::DoRehash()
        if (oldlimits == chanlimits)
                return;
 
-       for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i)
+       const chan_hash& chans = ServerInstance->GetChans();
+       for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
        {
                ChanData* cd = extItem.get(i->second);
                if (cd)
@@ -89,14 +90,6 @@ void ListModeBase::DoRehash()
        }
 }
 
-void ListModeBase::DoImplements(Module* m)
-{
-       ServerInstance->Modules->AddService(extItem);
-       this->DoRehash();
-       Implementation eventlist[] = { I_OnSyncChannel, I_OnRehash };
-       ServerInstance->Modules->Attach(eventlist, m, sizeof(eventlist)/sizeof(Implementation));
-}
-
 unsigned int ListModeBase::FindLimit(const std::string& channame)
 {
        for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); ++it)
@@ -164,7 +157,6 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std
                {
                        /* List is full, give subclass a chance to send a custom message */
                        TellListTooLong(source, channel, parameter);
-                       parameter.clear();
                        return MODEACTION_DENY;
                }
 
@@ -207,33 +199,10 @@ ModeAction ListModeBase::OnModeChange(User* source, User*, Channel* channel, std
 
                /* Tried to remove something that wasn't set */
                TellNotSet(source, channel, parameter);
-               parameter.clear();
                return MODEACTION_DENY;
        }
 }
 
-void ListModeBase::DoSyncChannel(Channel* chan, Module* proto, void* opaque)
-{
-       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);
-
-       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());
-               proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types);
-               stackresult.clear();
-       }
-}
-
 bool ListModeBase::ValidateParam(User*, Channel*, std::string&)
 {
        return true;
@@ -241,7 +210,7 @@ bool ListModeBase::ValidateParam(User*, Channel*, std::string&)
 
 void ListModeBase::TellListTooLong(User* source, Channel* channel, std::string& parameter)
 {
-       source->WriteNumeric(478, "%s %s %s :Channel ban list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str());
+       source->WriteNumeric(ERR_BANLISTFULL, "%s %s :Channel ban list is full", channel->name.c_str(), parameter.c_str());
 }
 
 void ListModeBase::TellAlreadyOnList(User*, Channel*, std::string&)