From 55c938254c54114250ff40ad5b37e0ad15b4cfe6 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Sat, 25 Feb 2023 13:25:48 +0000 Subject: [PATCH 1/2] Add TODO items to serverrpc.cpp and clean up a comment --- docs/JSON-RPC.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/JSON-RPC.md b/docs/JSON-RPC.md index 039a659ef8..0a0b4db0f8 100644 --- a/docs/JSON-RPC.md +++ b/docs/JSON-RPC.md @@ -280,7 +280,7 @@ Results: | result.city | string | The server city. | | result.countryId | number | The server country ID (see QLocale::Country). | | result.welcomeMessage | string | The server welcome message. | -| result.directoryServer | string | The directory server to which this server requested registration, or blank if none. | +| result.directoryServer | string | The directory with which this server requested registration, or blank if none. | | result.registrationStatus | string | The server registration status as string (see ESvrRegStatus and SerializeRegistrationStatus). | From 352b687eb8560012b0b00f50a79fafec2d9567e3 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Tue, 28 Mar 2023 21:20:59 +0100 Subject: [PATCH 2/2] serverrpc removal of "directory server" usage (including protocol) --- docs/JSON-RPC.md | 2 +- src/serverrpc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/JSON-RPC.md b/docs/JSON-RPC.md index 0a0b4db0f8..0fdc314507 100644 --- a/docs/JSON-RPC.md +++ b/docs/JSON-RPC.md @@ -280,7 +280,7 @@ Results: | result.city | string | The server city. | | result.countryId | number | The server country ID (see QLocale::Country). | | result.welcomeMessage | string | The server welcome message. | -| result.directoryServer | string | The directory with which this server requested registration, or blank if none. | +| result.directory | string | The directory with which this server requested registration, or blank if none. | | result.registrationStatus | string | The server registration status as string (see ESvrRegStatus and SerializeRegistrationStatus). | diff --git a/src/serverrpc.cpp b/src/serverrpc.cpp index 4be384f396..4e56ab9dd1 100644 --- a/src/serverrpc.cpp +++ b/src/serverrpc.cpp @@ -106,7 +106,7 @@ CServerRpc::CServerRpc ( CServer* pServer, CRpcServer* pRpcServer, QObject* pare /// @result {string} result.city - The server city. /// @result {number} result.countryId - The server country ID (see QLocale::Country). /// @result {string} result.welcomeMessage - The server welcome message. - /// @result {string} result.directoryServer - The directory server to which this server requested registration, or blank if none. + /// @result {string} result.directory - The directory with which this server requested registration, or blank if none. /// @result {string} result.registrationStatus - The server registration status as string (see ESvrRegStatus and SerializeRegistrationStatus). pRpcServer->HandleMethod ( "jamulusserver/getServerProfile", [=] ( const QJsonObject& params, QJsonObject& response ) { QString dsName = ""; @@ -119,7 +119,7 @@ CServerRpc::CServerRpc ( CServer* pServer, CRpcServer* pRpcServer, QObject* pare { "city", pServer->GetServerCity() }, { "countryId", pServer->GetServerCountry() }, { "welcomeMessage", pServer->GetWelcomeMessage() }, - { "directoryServer", dsName }, // TODO rename to 'directory' and update doccomment above + { "directory", dsName }, { "registrationStatus", SerializeRegistrationStatus ( pServer->GetSvrRegStatus() ) }, }; response["result"] = result;