Added lobby commands /setpassword and /removepassword

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h

@@ -6,6 +6,8 @@
 
 //#define USE_PORT_MAPPER 1
 
+#define GENERALS_ONLINE_LOBBY_MAX_PASSWORD_LENGTH 16
+
 #if !defined(_DEBUG)
 //#define USE_TEST_ENV 1
 #endif

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h

@@ -51,7 +51,9 @@ enum EWebSocketMessageID
 	MATCHMAKING_ACTION_JOIN_PREARRANGED_LOBBY = 20,
 	MATCHMAKING_ACTION_START_GAME = 21,
 	MATCHMAKING_MESSAGE = 22,
-	START_GAME_COUNTDOWN_STARTED = 23
+	START_GAME_COUNTDOWN_STARTED = 23,
+	LOBBY_REMOVE_PASSWORD = 24,
+	LOBBY_CHANGE_PASSWORD = 25
 };
 
 enum class EQoSRegions
@@ -168,6 +170,10 @@ class WebSocket
 	void SendData_Signalling(int64_t targetUserID, std::vector<uint8_t> vecPayload);
 	void SendData_StartGame();
 
+	void SendData_ChangeLobbyPassword(UnicodeString& strNewPassword);
+	void SendData_RemoveLobbyPassword();
+
+
 	void SendData_CountdownStarted();
 
 	void Tick();

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp

@@ -402,7 +402,7 @@ void PopupHostGameInit( WindowLayout *layout, void *userData )
 	// hide password for streams
 	EntryData* e = (EntryData*)textEntryGamePassword->winGetUserData();
 	e->secretText = true;
-	e->maxTextLen = 16;
+	e->maxTextLen = GENERALS_ONLINE_LOBBY_MAX_PASSWORD_LENGTH;
 #endif
 
 }

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

@@ -3353,6 +3353,78 @@ Bool handleGameSetupSlashCommands(UnicodeString uText)
 
 		return TRUE;
 	}
+	else if (token == "setpassword" && uText.getLength() > 13)
+	{
+		UnicodeString newPassword(uText.str() + 13); // skip the /setpassword and space
+
+		NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
+		NGMP_OnlineServices_AuthInterface* pAuthInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_AuthInterface>();
+		if (pLobbyInterface != nullptr && pAuthInterface != nullptr)
+		{
+			LobbyEntry& theLobby = pLobbyInterface->GetCurrentLobby();
+
+			// This is just done clientside to show an error message, server validates it also
+			if (theLobby.owner == pAuthInterface->GetUserID())
+			{
+				if (newPassword.getLength() == 0 || newPassword.getLength() > GENERALS_ONLINE_LOBBY_MAX_PASSWORD_LENGTH)
+				{
+					UnicodeString errorMsg;
+					errorMsg.format(L"The new password must be between 1 and %d characters.", GENERALS_ONLINE_LOBBY_MAX_PASSWORD_LENGTH);
+					GadgetListBoxAddEntryText(listboxGameSetupChat, errorMsg, GameMakeColor(255, 0, 0, 255), -1, -1);
+				}
+				else
+				{
+					WebSocket* pWS = NGMP_OnlineServicesManager::GetWebSocket();
+					if (pWS != nullptr)
+					{
+						pWS->SendData_ChangeLobbyPassword(newPassword);
+
+						GadgetListBoxAddEntryText(listboxGameSetupChat, UnicodeString(L"The lobby password has been updated. You can remove the password by using /removepassword"), GameMakeColor(0, 255, 0, 255), -1, -1);
+					}
+				}
+			}
+			else
+			{
+				GadgetListBoxAddEntryText(listboxGameSetupChat, UnicodeString(L"You are not the lobby owner."), GameMakeColor(255, 0, 0, 255), -1, -1);
+			}
+		}
+
+		return TRUE; // was a slash command
+	}
+	else if (token == "removepassword" || token == "clearpassword" || token == "resetpassword")
+	{
+		NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
+		NGMP_OnlineServices_AuthInterface* pAuthInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_AuthInterface>();
+		if (pLobbyInterface != nullptr && pAuthInterface != nullptr)
+		{
+			LobbyEntry& theLobby = pLobbyInterface->GetCurrentLobby();
+
+			// This is just done clientside to show an error message, server validates it also
+			if (theLobby.owner == pAuthInterface->GetUserID())
+			{
+				if (theLobby.passworded)
+				{
+					WebSocket* pWS = NGMP_OnlineServicesManager::GetWebSocket();
+					if (pWS != nullptr)
+					{
+						pWS->SendData_RemoveLobbyPassword();
+
+						GadgetListBoxAddEntryText(listboxGameSetupChat, UnicodeString(L"The lobby password has been removed. You can set a password using /setpassword <password>"), GameMakeColor(0, 255, 0, 255), -1, -1);
+					}
+				}
+				else
+				{
+					GadgetListBoxAddEntryText(listboxGameSetupChat, UnicodeString(L"The lobby is not passworded. You can set a password using /setpassword <password>"), GameMakeColor(255, 0, 0, 255), -1, -1);
+				}
+			}
+			else
+			{
+				GadgetListBoxAddEntryText(listboxGameSetupChat, UnicodeString(L"You are not the lobby owner."), GameMakeColor(255, 0, 0, 255), -1, -1);
+			}
+		}
+
+		return TRUE; // was a slash command
+	}
 	else if (token == "connections" || token == "conns" || token == "c")
 	{
 		// TODO_NGMP: Disable this on retail builds

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp

@@ -605,6 +605,26 @@ void WebSocket::Shutdown()
 	Disconnect();
 }
 
+void WebSocket::SendData_ChangeLobbyPassword(UnicodeString& strNewPassword)
+{
+	nlohmann::json j;
+	j["msg_id"] = EWebSocketMessageID::LOBBY_CHANGE_PASSWORD;
+	j["new_password"] = to_utf8(strNewPassword.str());
+	std::string strBody = j.dump();
+
+	Send(strBody.c_str());
+}
+
+
+void WebSocket::SendData_RemoveLobbyPassword()
+{
+	nlohmann::json j;
+	j["msg_id"] = EWebSocketMessageID::LOBBY_REMOVE_PASSWORD;
+	std::string strBody = j.dump();
+
+	Send(strBody.c_str());
+}
+
 void WebSocket::SendData_ChangeName(UnicodeString& strNewName)
 {
 	nlohmann::json j;
@@ -663,7 +683,6 @@ void WebSocket::SendData_StartGame()
 	Send(strBody.c_str());
 }
 
-
 void WebSocket::SendData_CountdownStarted()
 {
 	nlohmann::json j;