Added missing profile_updated and priority values

Author: mpretty-cyro

include/session/config/contacts.h

@@ -45,6 +45,9 @@ typedef struct contacts_blinded_contact {
 
     char name[101];  // This will be a 0-length string when unset
     user_profile_pic profile_pic;
+    int64_t profile_updated;  // unix timestamp (seconds)
+    
+    int priority;
 
     bool legacy_blinding;
     int64_t created;  // unix timestamp (seconds)

include/session/config/contacts.hpp

@@ -61,6 +61,10 @@ namespace session::config {
 ///           alive as empty dicts get pruned).
 ///       p - profile url (string)
 ///       q - profile decryption key (binary)
+///       t - The `profile_updated` unix timestamp (seconds) for this contacts profile information.
+///       + - the conversation priority; -1 means hidden; omitted means not pinned; otherwise an
+///           integer value >0, where a higher priority means the conversation is meant to appear
+///           earlier in the pinned conversation list.
 ///       j - Unix timestamp (seconds) when the contact was created ("j" to match user_groups
 ///           equivalent "j"oined field). Omitted if 0.
 ///       y - flag indicating whether the blinded message request is using legac"y" blinding.
@@ -122,6 +126,13 @@ struct blinded_contact_info {
     const std::string session_id() const;  // in hex
     std::string name;
     profile_pic profile_picture;
+    std::chrono::sys_seconds profile_updated{};  /// The unix timestamp (seconds) that this
+                                                 /// profile information was last updated.
+    int priority = 0;  // If >0 then this message is pinned; higher values mean higher priority
+                       // (i.e. pinned earlier in the pinned list).  If negative then this
+                       // conversation is hidden.  Otherwise (0) this is a regular, unpinned
+                       // conversation.
+
     bool legacy_blinding;
     std::chrono::sys_seconds created{};  // Unix timestamp (seconds) when this contact was added
 
@@ -142,7 +153,7 @@ struct blinded_contact_info {
     /// - `c` -- Return Parameter that will be filled with data in blinded_contact_info
     void into(contacts_blinded_contact& c) const;
 
-    /// API: contacts/contact_info::set_name
+    /// API: contacts/blinded_contact_info::set_name
     ///
     /// Sets a name; this is exactly the same as assigning to .name directly,
     /// except that we throw an exception if the given name is longer than MAX_NAME_LENGTH.

src/config/contacts.cpp

@@ -332,6 +332,8 @@ void blinded_contact_info::load(const dict& info_dict) {
     } else {
         profile_picture.clear();
     }
+    profile_updated = ts_or_epoch(info_dict, "t");
+    priority = int_or_0(info_dict, "+");
     legacy_blinding = int_or_0(info_dict, "y");
     created = ts_or_epoch(info_dict, "j");
 }
@@ -350,6 +352,8 @@ void blinded_contact_info::into(contacts_blinded_contact& c) const {
     } else {
         copy_c_str(c.profile_pic.url, "");
     }
+    c.profile_updated = profile_updated.time_since_epoch().count();
+    c.priority = priority;
     c.legacy_blinding = legacy_blinding;
     c.created = created.time_since_epoch().count();
 }
@@ -363,6 +367,8 @@ blinded_contact_info::blinded_contact_info(const contacts_blinded_contact& c) {
         profile_picture.url = c.profile_pic.url;
         profile_picture.key.assign(c.profile_pic.key, c.profile_pic.key + 32);
     }
+    profile_updated = to_sys_seconds(c.profile_updated);
+    priority = c.priority;
     legacy_blinding = c.legacy_blinding;
     created = to_sys_seconds(c.created);
 }
@@ -474,7 +480,8 @@ void Contacts::set_blinded(const blinded_contact_info& bc) {
             bc.profile_picture.url,
             info["q"],
             bc.profile_picture.key);
-
+    set_ts(info["t"], bc.profile_updated);
+    set_nonzero_int(info["+"], bc.priority);
     set_positive_int(info["y"], bc.legacy_blinding);
     set_ts(info["j"], bc.created);
 }

