summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2010-10-06 21:47:01 -0400
committerAdam <Adam@anope.org>2010-10-06 21:47:01 -0400
commit7f4362138ab8d015ae4b200fa96d85ee70a7e184 (patch)
tree629a4f24999b71dc1acc34c3b679fb0d7e2d2297
parent4da258ff785e5333db807d9e8dc66b521e8c8fe0 (diff)
Made nickserv:nogroupchange work
-rw-r--r--include/language.h1
-rw-r--r--modules/core/ns_group.cpp2
-rw-r--r--src/language.cpp2
3 files changed, 5 insertions, 0 deletions
diff --git a/include/language.h b/include/language.h
index 977846f4b..e40287bf7 100644
--- a/include/language.h
+++ b/include/language.h
@@ -88,6 +88,7 @@ enum LanguageString
NICK_GROUP_DISABLED,
NICK_GROUP_FAILED,
NICK_GROUP_PLEASE_WAIT,
+ NICK_GROUP_CHANGE_DISABLED,
NICK_GROUP_SAME,
NICK_GROUP_TOO_MANY,
NICK_GROUP_JOINED,
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index 615f388f0..44f13a202 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -75,6 +75,8 @@ class CommandNSGroup : public Command
u->SendMessage(NickServ, NICK_GROUP_SAME, target->nick.c_str());
else if (na && na->nc != u->Account())
u->SendMessage(NickServ, NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
+ else if (na && Config->NSNoGroupChange)
+ u->SendMessage(NickServ, NICK_GROUP_CHANGE_DISABLED, Config->s_NickServ.c_str());
else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
u->SendMessage(NickServ, NICK_GROUP_TOO_MANY, target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
else
diff --git a/src/language.cpp b/src/language.cpp
index 78d124fda..ca55f0bb8 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -277,6 +277,8 @@ Anope::string language_strings[LANG_STRING_COUNT] = {
_("Sorry, grouping failed."),
/* NICK_GROUP_PLEASE_WAIT */
_("Please wait %d seconds before using the GROUP command again."),
+ /* NICK_GROUP_CHANGE_DISABLED */
+ _("Your nick is already registered; type \002%R%s DROP\002 first."),
/* NICK_GROUP_SAME */
_("You are already a member of the group of %s."),
/* NICK_GROUP_TOO_MANY */