Send RPL_SAVENICK from irc2 when renaming a user to their UUID.

3 files changed, 5 insertions, 0 deletions

diff --git a/src/modules/m_codepage.cpp b/src/modules/m_codepage.cpp
index 7a20e6e52..4054c72c1 100644
--- a/src/modules/m_codepage.cpp
+++ b/src/modules/m_codepage.cpp
@@ -83,7 +83,10 @@ class ModuleCodepage
 		{
 			LocalUser* user = *iter;
 			if (user->nick != user->uuid && !ServerInstance->IsNick(user->nick))
+			{
+				user->WriteNumeric(RPL_SAVENICK, user->uuid, "Your nickname is no longer valid.");
 				user->ChangeNick(user->uuid);
+			}
 		}
 	}
 
diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index e9292f445..8d1bc80ba 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -67,6 +67,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		if (!u->ChangeNick(nick, NickTS))
 		{
 			// Changing to 'nick' failed (it may already be in use), change to the uuid
+			u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname is in use by an older user on a new server.");
 			u->ChangeNick(u->uuid);
 		}
 	}
diff --git a/src/xline.cpp b/src/xline.cpp
index 0d627023e..e4c6b6fb3 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -688,6 +688,7 @@ bool QLine::Matches(User *u)
 void QLine::Apply(User* u)
 {
 	/* Force to uuid on apply of Q-line, no need to disconnect anymore :) */
+	u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname has been Q-lined.");
 	u->ChangeNick(u->uuid);
 }