tests/test_config_contacts.cpp

@@ -926,6 +926,8 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     CHECK(c.session_id() == "150000000000000000000000000000000000000000000000000000000000000000");
     CHECK(c.name.empty());
     CHECK_FALSE(c.profile_picture);
+    CHECK(c.profile_updated == std::chrono::sys_seconds{});
+    CHECK(c.priority == 0);
     CHECK(c.legacy_blinding);
     CHECK(c.created.time_since_epoch() == 0s);
 
@@ -934,13 +936,17 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     CHECK(std::get<seqno_t>(contacts.push()) == 0);
 
     c.set_name("Joe");
+    c.profile_updated = std::chrono::sys_seconds{1s};
     c.created = session::to_sys_seconds(created_ts * 1'000);
+    c.priority = 1;
     contacts.set_blinded(c);
 
     REQUIRE(contacts.get_blinded(definitely_real_id).has_value());
 
     CHECK(contacts.get_blinded(definitely_real_id)->name == "Joe");
     CHECK_FALSE(contacts.get_blinded(definitely_real_id)->profile_picture);
+    CHECK(contacts.get_blinded(definitely_real_id)->profile_updated.time_since_epoch() == 1s);
+    CHECK(contacts.get_blinded(definitely_real_id)->priority == 1);
     CHECK(contacts.get_blinded(definitely_real_id)->legacy_blinding);
     CHECK(contacts.get_blinded(definitely_real_id)->session_id() == definitely_real_id);
 
@@ -969,6 +975,8 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     REQUIRE(x);
     CHECK(x->name == "Joe");
     CHECK_FALSE(x->profile_picture);
+    CHECK(x->profile_updated.time_since_epoch() == 1s);
+    CHECK(x->priority == 1);
     CHECK(x->created.time_since_epoch() == created_ts * 1s);
     CHECK(x->legacy_blinding == true);
 
@@ -996,11 +1004,13 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     auto blinded = contacts.blinded();
     std::vector<std::string> session_ids;
     std::vector<std::string> names;
+    std::vector<std::chrono::sys_seconds> profile_updateds;
     std::vector<bool> legacy_blindings;
     CHECK(blinded.size() == 2);
     for (const auto& cc : blinded) {
         session_ids.push_back(cc.session_id());
         names.emplace_back(cc.name.empty() ? "(N/A)" : cc.name);
+        profile_updateds.emplace_back(cc.profile_updated);
         legacy_blindings.emplace_back(cc.legacy_blinding);
     }
 
@@ -1010,6 +1020,8 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     CHECK(session_ids[1] == another_id);
     CHECK(names[0] == "Joe");
     CHECK(names[1] == "(N/A)");
+    CHECK(profile_updateds[0].time_since_epoch() == 1s);
+    CHECK(profile_updateds[1].time_since_epoch() == 0s);
     CHECK(legacy_blindings[0]);
     CHECK_FALSE(legacy_blindings[1]);
 
@@ -1080,17 +1092,21 @@ TEST_CASE("Contacts", "[config][blinded_contacts]") {
     auto blinded2 = contacts.blinded();
     session_ids.clear();
     names.clear();
+    profile_updateds.clear();
     legacy_blindings.clear();
     for (const auto& cc : blinded2) {
         session_ids.push_back(cc.session_id());
         names.emplace_back(cc.name.empty() ? "(N/A)" : cc.name);
+        profile_updateds.emplace_back(cc.profile_updated);
         legacy_blindings.emplace_back(cc.legacy_blinding);
     }
     REQUIRE(session_ids.size() == 2);
     CHECK(session_ids[0] == another_id);
     CHECK(session_ids[1] == third_id);
     CHECK(names[0] == "(N/A)");
     CHECK(names[1] == "Name 3");
+    CHECK(profile_updateds[0].time_since_epoch() == 0s);
+    CHECK(profile_updateds[1].time_since_epoch() == 0s);
     CHECK_FALSE(legacy_blindings[0]);
     CHECK(legacy_blindings[1]);