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))
+ // We use substr(1) here to remove the fantasy prefix
+ if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
return 0;
}
{
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!");
+ 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.");
return 1;
}
/* 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();
ServerInstance->Parser->CallHandler(command, pars, user);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ReadAliases();
}