mirror of
https://github.com/anope/anope.git
synced 2026-06-26 10:56:38 +02:00
Allow command aliases to be redirected to different pseudo clients
This commit is contained in:
+30
-21
@@ -11,14 +11,15 @@ struct CommandAlias
|
||||
{
|
||||
bool fantasy;
|
||||
bool operonly;
|
||||
Anope::string client;
|
||||
Anope::string alias;
|
||||
Anope::string command;
|
||||
Anope::string source_client;
|
||||
Anope::string source_command;
|
||||
Anope::string target_client;
|
||||
Anope::string target_command;
|
||||
};
|
||||
|
||||
class ModuleAlias : public Module
|
||||
{
|
||||
std::map<Anope::string, CommandAlias, std::less<ci::string> > aliases;
|
||||
std::multimap<Anope::string, CommandAlias, std::less<ci::string> > aliases;
|
||||
public:
|
||||
ModuleAlias(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
|
||||
{
|
||||
@@ -38,40 +39,48 @@ class ModuleAlias : public Module
|
||||
{
|
||||
bool fantasy = config.ReadFlag("alias", "fantasy", "no", i);
|
||||
bool operonly = config.ReadFlag("alias", "operonly", "no", i);
|
||||
Anope::string client = config.ReadValue("alias", "client", "", i);
|
||||
Anope::string aliasname = config.ReadValue("alias", "alias", "", i);
|
||||
Anope::string command = config.ReadValue("alias", "command", "", i);
|
||||
Anope::string source_client = config.ReadValue("alias", "source_client", "", i);
|
||||
Anope::string source_command = config.ReadValue("alias", "source_command", "", i);
|
||||
Anope::string target_client = config.ReadValue("alias", "target_client", "", i);
|
||||
Anope::string target_command = config.ReadValue("alias", "target_command", "", i);
|
||||
|
||||
if (aliasname.empty() || command.empty())
|
||||
if ((!fantasy &&source_client.empty()) || source_command.empty() || target_client.empty() || target_command.empty())
|
||||
continue;
|
||||
|
||||
CommandAlias alias;
|
||||
alias.fantasy = fantasy;
|
||||
alias.operonly = operonly;
|
||||
alias.client = client;
|
||||
alias.alias = aliasname;
|
||||
alias.command = command;
|
||||
alias.source_client = source_client;
|
||||
alias.source_command = source_command;
|
||||
alias.target_client = target_client;
|
||||
alias.target_command = target_command;
|
||||
|
||||
this->aliases.insert(std::make_pair(aliasname, alias));
|
||||
this->aliases.insert(std::make_pair(source_command, alias));
|
||||
}
|
||||
}
|
||||
|
||||
EventReturn OnPreCommandRun(User *u, BotInfo *bi, Anope::string &command, Anope::string &message, ChannelInfo *ci)
|
||||
EventReturn OnPreCommandRun(User *&u, BotInfo *&bi, Anope::string &command, Anope::string &message, ChannelInfo *&ci)
|
||||
{
|
||||
bool fantasy = ci != NULL;
|
||||
std::map<Anope::string, CommandAlias, std::less<ci::string> >::const_iterator it = aliases.find(command);
|
||||
if (it != aliases.end())
|
||||
std::map<Anope::string, CommandAlias, std::less<ci::string> >::const_iterator it = aliases.find(command),
|
||||
it_end = aliases.upper_bound(command);
|
||||
for (; it != it_end; ++it)
|
||||
{
|
||||
const CommandAlias &alias = it->second;
|
||||
|
||||
if (fantasy != alias.fantasy)
|
||||
return EVENT_CONTINUE;
|
||||
|
||||
if (!fantasy && !bi->nick.equals_ci(alias.source_client))
|
||||
continue;
|
||||
else if (fantasy != alias.fantasy)
|
||||
continue;
|
||||
else if (!u->HasMode(UMODE_OPER) && alias.operonly)
|
||||
return EVENT_CONTINUE;
|
||||
else if (!fantasy && !bi->nick.equals_ci(alias.client))
|
||||
return EVENT_CONTINUE;
|
||||
continue;
|
||||
|
||||
command = alias.command;
|
||||
BotInfo *target = findbot(alias.target_client);
|
||||
if (target)
|
||||
bi = target;
|
||||
command = alias.target_command;
|
||||
break;
|
||||
}
|
||||
|
||||
return EVENT_CONTINUE;
|
||||
|
||||
Reference in New Issue
Block a user