From cbe130569571d8ca30306913a0e3545405358a91 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 23 Sep 2016 21:32:02 -0400 Subject: Add some replacement tokens for akick reason and welcome notice --- data/nickserv.example.conf | 2 +- modules/chanserv/akick.cpp | 6 +++++- modules/nickserv/main/nickserv.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index fcd37db71..88d4ac9cc 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -70,7 +70,7 @@ module confirmemailchanges = no /* - * A message sent to users on connect if they use an unregistered nick. + * A message sent to users on connect if they use an unregistered nick. %n will be replaced with the user's nickname. * * This directive is optional. */ diff --git a/modules/chanserv/akick.cpp b/modules/chanserv/akick.cpp index d1bb0a099..71ea85e73 100644 --- a/modules/chanserv/akick.cpp +++ b/modules/chanserv/akick.cpp @@ -717,7 +717,11 @@ class CSAKick : public Module mask = ak->GetMask(); reason = ak->GetReason(); if (reason.empty()) - reason = Language::Translate(u, Config->GetModule(this)->Get("autokickreason").c_str()); + { + reason = Language::Translate(u, Config->GetModule(this)->Get("autokickreason")); + reason = reason.replace_all_cs("%n", u->nick); + reason = reason.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/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp index 4f1b047fd..40d6f3767 100644 --- a/modules/nickserv/main/nickserv.cpp +++ b/modules/nickserv/main/nickserv.cpp @@ -510,7 +510,7 @@ class NickServCore : public Module, public NickServ::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