pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-04 07:03:13 +02:00
Code Activity

Fixed some problems with m_alias and fantasy

Browse Source
This commit is contained in:
Adam
2011-03-11 15:10:30 -05:00
parent bb3b421385
commit 1b2f3bf369
5 changed files with 79 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/extra/m_alias.cpp
+37 -4
View File
@@ -23,8 +23,8 @@ class ModuleAlias : public Module
public:
ModuleAlias(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
{
Implementation i[] = { I_OnReload, I_OnPreCommandRun };
ModuleManager::Attach(i, this, 2);
Implementation i[] = { I_OnReload, I_OnPreCommandRun, I_OnBotFantasy };
ModuleManager::Attach(i, this, 3);
OnReload(false);
}
@@ -69,11 +69,13 @@ class ModuleAlias : public Module
{
const CommandAlias &alias = it->second;
if (!fantasy && !bi->nick.equals_ci(alias.source_client))
if (!u->HasMode(UMODE_OPER) && alias.operonly)
continue;
else if (fantasy != alias.fantasy)
continue;
else if (!u->HasMode(UMODE_OPER) && alias.operonly)
else if (fantasy && alias.fantasy) // OnBotFantasy gets this!
return EVENT_STOP;
else if (!bi->nick.equals_ci(alias.source_client))
continue;
BotInfo *target = findbot(alias.target_client);
@@ -85,6 +87,37 @@ class ModuleAlias : public Module
return EVENT_CONTINUE;
}
void OnBotFantasy(const Anope::string &command, User *u, ChannelInfo *ci, const Anope::string &params)
{
std::multimap<Anope::string, CommandAlias, std::less<ci::string> >::const_iterator it = aliases.find(command), it_end = it;
if (it_end != aliases.end())
it_end = aliases.upper_bound(command);
for (; it != it_end; ++it)
{
const CommandAlias &alias = it->second;
if (!u->HasMode(UMODE_OPER) && alias.operonly)
continue;
BotInfo *target = findbot(alias.target_client);
if (!target)
target = ChanServ;
Anope::string full_message = alias.target_command;
if (target == ChanServ || target == BotServ)
{
Command *target_c = FindCommand(target, alias.target_command);
if (target_c && !target_c->HasFlag(CFLAG_STRIP_CHANNEL))
full_message += " " + ci->name;
}
if (!params.empty())
full_message += + " " + params;
mod_run_cmd(target, u, ci, full_message);
break;
}
}
};
MODULE_INIT(ModuleAlias)