From ecdd046c80d696a882b12af615ed9f217afd40a9 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Dec 2015 19:37:24 -0500 Subject: Add some replacement tokens for akick reason and welcome notice --- modules/commands/cs_akick.cpp | 6 +++++- modules/pseudoclients/nickserv.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 03db4c623..327b98b09 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -554,7 +554,11 @@ class CSAKick : public Module mask = autokick->mask; reason = autokick->reason; if (reason.empty()) - reason = Language::Translate(u, Config->GetModule(this)->Get("autokickreason").c_str()); + { + reason = Language::Translate(u, Config->GetModule(this)->Get("autokickreason").c_str()) + .replace_all_cs("%n", u->nick) + .replace_all_cs("%c", c->name); + } if (reason.empty()) reason = Language::Translate(u, _("User has been banned from the channel")); return EVENT_STOP; diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index ee1049195..5d3579ced 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -400,7 +400,7 @@ class NickServCore : public Module, public NickServService const Anope::string &unregistered_notice = Config->GetModule(this)->Get("unregistered_notice"); if (!Config->GetModule("nickserv")->Get("nonicknameownership") && !unregistered_notice.empty() && !na && !u->Account()) - u->SendMessage(NickServ, unregistered_notice); + u->SendMessage(NickServ, unregistered_notice.replace_all_cs("%n", u->nick)); else if (na && !u->IsIdentified(true)) this->Validate(u); } -- cgit