* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/** Get the time as a string
*/
-inline std::string stringtime(InspIRCd* Instance)
+inline std::string stringtime()
{
std::ostringstream TIME;
- TIME << Instance->Time();
+ TIME << ServerInstance->Time();
return TIME.str();
}
class ListModeBase : public ModeHandler
{
protected:
- /** Storage key
- */
- std::string infokey;
/** Numeric to use when outputting the list
*/
unsigned int listnumeric;
bool tidy;
/** Config tag to check for max items per channel
*/
- std::string configtag;
+ std::string configtag;
/** Limits on a per-channel basis read from the tag
* specified in ListModeBase::configtag
*/
limitlist chanlimits;
public:
+ /** Storage key
+ */
+ SimpleExtItem<modelist> extItem;
+
/** Constructor.
* @param Instance The creator of this class
* @param modechar Mode character
* @param autotidy Automatically tidy list entries on add
* @param ctag Configuration tag to get limits from
*/
- ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
- : ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
+ ListModeBase(Module* Creator, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
+ : ModeHandler(Creator, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL),
+ listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy),
+ configtag(ctag), extItem("listbase_mode_" + std::string(1, mode) + "_list", Creator)
{
+ list = true;
this->DoRehash();
- infokey = "listbase_mode_" + std::string(1, mode) + "_list";
+ Extensible::Register(&extItem);
}
/** See mode.h
*/
std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
for (modelist::iterator it = el->begin(); it != el->end(); it++)
*/
virtual void DisplayList(User* user, Channel* channel)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
*/
virtual void RemoveMode(Channel* channel, irc::modestacker* stack)
{
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (el)
{
- irc::modestacker modestack(ServerInstance, false);
- std::deque<std::string> stackresult;
- std::vector<std::string> mode_junk;
- mode_junk.push_back(channel->name);
+ irc::modestacker modestack(false);
for (modelist::iterator it = el->begin(); it != el->end(); it++)
{
if (stack)
return;
+ std::vector<std::string> stackresult;
+ stackresult.push_back(channel->name);
while (modestack.GetStackedLine(stackresult))
{
- for (size_t j = 0; j < stackresult.size(); j++)
- {
- mode_junk.push_back(stackresult[j]);
- }
-
- ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+ ServerInstance->SendMode(stackresult, ServerInstance->FakeClient);
+ stackresult.clear();
+ stackresult.push_back(channel->name);
}
}
}
*/
virtual void DoRehash()
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
chanlimits.clear();
/** Handle the list mode.
* See mode.h
*/
- virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode)
+ virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding)
{
// Try and grab the list
- modelist* el;
- channel->GetExt(infokey, el);
+ modelist* el = extItem.get(channel);
if (adding)
{
{
// Make one
el = new modelist;
- channel->Extend(infokey, el);
+ extItem.set(channel, el);
}
// Clean the mask up
// And now add the mask onto the list...
ListItem e;
e.mask = parameter;
- e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
- e.time = stringtime(ServerInstance);
+ e.nick = source->nick;
+ e.time = stringtime();
el->push_back(e);
return MODEACTION_ALLOW;
el->erase(it);
if (el->size() == 0)
{
- channel->Shrink(infokey);
- delete el;
+ extItem.unset(channel);
}
return MODEACTION_ALLOW;
}
return MODEACTION_DENY;
}
- /** Get Extensible key for this mode
- */
- virtual std::string& GetInfoKey()
- {
- return infokey;
- }
-
- /** Handle channel deletion.
- * See modules.h.
- * @param chan Channel being deleted
- */
- virtual void DoChannelDelete(Channel* chan)
- {
- modelist* mlist;
- chan->GetExt(infokey, mlist);
-
- if (mlist)
- {
- chan->Shrink(infokey);
- delete mlist;
- }
- }
-
/** Syncronize channel item list with another server.
* See modules.h
* @param chan Channel to syncronize
*/
virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- modelist* mlist;
- chan->GetExt(infokey, mlist);
- irc::modestacker modestack(ServerInstance, true);
- std::deque<std::string> stackresult;
- std::deque<TranslateType> types;
+ modelist* mlist = extItem.get(chan);
+ irc::modestacker modestack(true);
+ std::vector<std::string> stackresult;
+ std::vector<TranslateType> types;
types.push_back(TR_TEXT);
if (mlist)
{
{
types.assign(stackresult.size(), this->GetTranslateType());
proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types);
+ stackresult.clear();
}
}
ListModeRequest* LM = (ListModeRequest*)request;
if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
{
- modelist* mlist;
- LM->chan->GetExt(GetInfoKey(), mlist);
+ modelist* mlist = extItem.get(LM->chan);
if (mlist)
{
std::string mask = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString();
}
else if (strcmp("LM_CHECKLIST_EX", request->GetId()) == 0)
{
- modelist* mlist;
- LM->chan->GetExt(GetInfoKey(), mlist);
+ modelist* mlist = extItem.get(LM->chan);
if (mlist)
{
projects / user / henk / code / inspircd.git / blobdiff