Replace usestrictprivmsg with something actually useful.

Every IRC server we support (other than Bahamut which is probably
on the chopping bock) uses UIDs so this setting does nothing.

Instead, allow configuring a server-side alias for each service
and use that when servicealias is enabled.

6 files changed, 21 insertions, 17 deletions

diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index b517770b1..882845074 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -262,9 +262,9 @@ public:
 			"malicious users from \"taking over\" channels by limiting\n"
 			"who is allowed channel operator privileges. Available\n"
 			"commands are listed below; to use them, type\n"
-			"\002%s%s \037command\037\002. For more information on a\n"
-			"specific command, type \002%s%s HELP \037command\037\002.\n"),
-			ChanServ->nick.c_str(), ChanServ->nick.c_str(),  Config->StrictPrivmsg.c_str(), ChanServ->nick.c_str(), Config->StrictPrivmsg.c_str(), ChanServ->nick.c_str());
+			"\002%s \037command\037\002. For more information on a\n"
+			"specific command, type \002%s HELP \037command\037\002.\n"),
+			ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->GetQueryCommand().c_str(), ChanServ->GetQueryCommand().c_str());
 		return EVENT_CONTINUE;
 	}
 
diff --git a/modules/chanserv/cs_access.cpp b/modules/chanserv/cs_access.cpp
index b7c39ac6d..5e4f0cffe 100644
--- a/modules/chanserv/cs_access.cpp
+++ b/modules/chanserv/cs_access.cpp
@@ -630,8 +630,8 @@ public:
 		Anope::string cmd;
 		if (Command::FindCommandFromService("chanserv/levels", bi, cmd))
 			source.Reply(_("\002User access levels\002 can be seen by using the\n"
-					"\002%s\002 command; type \002%s%s HELP LEVELS\002 for\n"
-					"information."), cmd.c_str(), Config->StrictPrivmsg.c_str(), bi->nick.c_str());
+					"\002%s\002 command; type \002%s HELP LEVELS\002 for\n"
+					"information."), cmd.c_str(), bi->GetQueryCommand().c_str());
 		return true;
 	}
 };
@@ -665,7 +665,10 @@ class CommandCSLevels final
 		{
 			Privilege *p = PrivilegeManager::FindPrivilege(what);
 			if (p == NULL)
-				source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS\002 for a list of valid settings."), what.c_str(), Config->StrictPrivmsg.c_str(), source.service->nick.c_str());
+			{
+				source.Reply(_("Setting \002%s\002 not known.  Type \002%s HELP LEVELS\002 for a list of valid settings."),
+					what.c_str(), source.service->GetQueryCommand().c_str());
+			}
 			else
 			{
 				bool override = !source.AccessFor(ci).HasPriv("FOUNDER");
@@ -706,7 +709,8 @@ class CommandCSLevels final
 			return;
 		}
 
-		source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS\002 for a list of valid settings."), what.c_str(), Config->StrictPrivmsg.c_str(), source.service->nick.c_str());
+		source.Reply(_("Setting \002%s\002 not known.  Type \002%s HELP LEVELS\002 for a list of valid settings."),
+			what.c_str(), source.service->GetQueryCommand().c_str());
 	}
 
 	static void DoList(CommandSource &source, ChannelInfo *ci)
diff --git a/modules/chanserv/cs_drop.cpp b/modules/chanserv/cs_drop.cpp
index 91032905f..ea7f07b50 100644
--- a/modules/chanserv/cs_drop.cpp
+++ b/modules/chanserv/cs_drop.cpp
@@ -58,8 +58,8 @@ public:
 				*code = Anope::Random(15);
 			}
 
-			source.Reply(CONFIRM_DROP, ci->name.c_str(), Config->StrictPrivmsg.c_str(),
-				source.service->nick.c_str(), ci->name.c_str(), code->c_str());
+			source.Reply(CONFIRM_DROP, ci->name.c_str(), source.service->GetQueryCommand().c_str(),
+				ci->name.c_str(), code->c_str());
 			return;
 		}
 
diff --git a/modules/chanserv/cs_register.cpp b/modules/chanserv/cs_register.cpp
index 1610a98ba..1a660efa9 100644
--- a/modules/chanserv/cs_register.cpp
+++ b/modules/chanserv/cs_register.cpp
@@ -100,9 +100,9 @@ public:
 		Anope::string cmd;
 		if (Command::FindCommandFromService("chanserv/access", bi, cmd))
 			source.Reply(_(" \n"
-				"See the \002%s\002 command (\002%s%s HELP ACCESS\002) for\n"
+				"See the \002%s\002 command (\002%s HELP ACCESS\002) for\n"
 				"information on giving a subset of these privileges to\n"
-				"other channel users.\n"), cmd.c_str(), Config->StrictPrivmsg.c_str(), bi->nick.c_str());
+				"other channel users.\n"), cmd.c_str(), bi->GetQueryCommand().c_str());
 		source.Reply(_(" \n"
 			"NOTICE: In order to register a channel, you must have\n"
 			"first registered your nickname."));
diff --git a/modules/chanserv/cs_set.cpp b/modules/chanserv/cs_set.cpp
index a68aefa3c..93be5c8b4 100644
--- a/modules/chanserv/cs_set.cpp
+++ b/modules/chanserv/cs_set.cpp
@@ -59,8 +59,8 @@ public:
 				c->OnServHelp(source);
 			}
 		}
-		source.Reply(_("Type \002%s%s HELP %s \037option\037\002 for more information on a\n"
-				"particular option."), Config->StrictPrivmsg.c_str(), source.service->nick.c_str(), this_name.c_str());
+		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information on a\n"
+				"particular option."), source.service->GetQueryCommand().c_str(), this_name.c_str());
 		return true;
 	}
 };
diff --git a/modules/chanserv/cs_xop.cpp b/modules/chanserv/cs_xop.cpp
index db8456492..e9a4899d2 100644
--- a/modules/chanserv/cs_xop.cpp
+++ b/modules/chanserv/cs_xop.cpp
@@ -594,11 +594,11 @@ public:
 			source.Reply(_("Alternative methods of modifying channel access lists are\n"
 					"available."));
 			if (!access_cmd.empty())
-				source.Reply(_("See \002%s%s HELP %s\002 for more information\n"
-						"about the access list."), Config->StrictPrivmsg.c_str(), access_bi->nick.c_str(), access_cmd.c_str());
+				source.Reply(_("See \002%s HELP %s\002 for more information\n"
+						"about the access list."), access_bi->GetQueryCommand().c_str(), access_cmd.c_str());
 			if (!flags_cmd.empty())
-				source.Reply(_("See \002%s%s HELP %s\002 for more information\n"
-						"about the flags system."), Config->StrictPrivmsg.c_str(), flags_bi->nick.c_str(), flags_cmd.c_str());
+				source.Reply(_("See \002%s HELP %s\002 for more information\n"
+						"about the flags system."), flags_bi->GetQueryCommand().c_str(), flags_cmd.c_str());
 		}
 		return true;
 	}