X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=5d1607b5c8dc741ef9ec4c1714e14e1d19246501;hb=7d7250484c352c13830e63ae41ee8faae40a9bd5;hp=baf7367450f39e1ec7ee4ac7f4243dcd0db44e7b;hpb=3868abe87d9c21db9998b17ee296e603da4d6855;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index baf736745..5d1607b5c 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,22 +14,7 @@ #ifndef INSPIRCD_LISTMODE_PROVIDER #define INSPIRCD_LISTMODE_PROVIDER -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "wildcard.h" -#include "inspircd.h" - -/* Updated to use the config tag if it exists - * Written by Om , December 2005. - * Based on code previously written by Om - April 2005 - * Updated to new API July 8th 2006 by Brain - * Originally based on m_chanprotect and m_silence - */ /** Get the time as a string */ @@ -46,7 +31,7 @@ class ListItem : public classbase { public: std::string nick; - irc::string mask; + std::string mask; std::string time; }; @@ -71,8 +56,8 @@ typedef std::vector limitlist; class ListModeRequest : public Request { public: - userrec* user; - chanrec* chan; + User* user; + Channel* chan; /** Check if a user is on a channel's list. * The Event::Send() event returns true if the user is on the channel's list. @@ -81,7 +66,7 @@ class ListModeRequest : public Request * @param u User to check against * @param c Channel to check against */ - ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c) + ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c) { } @@ -102,10 +87,10 @@ class ListModeBase : public ModeHandler std::string infokey; /** Numeric to use when outputting the list */ - std::string listnumeric; + unsigned int listnumeric; /** Numeric to indicate end of list */ - std::string endoflistnumeric; + unsigned int endoflistnumeric; /** String to send for end of list */ std::string endofliststring; @@ -130,7 +115,7 @@ class ListModeBase : public ModeHandler * @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, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist") + 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) { this->DoRehash(); @@ -139,7 +124,7 @@ class ListModeBase : public ModeHandler /** See mode.h */ - std::pair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + std::pair ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { modelist* el; channel->GetExt(infokey, el); @@ -160,7 +145,7 @@ class ListModeBase : public ModeHandler * @param user The user to send the list to * @param channel The channel the user is requesting the list for */ - virtual void DisplayList(userrec* user, chanrec* channel) + virtual void DisplayList(User* user, Channel* channel) { modelist* el; channel->GetExt(infokey, el); @@ -168,17 +153,22 @@ class ListModeBase : public ModeHandler { for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it) { - user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str()); + user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), it->nick.c_str(), it->time.c_str()); } } - user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); + user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str()); + } + + virtual void DisplayEmptyList(User* user, Channel* channel) + { + user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str()); } /** Remove all instances of the mode from a channel. * See mode.h * @param channel The channel to remove all instances of the mode from */ - virtual void RemoveMode(chanrec* channel) + virtual void RemoveMode(Channel* channel, irc::modestacker* stack) { modelist* el; channel->GetExt(infokey, el); @@ -186,30 +176,35 @@ class ListModeBase : public ModeHandler { irc::modestacker modestack(false); std::deque stackresult; - const char* mode_junk[MAXMODES+2]; - mode_junk[0] = channel->name; - userrec* n = new userrec(ServerInstance); - n->SetFd(FD_MAGIC_NUMBER); + std::vector mode_junk; + mode_junk.push_back(channel->name); + for (modelist::iterator it = el->begin(); it != el->end(); it++) { - modestack.Push(this->GetModeChar(), assign(it->mask)); + if (stack) + stack->Push(this->GetModeChar(), it->mask); + else + modestack.Push(this->GetModeChar(), it->mask); } + + if (stack) + return; + while (modestack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) { - mode_junk[j+1] = stackresult[j].c_str(); + mode_junk.push_back(stackresult[j]); } - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n); - } - delete n; + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); + } } } /** See mode.h */ - virtual void RemoveMode(userrec* user) + virtual void RemoveMode(User*, irc::modestacker* stack) { /* Listmodes dont get set on users */ } @@ -243,15 +238,16 @@ class ListModeBase : public ModeHandler /** Populate the Implements list with the correct events for a List Mode */ - virtual void DoImplements(char* List) + virtual void DoImplements(Module* m) { - List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1; + Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, m, 4); } /** Handle the list mode. * See mode.h */ - virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding, bool servermode) { // Try and grab the list modelist* el; @@ -288,7 +284,7 @@ class ListModeBase : public ModeHandler for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++) { - if (match(channel->name, it->mask.c_str())) + if (match(channel->name, it->mask)) { // We have a pattern matching the channel... maxsize = el->size(); @@ -308,8 +304,8 @@ class ListModeBase : public ModeHandler { // And now add the mask onto the list... ListItem e; - e.mask = assign(parameter); - e.nick = source->nick; + e.mask = parameter; + e.nick = servermode ? ServerInstance->Config->ServerName : source->nick; e.time = stringtime(); el->push_back(e); @@ -327,7 +323,7 @@ class ListModeBase : public ModeHandler /* List is full, give subclass a chance to send a custom message */ if (!TellListTooLong(source, channel, parameter)) { - source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); + source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str()); } parameter = ""; @@ -378,15 +374,15 @@ class ListModeBase : public ModeHandler * See modules.h. * @param chan Channel being deleted */ - virtual void DoChannelDelete(chanrec* chan) + virtual void DoChannelDelete(Channel* chan) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); - if (list) + if (mlist) { chan->Shrink(infokey); - delete list; + delete mlist; } } @@ -396,17 +392,17 @@ class ListModeBase : public ModeHandler * @param proto Protocol module pointer * @param opaque Opaque connection handle */ - virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque) + virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); irc::modestacker modestack(true); std::deque stackresult; - if (list) + if (mlist) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++) { - modestack.Push(std::string(1, mode)[0], assign(it->mask)); + modestack.Push(std::string(1, mode)[0], it->mask); } } while (modestack.GetStackedLine(stackresult)) @@ -421,7 +417,7 @@ class ListModeBase : public ModeHandler * @param target_type Type of target to clean * @param item Item to clean */ - virtual void DoCleanup(int target_type, void* item) + virtual void DoCleanup(int, void*) { } @@ -432,7 +428,7 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return true if the parameter is valid */ - virtual bool ValidateParam(userrec* source, chanrec* channel, std::string ¶meter) + virtual bool ValidateParam(User*, Channel*, std::string&) { return true; } @@ -444,7 +440,7 @@ class ListModeBase : public ModeHandler * @param parameter The actual parameter being added * @return Ignored */ - virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string ¶meter) + virtual bool TellListTooLong(User*, Channel*, std::string&) { return false; } @@ -455,7 +451,7 @@ class ListModeBase : public ModeHandler * @param channel Channel the parameter is being added to * @param parameter The actual parameter being added */ - virtual void TellAlreadyOnList(userrec* source, chanrec* channel, std::string ¶meter) + virtual void TellAlreadyOnList(User*, Channel*, std::string&) { } @@ -465,7 +461,7 @@ class ListModeBase : public ModeHandler * @param channel Channel the parameter is being removed from * @param parameter The actual parameter being removed */ - virtual void TellNotSet(userrec* source, chanrec* channel, std::string ¶meter) + virtual void TellNotSet(User*, Channel*, std::string&) { } };