X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=3f3c3b1ba916e2667a90b6bfdbedc10a21bee85d;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=4ba05729bd393ba569680de5fecbdb8fa8fd4e13;hpb=dcfae7ba4402d2922dee4763fe38ae2e64a3b2bc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 4ba05729b..3f3c3b1ba 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -65,10 +65,10 @@ class ModuleAlias : public Module virtual void ReadAliases() { - ConfigReader MyConf(ServerInstance); + ConfigReader MyConf; AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0); - + std::string fpre = MyConf.ReadValue("fantasy","prefix",0); fprefix = fpre.empty() ? '!' : fpre[0]; @@ -93,13 +93,12 @@ class ModuleAlias : public Module public: - ModuleAlias(InspIRCd* Me) - : Module(Me) - { + ModuleAlias() + { ReadAliases(); - Me->Modules->Attach(I_OnPreCommand, this); - Me->Modules->Attach(I_OnRehash, this); - Me->Modules->Attach(I_OnUserPreMessage, this); + ServerInstance->Modules->Attach(I_OnPreCommand, this); + ServerInstance->Modules->Attach(I_OnRehash, this); + ServerInstance->Modules->Attach(I_OnUserMessage, this); } @@ -109,7 +108,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR,API_VERSION); + return Version("Provides aliases of commands.", VF_VENDOR,API_VERSION); } std::string GetVar(std::string varname, const std::string &original_line) @@ -137,7 +136,7 @@ class ModuleAlias : public Module return word; } - virtual int 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, User *user, bool validated, const std::string &original_line) { std::multimap::iterator i, upperbound; @@ -145,12 +144,12 @@ class ModuleAlias : public Module * 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); 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); @@ -166,37 +165,34 @@ class ModuleAlias : public Module { 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) + virtual void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { if (target_type != TYPE_CHANNEL) { - 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')) { - ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no"); - return 0; + return; } Channel *c = (Channel *)dest; @@ -208,30 +204,24 @@ class ModuleAlias : public Module 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::iterator i = Aliases.find(fcommand); if (i == Aliases.end()) - return 0; - + return; + /* Avoid iterating on to other aliases if no patterns match */ std::multimap::iterator upperbound = Aliases.upper_bound(fcommand); @@ -241,22 +231,17 @@ class ModuleAlias : public Module 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; } @@ -295,7 +280,7 @@ class ModuleAlias : public Module { 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; } @@ -361,7 +346,12 @@ class ModuleAlias : public Module if (c) { /* Channel specific variables */ - SearchAndReplace(newline, std::string("$chan"), c->name); + 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); @@ -376,10 +366,17 @@ class ModuleAlias : public Module ServerInstance->Parser->CallHandler(command, pars, user); } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadAliases(); } + + virtual 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)