-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005, 2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2004-2007, 2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Provides aliases of commands. */
+#include "inspircd.h"
/** An alias definition
*/
-class Alias : public classbase
+class Alias
{
public:
/** The text of the alias command */
class ModuleAlias : public Module
{
- private:
-
char fprefix;
/* We cant use a map, there may be multiple aliases with the same name.
* We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
* -- w00t
- */
- std::multimap<std::string, Alias> Aliases;
+ */
+ std::multimap<irc::string, Alias> Aliases;
/* whether or not +B users are allowed to use fantasy commands */
bool AllowBots;
+ UserModeReference botmode;
- virtual void ReadAliases()
+ void ReadAliases()
{
- ConfigReader MyConf(ServerInstance);
-
- AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
-
- std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
+ ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+ AllowBots = fantasy->getBool("allowbots", false);
+ std::string fpre = fantasy->getString("prefix", "!");
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));
+ std::string aliastext = tag->getString("text");
+ a.AliasedCommand = aliastext.c_str();
+ tag->readString("replace", a.ReplaceFormat, true);
+ a.RequiredNick = tag->getString("requires");
+ a.ULineOnly = tag->getBool("uline");
+ a.ChannelCommand = tag->getBool("channelcommand", false);
+ a.UserCommand = tag->getBool("usercommand", true);
+ 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()
+ : botmode(this, "bot")
{
- ReadAliases();
- Me->Modules->Attach(I_OnPreCommand, this);
- Me->Modules->Attach(I_OnRehash, this);
- Me->Modules->Attach(I_OnUserPreMessage, this);
-
}
- virtual ~ModuleAlias()
+ void init() CXX11_OVERRIDE
{
+ ReadAliases();
+ Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("$Id$", VF_VENDOR,API_VERSION);
+ return Version("Provides aliases of commands.", VF_VENDOR);
}
std::string GetVar(std::string varname, const std::string &original_line)
return word;
}
- virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
+ ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
{
- std::multimap<std::string, Alias>::iterator i, upperbound;
+ std::multimap<irc::string, Alias>::iterator i, upperbound;
/* If theyre not registered yet, we dont want
* to know.
*/
if (user->registered != REG_ALL)
- return 0;
+ 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 0;
+ 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 */
{
if (DoAlias(user, NULL, &(i->second), compare, original_line))
{
- return 1;
+ return MOD_RES_DENY;
}
}
i++;
}
- // If aliases have been processed, aliases took it.
- return 1;
+ // If we made it here, no aliases actually matched.
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list, MessageType msgtype) CXX11_OVERRIDE
{
- if (target_type != TYPE_CHANNEL)
+ if ((target_type != TYPE_CHANNEL) || (msgtype != MSG_PRIVMSG))
{
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a channel msg");
- return 0;
+ return;
}
// fcommands are only for local users. Spanningtree will send them back out as their original cmd.
- if (!IS_LOCAL(user))
+ if (!user || !IS_LOCAL(user))
{
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not local");
- return 0;
+ return;
}
/* Stop here if the user is +B and allowbot is set to no. */
- if (!AllowBots && user->IsModeSet('B'))
+ if (!AllowBots && user->IsModeSet(botmode))
{
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no");
- return 0;
+ return;
}
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())
{
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: empty (?)");
- return 0; // wtfbbq
+ return; // wtfbbq
}
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: looking at fcommand %s", fcommand.c_str());
-
// we don't want to touch non-fantasy stuff
if (*fcommand.c_str() != fprefix)
{
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a fcommand");
- return 0;
+ return;
}
// nor do we give a shit about the prefix
fcommand.erase(fcommand.begin());
- std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper);
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: now got %s", fcommand.c_str());
-
- std::multimap<std::string, Alias>::iterator i = Aliases.find(fcommand);
+ std::multimap<irc::string, Alias>::iterator i = Aliases.find(fcommand);
if (i == Aliases.end())
- return 0;
-
+ return;
+
/* Avoid iterating on to other aliases if no patterns match */
- std::multimap<std::string, Alias>::iterator upperbound = Aliases.upper_bound(fcommand);
+ std::multimap<irc::string, Alias>::iterator upperbound = Aliases.upper_bound(fcommand);
/* The parameters for the command in their original form, with the command stripped off */
while (*(compare.c_str()) == ' ')
compare.erase(compare.begin());
- std::string safe(compare);
-
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str());
-
while (i != upperbound)
{
if (i->second.ChannelCommand)
{
- if (DoAlias(user, c, &(i->second), compare, safe))
- return 0;
+ // We use substr(1) here to remove the fantasy prefix
+ if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
+ return;
}
i++;
}
-
- return 0;
}
- int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe)
+ int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
{
User *u = NULL;
}
}
- if ((a->OperOnly) && (!IS_OPER(user)))
+ if ((a->OperOnly) && (!user->IsOper()))
return 0;
if (!a->RequiredNick.empty())
u = ServerInstance->FindNick(a->RequiredNick);
if (!u)
{
- user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
+ user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
return 1;
}
}
{
if (!ServerInstance->ULine(u->server))
{
- ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
- user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
+ ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
+ user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
return 1;
}
}
}
}
- 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<std::string> pars;
-
- for (int v = 1; v < 10; v++)
+ std::string result;
+ result.reserve(newline.length());
+ 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)
+ char c = newline[i];
+ if (c == '$')
{
- 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)
- {
- 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);
- }
-
- irc::tokenstream ss(newline);
- pars.clear();
+ irc::tokenstream ss(result);
+ std::vector<std::string> pars;
std::string command, token;
ss.GetToken(command);
- while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
+ while (ss.GetToken(token))
{
pars.push_back(token);
}
ServerInstance->Parser->CallHandler(command, pars, user);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ void OnRehash(User* user) CXX11_OVERRIDE
{
ReadAliases();
}
+
+ void Prioritize()
+ {
+ // Prioritise after spanningtree so that channel aliases show the alias before the effects.
+ Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so");
+ ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, &linkmod);
+ }
};
MODULE_INIT(ModuleAlias)
projects / user / henk / code / inspircd.git / blobdiff