lint

Author: Ughuuu

src/database/database.cpp

@@ -85,8 +85,7 @@ void Database::connect_to_db() {
             "timestamp TIMESTAMPTZ DEFAULT NOW(), "
             "PRIMARY KEY (id, game_id)"
             ");");
-        txn.exec(
-            "CREATE INDEX IF NOT EXISTS idx_peers_peer_game ON peers (peer_id, game_id);");
+        txn.exec("CREATE INDEX IF NOT EXISTS idx_peers_peer_game ON peers (peer_id, game_id);");
         txn.commit();
     } catch (const std::exception& e) {
         std::cerr << e.what() << std::endl;
@@ -148,7 +147,7 @@ void Database::set_user_data(const std::string& game_id, const std::string& peer
     std::string name;
     auto it = user_data.find("n");
     if (it != user_data.end()) {
-        const AnyElement &nElem = it->second;
+        const AnyElement& nElem = it->second;
         if (std::holds_alternative<std::string>(nElem.value)) {
             name = std::get<std::string>(nElem.value);
         }
@@ -170,15 +169,14 @@ std::vector<std::tuple<std::string, int64_t, std::string>> Database::leaderboard
     ensure_connection();
     pqxx::work txn(*connection);
     // Prefer the latest known name for the peer (fall back to user_id)
-    pqxx::result r = txn.exec(
-        pqxx::zview(
-            "SELECT COALESCE(p.name, '') AS display_name, l.score, "
-            "to_char(l.timestamp, 'YYYY-MM-DDHH24:MI:SS') "
-            "FROM leaderboards l "
-            "LEFT JOIN peers p ON p.peer_id = l.user_id AND p.game_id = l.game_id "
-            "WHERE l.leaderboard_id = $1 AND l.game_id = $2 "
-            "ORDER BY l.score DESC LIMIT $3 OFFSET $4;"),
-        pqxx::params(leaderboard_id, game_id, limit, start));
+    pqxx::result r =
+        txn.exec(pqxx::zview("SELECT COALESCE(p.name, '') AS display_name, l.score, "
+                             "to_char(l.timestamp, 'YYYY-MM-DDHH24:MI:SS') "
+                             "FROM leaderboards l "
+                             "LEFT JOIN peers p ON p.peer_id = l.user_id AND p.game_id = l.game_id "
+                             "WHERE l.leaderboard_id = $1 AND l.game_id = $2 "
+                             "ORDER BY l.score DESC LIMIT $3 OFFSET $4;"),
+                 pqxx::params(leaderboard_id, game_id, limit, start));
     std::vector<std::tuple<std::string, int64_t, std::string>> results;
     for (auto row : r) {
         results.emplace_back(row[0].as<std::string>(), row[1].as<int64_t>(),
@@ -196,12 +194,11 @@ std::tuple<int64_t, int, std::string, std::string> Database::leaderboard_get_use
 
     // Get score, timestamp, and optional name
     pqxx::result r =
-        txn.exec(pqxx::zview(
-            "SELECT l.score, l.timestamp, p.name "
-            "FROM leaderboards l "
-            "LEFT JOIN peers p ON p.peer_id = l.user_id AND p.game_id = l.game_id "
-            "WHERE l.leaderboard_id = $1 AND l.game_id = $2 AND l.user_id = $3;"),
-            pqxx::params(leaderboard_id, game_id, user_id));
+        txn.exec(pqxx::zview("SELECT l.score, l.timestamp, p.name "
+                             "FROM leaderboards l "
+                             "LEFT JOIN peers p ON p.peer_id = l.user_id AND p.game_id = l.game_id "
+                             "WHERE l.leaderboard_id = $1 AND l.game_id = $2 AND l.user_id = $3;"),
+                 pqxx::params(leaderboard_id, game_id, user_id));
 
     int64_t score = r.empty() ? 0 : r[0][0].as<int64_t>();
     std::string timestamp = r.empty() ? "" : r[0][1].as<std::string>();

src/database/database.h

@@ -18,7 +18,7 @@ class Database {
     std::string get_peer_or_insert(const std::string& reconnection_token,
                                    const std::string& game_id, const std::string& peer_id);
     void set_user_data(const std::string& game_id, const std::string& peer_id,
-                          const std::map<std::string, AnyElement>& user_data);
+                       const std::map<std::string, AnyElement>& user_data);
     std::vector<std::tuple<std::string, int64_t, std::string>> leaderboard_get_top(
         const std::string& leaderboard_id, const std::string& game_id, int limit, int start);
     std::tuple<int64_t, int, std::string> leaderboard_get_user_score(

src/database/database_thread.h

@@ -2,12 +2,13 @@
 #include <readerwriterqueue.h>
 
 #include <atomic>
+#include <boost/container/flat_map.hpp>
 #include <functional>
 #include <string>
 #include <thread>
 #include <variant>
 #include <vector>
-#include <boost/container/flat_map.hpp>
+
 #include "../common/any_type.h"
 
 // Define a struct for database tasks/messages

src/game/game_thread.cpp

@@ -168,7 +168,7 @@ void GameThread::run() {
         // if time has not changed, sleep for a bit
         if (last_time == now) {
             std::this_thread::sleep_for(std::chrono::milliseconds(5));
-            //continue;
+            // continue;
         }
         // handle disconnects
         if (now - last_disconnect > disconnect_interval) {