X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=c7f0da690ed8b9eb80cae4378f3b0afc51c91163;hb=9ee588b23fd915255d2cea0c537e6938297dbe5b;hp=57c6834afb30304177613260f6233f80760fd54d;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 57c6834af..c7f0da690 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -17,7 +17,7 @@ /** An alias definition */ -class Alias : public classbase +class Alias { public: /** The text of the alias command */ @@ -58,14 +58,14 @@ class ModuleAlias : public Module * We can, however, use a fancy invention: the multimap. Maps a key to one or more values. * -- w00t */ - std::multimap Aliases; + std::multimap Aliases; /* whether or not +B users are allowed to use fantasy commands */ bool AllowBots; virtual void ReadAliases() { - ConfigReader MyConf(ServerInstance); + ConfigReader MyConf; AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0); @@ -73,34 +73,32 @@ class ModuleAlias : public Module fprefix = fpre.empty() ? '!' : fpre[0]; Aliases.clear(); - for (int i = 0; i < MyConf.Enumerate("alias"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("alias"); + for(ConfigIter i = tags.first; i != tags.second; ++i) { + ConfigTag* tag = i->second; Alias a; - std::string txt; - txt = MyConf.ReadValue("alias", "text", i); - a.AliasedCommand = txt.c_str(); - a.ReplaceFormat = MyConf.ReadValue("alias", "replace", i, true); - a.RequiredNick = MyConf.ReadValue("alias", "requires", i); - a.ULineOnly = MyConf.ReadFlag("alias", "uline", i); - a.ChannelCommand = MyConf.ReadFlag("alias", "channelcommand", "no", i); - a.UserCommand = MyConf.ReadFlag("alias", "usercommand", "yes", i); - a.OperOnly = MyConf.ReadFlag("alias", "operonly", i); - a.format = MyConf.ReadValue("alias", "format", i); - a.CaseSensitive = MyConf.ReadFlag("alias", "matchcase", i); - Aliases.insert(std::make_pair(txt, a)); + a.AliasedCommand = tag->getString("text").c_str(); + tag->readString("replace", a.ReplaceFormat, true); + a.RequiredNick = tag->getString("requires"); + a.ULineOnly = tag->getBool("uline"); + a.ChannelCommand = tag->getBool("channelcommand", "no"); + a.UserCommand = tag->getBool("usercommand", "yes"); + a.OperOnly = tag->getBool("operonly"); + a.format = tag->getString("format"); + a.CaseSensitive = tag->getBool("matchcase"); + Aliases.insert(std::make_pair(a.AliasedCommand, a)); } } public: - ModuleAlias(InspIRCd* Me) - : Module(Me) + ModuleAlias() { ReadAliases(); - Me->Modules->Attach(I_OnPreCommand, this); - Me->Modules->Attach(I_OnRehash, this); - Me->Modules->Attach(I_OnUserMessage, this); - + ServerInstance->Modules->Attach(I_OnPreCommand, this); + ServerInstance->Modules->Attach(I_OnRehash, this); + ServerInstance->Modules->Attach(I_OnUserMessage, this); } virtual ~ModuleAlias() @@ -109,7 +107,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version("Provides aliases of commands.", VF_VENDOR,API_VERSION); + return Version("Provides aliases of commands.", VF_VENDOR); } std::string GetVar(std::string varname, const std::string &original_line) @@ -137,9 +135,9 @@ class ModuleAlias : public Module return word; } - virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) { - std::multimap::iterator i, upperbound; + std::multimap::iterator i, upperbound; /* If theyre not registered yet, we dont want * to know. @@ -148,11 +146,11 @@ class ModuleAlias : public Module return MOD_RES_PASSTHRU; /* We dont have any commands looking like this? Stop processing. */ - i = Aliases.find(command); + i = Aliases.find(command.c_str()); if (i == Aliases.end()) return MOD_RES_PASSTHRU; /* Avoid iterating on to different aliases if no patterns match. */ - upperbound = Aliases.upper_bound(command); + upperbound = Aliases.upper_bound(command.c_str()); irc::string c = command.c_str(); /* The parameters for the command in their original form, with the command stripped off */ @@ -197,11 +195,12 @@ class ModuleAlias : public Module } Channel *c = (Channel *)dest; - std::string fcommand; + std::string scommand; // text is like "!moo cows bite me", we want "!moo" first irc::spacesepstream ss(text); - ss.GetToken(fcommand); + ss.GetToken(scommand); + irc::string fcommand = scommand.c_str(); if (fcommand.empty()) { @@ -216,15 +215,14 @@ class ModuleAlias : public Module // nor do we give a shit about the prefix fcommand.erase(fcommand.begin()); - std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper); - std::multimap::iterator i = Aliases.find(fcommand); + std::multimap::iterator i = Aliases.find(fcommand); if (i == Aliases.end()) return; /* Avoid iterating on to other aliases if no patterns match */ - std::multimap::iterator upperbound = Aliases.upper_bound(fcommand); + std::multimap::iterator upperbound = Aliases.upper_bound(fcommand); /* The parameters for the command in their original form, with the command stripped off */ @@ -308,55 +306,57 @@ class ModuleAlias : public Module } } - void DoCommand(std::string newline, User* user, Channel *c, const std::string &original_line) + void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line) { - std::vector pars; - - for (int v = 1; v < 10; v++) + std::string result; + result.reserve(MAXBUF); + for (unsigned int i = 0; i < newline.length(); i++) { - std::string var = "$"; - var.append(ConvToStr(v)); - var.append("-"); - std::string::size_type x = newline.find(var); - - while (x != std::string::npos) - { - newline.erase(x, var.length()); - newline.insert(x, GetVar(var, original_line)); - x = newline.find(var); - } - - var = "$"; - var.append(ConvToStr(v)); - x = newline.find(var); - - while (x != std::string::npos) + char c = newline[i]; + if (c == '$') { - newline.erase(x, var.length()); - newline.insert(x, GetVar(var, original_line)); - x = newline.find(var); + if (isdigit(newline[i+1])) + { + int len = (newline[i+2] == '-') ? 3 : 2; + std::string var = newline.substr(i, len); + result.append(GetVar(var, original_line)); + i += len - 1; + } + else if (newline.substr(i, 5) == "$nick") + { + result.append(user->nick); + i += 4; + } + else if (newline.substr(i, 5) == "$host") + { + result.append(user->host); + i += 4; + } + else if (newline.substr(i, 5) == "$chan") + { + if (chan) + result.append(chan->name); + i += 4; + } + else if (newline.substr(i, 6) == "$ident") + { + result.append(user->ident); + i += 5; + } + else if (newline.substr(i, 6) == "$vhost") + { + result.append(user->dhost); + i += 5; + } + else + result.push_back(c); } + else + result.push_back(c); } - /* Special variables */ - SearchAndReplace(newline, std::string("$nick"), user->nick); - SearchAndReplace(newline, std::string("$ident"), user->ident); - SearchAndReplace(newline, std::string("$host"), user->host); - SearchAndReplace(newline, std::string("$vhost"), user->dhost); - - if (c) - { - /* Channel specific variables */ - SearchAndReplace(newline, std::string("$chan"), c->name); - } - else - { - /* We don't want these in a user alias */ - SearchAndReplace(newline, std::string("$chan"), std::string("")); - } - - irc::tokenstream ss(newline); - pars.clear(); + irc::tokenstream ss(result); + std::vector pars; std::string command, token; ss.GetToken(command);