Re-enabled the profile_updated timestamp updating

Author: mpretty-cyro

src/config/user_profile.cpp

@@ -29,8 +29,8 @@ void UserProfile::set_name(std::string_view new_name) {
         throw std::invalid_argument{"Invalid profile name: exceeds maximum length"};
     set_nonempty_str(data["n"], new_name);
 
-    // const auto target_timestamp = (data["t"].integer_or(0) >= data["T"].integer_or(0) ? "t" :
-    // "T"); data[target_timestamp] = ts_now();
+    const auto target_timestamp = (data["t"].integer_or(0) >= data["T"].integer_or(0) ? "t" : "T");
+    data[target_timestamp] = ts_now();
 }
 void UserProfile::set_name_truncated(std::string new_name) {
     set_name(utf8_truncate(std::move(new_name), contact_info::MAX_NAME_LENGTH));
@@ -59,7 +59,7 @@ void UserProfile::set_profile_pic(std::string_view url, std::span<const unsigned
     if (url.empty() || key.size() != 32)
         set_reupload_profile_pic({});
 
-    // data["t"] = ts_now();
+    data["t"] = ts_now();
 }
 
 void UserProfile::set_profile_pic(profile_pic pic) {
@@ -69,7 +69,7 @@ void UserProfile::set_profile_pic(profile_pic pic) {
 void UserProfile::set_reupload_profile_pic(
         std::string_view url, std::span<const unsigned char> key) {
     set_pair_if(!url.empty() && key.size() == 32, data["P"], url, data["Q"], key);
-    // data["T"] = ts_now();
+    data["T"] = ts_now();
 }
 
 void UserProfile::set_reupload_profile_pic(profile_pic pic) {
@@ -100,8 +100,8 @@ void UserProfile::set_blinded_msgreqs(std::optional<bool> value) {
     else
         data["M"] = static_cast<int>(*value);
 
-    // const auto target_timestamp = (data["t"].integer_or(0) >= data["T"].integer_or(0) ? "t" :
-    // "T"); data[target_timestamp] = ts_now();
+    const auto target_timestamp = (data["t"].integer_or(0) >= data["T"].integer_or(0) ? "t" : "T");
+    data[target_timestamp] = ts_now();
 }
 
 std::optional<bool> UserProfile::get_blinded_msgreqs() const {
@@ -111,11 +111,11 @@ std::optional<bool> UserProfile::get_blinded_msgreqs() const {
 }
 
 std::chrono::sys_seconds UserProfile::get_profile_updated() const {
-    // if (auto t = data["t"].sys_seconds()) {
-    //     if (auto T = data["T"].sys_seconds(); T && *T > *t)
-    //         return *T;
-    //     return *t;
-    // }
+    if (auto t = data["t"].sys_seconds()) {
+        if (auto T = data["T"].sys_seconds(); T && *T > *t)
+            return *T;
+        return *t;
+    }
     return std::chrono::sys_seconds{};
 }
 

tests/test_config_userprofile.cpp

@@ -460,7 +460,6 @@ TEST_CASE("user profile C API", "[config][user_profile][c]") {
     CHECK(session::to_vector(std::span<const unsigned char>{pic.key, 32}) ==
           "qwert\0yuio1234567890123456789012"_bytes);
 
-#if 0
     // Reupload the "current" pic and confirm it gets returned
     strcpy(p.url, "testUrl");
     memcpy(p.key, "secret78901234567890123456789000", 32);
@@ -532,14 +531,4 @@ TEST_CASE("user profile C API", "[config][user_profile][c]") {
     INFO("Checking if raw_value " << raw_value << " is within the range [" << before_seconds << ", "
                                   << after_seconds << "]");
     CHECK((raw_value >= before_seconds && raw_value <= after_seconds));
-#else
-    // Ensure the timestamp doesn't get updated
-    strcpy(p.url, "testUrl");
-    memcpy(p.key, "secret78901234567890123456789000", 32);
-    CHECK(0 == user_profile_set_reupload_pic(conf, p));
-    CHECK(0 == user_profile_set_pic(conf, p));
-    CHECK(0 == user_profile_set_name(conf, "Test"));
-    user_profile_set_blinded_msgreqs(conf, 1);
-    CHECK(user_profile_get_profile_updated(conf) == 0);
-#endif
 }