Rename peer private data to _pr

Author: Ughuuu

src/game/game_thread.cpp

@@ -1605,7 +1605,7 @@ void GameThread::on_lobby_data(GameData &game, std::string command_id, PeerData
     if (!error.empty()) {
         return on_error(game, command_id, peer.id, error);
     }
-    bool is_private = decode_bool_or_default(data_val, "_p", false);
+    bool is_private = decode_bool_or_default(data_val, "_pr", false);
     for (const auto &lobbydata_pair : new_lobbydata) {
         if (std::holds_alternative<std::monostate>(lobbydata_pair.second.value)) {
             if (is_private) {
@@ -1686,7 +1686,7 @@ void GameThread::on_data_to(GameData &game, std::string command_id, PeerData &pe
     if (!error.empty()) {
         return on_error(game, command_id, peer.id, error);
     }
-    bool is_private = decode_bool_or_default(data_val, "_p", false);
+    bool is_private = decode_bool_or_default(data_val, "_pr", false);
     for (const auto &data_pair : new_data) {
         if (std::holds_alternative<std::monostate>(data_pair.second.value)) {
             if (is_private) {
@@ -1758,7 +1758,7 @@ void GameThread::on_data_to_all(GameData &game, std::string command_id, PeerData
     if (!error.empty()) {
         return on_error(game, command_id, peer.id, error);
     }
-    bool is_private = decode_bool_or_default(data_val, "_p", false);
+    bool is_private = decode_bool_or_default(data_val, "_pr", false);
     for (auto &peer_id : lobby.peer_ids) {
         auto &target_peer = game.peers[peer_id];
 

src/game/game_thread_messages.h

@@ -302,7 +302,7 @@ std::string notification_lobby_public_data(const AnyElement& lobby_data,
             {"c", AnyElement{RESPONSE_LOBBY_DATA}},
             {"d",
              AnyElement{boost::container::flat_map<std::string, AnyElement>{
-                 {"d", lobby_data}, {"_p", AnyElement{false}}, {"id", AnyElement{command_id}}}}}}}
+                 {"d", lobby_data}, {"_pr", AnyElement{false}}, {"id", AnyElement{command_id}}}}}}}
         .to_string();
 }
 
@@ -313,7 +313,7 @@ std::string notification_lobby_private_data(const AnyElement& lobby_data,
             {"c", AnyElement{RESPONSE_LOBBY_DATA}},
             {"d",
              AnyElement{boost::container::flat_map<std::string, AnyElement>{
-                 {"d", lobby_data}, {"_p", AnyElement{true}}, {"id", AnyElement{command_id}}}}}}}
+                 {"d", lobby_data}, {"_pr", AnyElement{true}}, {"id", AnyElement{command_id}}}}}}}
         .to_string();
 }
 
@@ -333,7 +333,7 @@ std::string notification_peer_public_data(const AnyElement& peer_data, const std
                                     {"d", peer_data},
                                     {"p", AnyElement{from_peer}},
                                     {"tp", AnyElement{target_peer}},
-                                    {"_p", AnyElement{false}}}}}}}
+                                    {"_pr", AnyElement{false}}}}}}}
         .to_string();
 }
 
@@ -346,7 +346,7 @@ std::string notification_peer_private_data(const AnyElement& peer_data,
                                     {"d", AnyElement{peer_data}},
                                     {"p", AnyElement{from_peer}},
                                     {"tp", AnyElement{target_peer}},
-                                    {"_p", AnyElement{true}}}}}}}
+                                    {"_pr", AnyElement{true}}}}}}}
         .to_string();
 }
 

src/game/lobby_data.h

@@ -47,7 +47,7 @@ struct LobbyData {
         lobby_dict["t"] = AnyElement{tags};
         lobby_dict["d"] = AnyElement{public_data};
         if (include_private) {
-            lobby_dict["_p"] = AnyElement{private_data};
+            lobby_dict["_pr"] = AnyElement{private_data};
         }
         return lobby_dict;
     }