X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fu_listmode.h;h=28c364698fb07010b34d3fb0dbcfab88c5ccfaf9;hb=a77e32fa3267f022b4b0dd973c9b937534da9a5d;hp=9c34cc982ac4e6d9d88d318b1b119158c6d0c3c3;hpb=9941a616cbba8ad5dec07bdf908a1d08d81e568e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/u_listmode.h b/include/u_listmode.h index 9c34cc982..28c364698 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -1,3 +1,16 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #ifndef INSPIRCD_LISTMODE_PROVIDER #define INSPIRCD_LISTMODE_PROVIDER @@ -8,7 +21,8 @@ #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "wildcard.h" +#include "inspircd.h" /* $ModDesc: Provides support for easily creating listmodes, stores the time set, the user, and a parameter. */ @@ -25,7 +39,9 @@ inline std::string stringtime() return TIME.str(); } -class ListItem +/** An item in a listmode's list + */ +class ListItem : public classbase { public: std::string nick; @@ -33,7 +49,9 @@ public: std::string time; }; -class ListLimit +/** The number of items a listmode's list may contain + */ +class ListLimit : public classbase { public: std::string mask; @@ -44,10 +62,26 @@ public: typedef std::vector modelist; typedef std::vector limitlist; +class ListModeRequest : public Request +{ + public: + userrec* user; + chanrec* chan; + + ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c) + { + } + + ~ListModeRequest() + { + } +}; + +/** The base class for listmodes defined by u_listmode.h + */ class ListModeBase : public ModeHandler { protected: - Server* Srv; std::string infokey; std::string listnumeric; std::string endoflistnumeric; @@ -57,11 +91,28 @@ class ListModeBase : public ModeHandler limitlist chanlimits; public: - ListModeBase(Server* serv, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist") - : ModeHandler(modechar, 1, 1, true, MODETYPE_CHANNEL, false), Srv(serv), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag) + ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &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(); - infokey = "exceptionbase_mode_" + std::string(1, mode) + "_list"; + infokey = "listbase_mode_" + std::string(1, mode) + "_list"; + } + + std::pair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + modelist* el; + channel->GetExt(infokey, el); + if (el) + { + for (modelist::iterator it = el->begin(); it != el->end(); it++) + { + if(parameter == it->mask) + { + return std::make_pair(true, parameter); + } + } + } + return std::make_pair(false, parameter); } virtual void DisplayList(userrec* user, chanrec* channel) @@ -72,15 +123,51 @@ class ListModeBase : public ModeHandler { for(modelist::iterator it = el->begin(); it != el->end(); it++) { - WriteServ(user->fd, "%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->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()); } } - WriteServ(user->fd, "%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); + user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str()); + } + + virtual void RemoveMode(chanrec* channel) + { + ServerInstance->Log(DEBUG,"Removing listmode base from %s %s",channel->name,infokey.c_str()); + modelist* el; + channel->GetExt(infokey, el); + if (el) + { + ServerInstance->Log(DEBUG,"Channel is extended with a list"); + irc::modestacker modestack(false); + std::deque stackresult; + const char* mode_junk[MAXMODES+1]; + mode_junk[0] = channel->name; + userrec* n = new userrec(ServerInstance); + n->SetFd(FD_MAGIC_NUMBER); + for(modelist::iterator it = el->begin(); it != el->end(); it++) + { + modestack.Push(this->GetModeChar(), it->mask); + } + while (modestack.GetStackedLine(stackresult)) + { + for (size_t j = 0; j < stackresult.size(); j++) + { + mode_junk[j+1] = stackresult[j].c_str(); + } + ServerInstance->SendMode(mode_junk, stackresult.size() + 1, n); + } + + delete n; + } + } + + virtual void RemoveMode(userrec* user) + { + /* Listmodes dont get set on users */ } virtual void DoRehash() { - ConfigReader Conf; + ConfigReader Conf(ServerInstance); chanlimits.clear(); @@ -92,14 +179,7 @@ class ListModeBase : public ModeHandler limit.limit = Conf.ReadInteger(configtag, "limit", i, true); if(limit.mask.size() && limit.limit > 0) - { chanlimits.push_back(limit); - log(DEBUG, "Read channel listmode limit of %u for mask '%s'", limit.limit, limit.mask.c_str()); - } - else - { - log(DEBUG, "Invalid tag"); - } } if(chanlimits.size() == 0) { @@ -152,7 +232,7 @@ class ListModeBase : public ModeHandler for (limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++) { - if (Srv->MatchText(channel->name, it->mask)) + if (match(channel->name, it->mask.c_str())) { // We have a pattern matching the channel... maxsize = el->size(); @@ -191,7 +271,7 @@ class ListModeBase : public ModeHandler /* List is full, give subclass a chance to send a custom message */ if(!TellListTooLong(source, channel, parameter)) { - WriteServ(source->fd, "478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); + source->WriteServ("478 %s %s %s :Channel ban/ignore list is full", source->nick, channel->name, parameter.c_str()); } parameter = ""; @@ -214,18 +294,16 @@ class ListModeBase : public ModeHandler } return MODEACTION_ALLOW; } - else - { - /* Tried to remove something that wasn't set */ - TellNotSet(source, channel, parameter); - } } + /* Tried to remove something that wasn't set */ + TellNotSet(source, channel, parameter); parameter = ""; return MODEACTION_DENY; } else { - // Hmm, taking an exception off a non-existant list, DIE + /* Hmm, taking an exception off a non-existant list, DIE */ + TellNotSet(source, channel, parameter); parameter = ""; return MODEACTION_DENY; } @@ -254,30 +332,25 @@ class ListModeBase : public ModeHandler { modelist* list; chan->GetExt(infokey, list); + irc::modestacker modestack(true); + std::deque stackresult; if (list) { for (modelist::iterator it = list->begin(); it != list->end(); it++) { - proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, "+" + std::string(1, mode) + " " + it->mask); + modestack.Push(std::string(1, mode)[0], it->mask); } } + while (modestack.GetStackedLine(stackresult)) + { + irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1); + std::string line = mode_join.GetJoined(); + proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line); + } } virtual void DoCleanup(int target_type, void* item) { - if (target_type == TYPE_CHANNEL) - { - chanrec* chan = (chanrec*)item; - - modelist* list; - chan->GetExt(infokey, list); - - if (list) - { - chan->Shrink(infokey); - delete list; - } - } } virtual bool ValidateParam(userrec* source, chanrec* channel, std::string ¶meter)