Consistent use of countryId

jamulussoftware · Mar 22, 2024 · 0372ce1 · 0372ce1
1 parent 667191d
commit 0372ce1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/JSON-RPC.md b/docs/JSON-RPC.md
@@ -192,7 +192,7 @@ Requests server list.
 
 Parameters:
 
-| Name | Type | Description
+| Name | Type | Description |
 | --- | --- | --- |
 | params.directory | string | URL of directory, e.g. anygenre1.jamulus.io:22124 |
 
@@ -473,7 +473,7 @@ Parameters:
 | Name | Type | Description |
 | --- | --- | --- |
 | params.servers | array | The server list. |
-| params.servers[*].id | url | The server's URL. |
+| params.servers[*].url | url | The server's URL. |
 | params.servers[*].name | string | The server’s name. |
 | params.servers[*].countryId | number | The servers’s country ID (see QLocale::Country). |
 | params.servers[*].city | string | The server’s city. |

diff --git a/src/clientrpc.cpp b/src/clientrpc.cpp
@@ -97,9 +97,9 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @rpc_notification jamulusclient/serverListReceived
     /// @brief Emitted when the server list is received.
     /// @param {array} params.servers - The server list.
-    /// @param {string} params.servers[*].address - IP Address
+    /// @param {string} params.servers[*].url - IP Address
     /// @param {string} params.servers[*].name - Server name
-    /// @param {number} params.servers[*].country - Server country code
+    /// @param {number} params.servers[*].countryId - Server country code
     /// @param {string} params.servers[*].city - Server city
     connect ( pClient->getConnLessProtocol(), &CProtocol::CLServerListReceived, [=] ( CHostAddress /* unused */, CVector<CServerInfo> vecServerInfo ) {
         QJsonArray arrServerInfo;
@@ -108,7 +108,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
             QJsonObject objServerInfo{
                 { "url", serverInfo.HostAddr.toString() },
                 { "name", serverInfo.strName },
-                { "country", serverInfo.eCountry },
+                { "countryI", serverInfo.eCountry },
                 { "city", serverInfo.strCity },
             };
             arrServerInfo.append ( objServerInfo );