diff options
| author | Adam <Adam@anope.org> | 2013-06-19 20:53:40 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-06-19 20:53:40 -0400 |
| commit | 1773eef143bc7bc63e7ffb2da124ea46ae770982 (patch) | |
| tree | 1356a8b81082bf5685ea6437a2b6512f4e27a927 /src | |
| parent | 7704ee7107db8f689b7f9f7179097e0045597507 (diff) | |
Don't enforce usestrictprivmsg on TS6 IRCds and cache the value of usestrictprivmsg
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.cpp | 3 | ||||
| -rw-r--r-- | src/messages.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/config.cpp b/src/config.cpp index 98b813ee7..4b16d8e97 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -182,7 +182,8 @@ Conf::Conf() : Block("") this->ReadTimeout = options->Get<time_t>("readtimeout"); this->UsePrivmsg = options->Get<bool>("useprivmsg"); - this->StrictPrivmsg = !options->Get<bool>("usestrictprivmsg") ? "/msg " : "/"; + this->UseStrictPrivmsg = options->Get<bool>("usestrictprivmsg"); + this->StrictPrivmsg = !UseStrictPrivmsg ? "/msg " : "/"; { std::vector<Anope::string> defaults; spacesepstream(this->GetModule("nickserv")->Get<const Anope::string>("defaults")).GetTokens(defaults); diff --git a/src/messages.cpp b/src/messages.cpp index fcaeffa43..1fcc8b898 100644 --- a/src/messages.cpp +++ b/src/messages.cpp @@ -300,7 +300,7 @@ void Privmsg::Run(MessageSource &source, const std::vector<Anope::string> ¶m if (!servername.equals_ci(Me->GetName())) return; } - else if (Config->GetBlock("options")->Get<bool>("usestrictprivmsg")) + else if (!IRCD->RequiresID && Config->UseStrictPrivmsg) { const BotInfo *bi = BotInfo::Find(receiver); if (!bi) |