blinded_contact_info: type-safe timestamp

Author: jagerman

include/session/config/contacts.hpp

@@ -125,7 +125,7 @@ struct blinded_contact_info {
     std::string name;
     profile_pic profile_picture;
     bool legacy_blinding;
-    int64_t created = 0;  // Unix timestamp (seconds) when this contact was added
+    std::chrono::sys_seconds created{};  // Unix timestamp (seconds) when this contact was added
 
     blinded_contact_info() = default;
     explicit blinded_contact_info(

src/config/contacts.cpp

@@ -317,7 +317,7 @@ blinded_contact_info::blinded_contact_info(
 }
 
 void blinded_contact_info::load(const dict& info_dict) {
-    name = maybe_string(info_dict, "n").value_or("");
+    name = string_or_empty(info_dict, "n");
 
     auto url = maybe_string(info_dict, "p");
     auto key = maybe_vector(info_dict, "q");
@@ -327,8 +327,8 @@ void blinded_contact_info::load(const dict& info_dict) {
     } else {
         profile_picture.clear();
     }
-    legacy_blinding = maybe_int(info_dict, "y").value_or(0);
-    created = to_epoch_seconds(maybe_int(info_dict, "j").value_or(0));
+    legacy_blinding = int_or_0(info_dict, "y");
+    created = ts_or_epoch(info_dict, "j");
 }
 
 void blinded_contact_info::into(contacts_blinded_contact& c) const {
@@ -346,7 +346,7 @@ void blinded_contact_info::into(contacts_blinded_contact& c) const {
         copy_c_str(c.profile_pic.url, "");
     }
     c.legacy_blinding = legacy_blinding;
-    c.created = to_epoch_seconds(created);
+    c.created = created.time_since_epoch().count();
 }
 
 blinded_contact_info::blinded_contact_info(const contacts_blinded_contact& c) {
@@ -359,7 +359,7 @@ blinded_contact_info::blinded_contact_info(const contacts_blinded_contact& c) {
         profile_picture.key.assign(c.profile_pic.key, c.profile_pic.key + 32);
     }
     legacy_blinding = c.legacy_blinding;
-    created = to_epoch_seconds(c.created);
+    created = to_sys_seconds(c.created);
 }
 
 const std::string blinded_contact_info::session_id() const {
@@ -472,7 +472,7 @@ void Contacts::set_blinded(const blinded_contact_info& bc) {
             bc.profile_picture.key);
 
     set_positive_int(info["y"], bc.legacy_blinding);
-    set_positive_int(info["j"], to_epoch_seconds(bc.created));
+    set_ts(info["j"], bc.created);
 }
 
 bool Contacts::erase_blinded(
@@ -717,4 +717,4 @@ LIBSESSION_C_API void contacts_iterator_advance(contacts_iterator* it) {
     ++*static_cast<Contacts::iterator*>(it->_internals);
 }
 
-}  // extern "C"
+}  // extern "C"

tests/test_config_contacts.cpp

@@ -928,14 +928,14 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     CHECK(c.name.empty());
     CHECK_FALSE(c.profile_picture);
     CHECK(c.legacy_blinding);
-    CHECK(c.created == 0);
+    CHECK(c.created.time_since_epoch() == 0s);
 
     CHECK_FALSE(contacts.needs_push());
     CHECK_FALSE(contacts.needs_dump());
     CHECK(std::get<seqno_t>(contacts.push()) == 0);
 
     c.set_name("Joe");
-    c.created = created_ts * 1'000;
+    c.created = session::to_sys_seconds(created_ts * 1'000);
     contacts.set_blinded(c);
 
     REQUIRE(contacts.get_blinded(definitely_real_id, true).has_value());
@@ -970,7 +970,7 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     REQUIRE(x);
     CHECK(x->name == "Joe");
     CHECK_FALSE(x->profile_picture);
-    CHECK(x->created == created_ts);
+    CHECK(x->created.time_since_epoch() == created_ts * 1s);
     CHECK(x->legacy_blinding == true);
 
     auto another_id = "251111111111111111111111111111111111111111111111111111111111111111"sv;
@@ -1094,4 +1094,4 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     CHECK(names[1] == "Name 3");
     CHECK_FALSE(legacy_blindings[0]);
     CHECK(legacy_blindings[1]);
-}
+}