Clean up User::FormatModes(), rename to GetModeLetters()

Prefix the returned string with '+'

2 files changed, 3 insertions, 3 deletions

diff --git a/src/coremods/core_user/cmd_mode.cpp b/src/coremods/core_user/cmd_mode.cpp
index b1790bb89..65ab96112 100644
--- a/src/coremods/core_user/cmd_mode.cpp
+++ b/src/coremods/core_user/cmd_mode.cpp
@@ -145,7 +145,7 @@ void CommandMode::DisplayCurrentModes(User* user, User* targetuser, Channel* tar
 			// Display user's current mode string
 			// XXX: Use WriteServ() because WriteNumeric() assumes the target (i.e. next word after the number)
 			// is 'user' and puts his nick there which is not what we want
-			user->WriteServ("%03d %s :+%s", RPL_UMODEIS, targetuser->nick.c_str(), targetuser->FormatModes());
+			user->WriteServ("%03d %s :%s", RPL_UMODEIS, targetuser->nick.c_str(), targetuser->GetModeLetters().c_str());
 			if (targetuser->IsOper())
 			{
 				ModeHandler* snomask = ServerInstance->Modes->FindMode('s', MODETYPE_USER);
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index ed5c1cda0..81e62c8e5 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -211,11 +211,11 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, un
 	{
 		if (dest->IsModeSet(snomaskmode))
 		{
-			whois.SendLine(379, InspIRCd::Format("is using modes +%s %s", dest->FormatModes(), snomaskmode->GetUserParameter(dest).c_str()));
+			whois.SendLine(379, InspIRCd::Format("is using modes %s %s", dest->GetModeLetters().c_str(), snomaskmode->GetUserParameter(dest).c_str()));
 		}
 		else
 		{
-			whois.SendLine(379, InspIRCd::Format("is using modes +%s", dest->FormatModes()));
+			whois.SendLine(379, InspIRCd::Format("is using modes %s", dest->GetModeLetters().c_str()));
 		}
 	}