Re-add ids

Co-authored-by: Tony Mountifield <tony@mountifield.org>

Author: ann0see

docs/JSON-RPC.md

@@ -163,9 +163,11 @@ Results:
 | result.id | number | The channel ID. |
 | result.name | string | The musician’s name. |
 | result.skillLevel | string | The musician’s skill level (beginner, intermediate, expert, or null). |
+| result.countryId | number | The musician’s country ID (see QLocale::Country). |
 | result.country | string | The musician’s country. |
 | result.city | string | The musician’s city. |
-| result.instrument | number | The musician’s instrument. |
+| result.instrumentId | number | The musician’s instrument ID (see CInstPictures::GetTable). |
+| result.instrument | string | The musician’s instrument. |
 | result.skillLevel | string | Your skill level (beginner, intermediate, expert, or null). |
 
 
@@ -461,8 +463,10 @@ Parameters:
 | params.clients[*].id | number | The channel ID. |
 | params.clients[*].name | string | The musician’s name. |
 | params.clients[*].skillLevel | string | The musician’s skill level (beginner, intermediate, expert, or null). |
+| params.clients[*].countryId | number | The musician’s country ID (see QLocale::Country). |
 | params.clients[*].country | string | The musician’s country. |
 | params.clients[*].city | string | The musician’s city. |
+| params.clients[*].instrumentId | number | The musician’s instrument ID (see CInstPictures::GetTable). |
 | params.clients[*].instrument | string | The musician’s instrument. |
 
 
@@ -490,7 +494,7 @@ Parameters:
 
 ### jamulusclient/recorderState
 
-Emitted when the client is connected to a server who's recorder state changes.
+Emitted when the client is connected to a server whose recorder state changes.
 
 Parameters:
 
@@ -523,6 +527,7 @@ Parameters:
 | params.servers | array | The server list. |
 | params.servers[*].address | string | Socket address (ip_address:port) |
 | params.servers[*].name | string | Server name |
+| params.servers[*].countryId | number | Server country ID (see QLocale::Country). |
 | params.servers[*].country | string | Server country |
 | params.servers[*].city | string | Server city |
 

src/clientrpc.cpp

@@ -53,8 +53,10 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @param {number} params.clients[*].id - The channel ID.
     /// @param {string} params.clients[*].name - The musician’s name.
     /// @param {string} params.clients[*].skillLevel - The musician’s skill level (beginner, intermediate, expert, or null).
+    /// @param {number} params.clients[*].countryId - The musician’s country ID (see QLocale::Country).
     /// @param {string} params.clients[*].country - The musician’s country.
     /// @param {string} params.clients[*].city - The musician’s city.
+    /// @param {number} params.clients[*].instrumentId - The musician’s instrument ID (see CInstPictures::GetTable).
     /// @param {string} params.clients[*].instrument - The musician’s instrument.
     connect ( pClient, &CClient::ConClientListMesReceived, [=] ( CVector<CChannelInfo> vecChanInfo ) {
         QJsonArray arrChanInfo;
@@ -64,8 +66,10 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
                 { "id", chanInfo.iChanID },
                 { "name", chanInfo.strName },
                 { "skillLevel", SerializeSkillLevel ( chanInfo.eSkillLevel ) },
+                { "countryId", chanInfo.eCountry },
                 { "country", QLocale::countryToString ( chanInfo.eCountry ) },
                 { "city", chanInfo.strCity },
+                { "instrumentId", chanInfo.iInstrument },
                 { "instrument", CInstPictures::GetName ( chanInfo.iInstrument ) },
             };
             arrChanInfo.append ( objChanInfo );
@@ -99,6 +103,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @param {array} params.servers - The server list.
     /// @param {string} params.servers[*].address - Socket address (ip_address:port)
     /// @param {string} params.servers[*].name - Server name
+    /// @param {number} params.servers[*].countryId - Server country ID (see QLocale::Country).
     /// @param {string} params.servers[*].country - Server country
     /// @param {string} params.servers[*].city - Server city
     connect ( pClient->getConnLessProtocol(),
@@ -110,6 +115,7 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
                       QJsonObject objServerInfo{
                           { "address", serverInfo.HostAddr.toString() },
                           { "name", serverInfo.strName },
+                          { "countryId", serverInfo.eCountry },
                           { "country", QLocale::countryToString ( serverInfo.eCountry ) },
                           { "city", serverInfo.strCity },
                       };
@@ -199,16 +205,20 @@ CClientRpc::CClientRpc ( CClient* pClient, CRpcServer* pRpcServer, QObject* pare
     /// @result {number} result.id - The channel ID.
     /// @result {string} result.name - The musician’s name.
     /// @result {string} result.skillLevel - The musician’s skill level (beginner, intermediate, expert, or null).
+    /// @result {number} result.countryId - The musician’s country ID (see QLocale::Country).
     /// @result {string} result.country - The musician’s country.
     /// @result {string} result.city - The musician’s city.
+    /// @result {number} result.instrumentId - The musician’s instrument ID (see CInstPictures::GetTable).
     /// @result {number} result.instrument - The musician’s instrument.
     /// @result {string} result.skillLevel - Your skill level (beginner, intermediate, expert, or null).
     pRpcServer->HandleMethod ( "jamulusclient/getChannelInfo", [=] ( const QJsonObject& params, QJsonObject& response ) {
         QJsonObject result{
             // TODO: We cannot include "id" here is pClient->ChannelInfo is a CChannelCoreInfo which lacks that field.
             { "name", pClient->ChannelInfo.strName },
+            { "countryId", pClient->ChannelInfo.eCountry },
             { "country", QLocale::countryToString ( pClient->ChannelInfo.eCountry ) },
             { "city", pClient->ChannelInfo.strCity },
+            { "instrumentId", pClient->ChannelInfo.iInstrument },
             { "instrument", CInstPictures::GetName ( pClient->ChannelInfo.iInstrument ) },
             { "skillLevel", SerializeSkillLevel ( pClient->ChannelInfo.eSkillLevel ) },
         };