feat: add timestamp to track when a profile was updated

Bilb · Bilb · commit b7a686271cdd · 2025-09-03T11:02:34.000+02:00
so we can always show the correct one
diff --git a/include/contacts_config.hpp b/include/contacts_config.hpp
@@ -20,6 +20,7 @@ class ContactsConfigWrapper : public ConfigBaseImpl,
     Napi::Value get(const Napi::CallbackInfo& info);
     Napi::Value getAll(const Napi::CallbackInfo& info);
     void set(const Napi::CallbackInfo& info);
+    Napi::Value setProfileUpdatedSeconds(const Napi::CallbackInfo& info);
     Napi::Value erase(const Napi::CallbackInfo& info);
 };
 
diff --git a/include/groups/meta_group_wrapper.hpp b/include/groups/meta_group_wrapper.hpp
@@ -72,6 +72,7 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
     void memberSetPromotionFailed(const Napi::CallbackInfo& info);
     void memberSetPromotionAccepted(const Napi::CallbackInfo& info);
     void memberSetProfilePicture(const Napi::CallbackInfo& info);
+    void memberSetProfileUpdatedSeconds(const Napi::CallbackInfo& info);
     Napi::Value memberResetAllSendingState(const Napi::CallbackInfo& info);
     void memberSetSupplement(const Napi::CallbackInfo& info);
     Napi::Value memberEraseAndRekey(const Napi::CallbackInfo& info);
diff --git a/include/user_config.hpp b/include/user_config.hpp
@@ -23,7 +23,9 @@ class UserConfigWrapper : public ConfigBaseImpl, public Napi::ObjectWrap<UserCon
     void setPriority(const Napi::CallbackInfo& info);
     void setName(const Napi::CallbackInfo& info);
     void setNameTruncated(const Napi::CallbackInfo& info);
-    void setProfilePic(const Napi::CallbackInfo& info);
+    void setNewProfilePic(const Napi::CallbackInfo& info);
+    void setReuploadProfilePic(const Napi::CallbackInfo& info);
+    Napi::Value getProfileUpdatedSeconds(const Napi::CallbackInfo& info);
 
     Napi::Value getEnableBlindedMsgRequest(const Napi::CallbackInfo& info);
     void setEnableBlindedMsgRequest(const Napi::CallbackInfo& info);
diff --git a/include/utilities.hpp b/include/utilities.hpp
@@ -59,6 +59,8 @@ std::vector<unsigned char> toCppBuffer(Napi::Value x, const std::string& identif
 int64_t toCppInteger(Napi::Value x, const std::string& identifier, bool allowUndefined = false);
 std::optional<int64_t> maybeNonemptyInt(Napi::Value x, const std::string& identifier);
 std::optional<bool> maybeNonemptyBoolean(Napi::Value x, const std::string& identifier);
+std::optional<std::chrono::sys_seconds> maybeNonemptySysSeconds(
+        Napi::Value x, const std::string& identifier);
 
 bool toCppBoolean(Napi::Value x, const std::string& identifier);
 
@@ -109,6 +111,13 @@ struct toJs_impl<session::config::Namespace> {
     }
 };
 
+template <>
+struct toJs_impl<std::chrono::sys_seconds> {
+    auto operator()(const Napi::Env& env, std::chrono::sys_seconds t) const {
+        return Napi::Number::New(env, t.time_since_epoch().count());
+    }
+};
+
 template <typename T>
 struct toJs_impl<T, std::enable_if_t<std::is_arithmetic_v<T>>> {
     auto operator()(const Napi::Env& env, T n) const { return Napi::Number::New(env, n); }
diff --git a/libsession-util b/libsession-util
@@ -1 +1 @@
-Subproject commit 95b9fe74d1c419487f6e69458db1ebc2bb824a2a
+Subproject commit 9f25429935a6c6dffb26c82d9eb258ad1873a80f
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",
diff --git a/src/contacts_config.cpp b/src/contacts_config.cpp
@@ -44,6 +44,7 @@ struct toJs_impl<contact_info> {
         obj["nickname"] = toJs(env, maybe_string(contact.nickname));
         obj["approved"] = toJs(env, contact.approved);
         obj["approvedMe"] = toJs(env, contact.approved_me);
+        obj["profileUpdatedSeconds"] = toJs(env, contact.profile_updated);
         obj["blocked"] = toJs(env, contact.blocked);
         obj["priority"] = toJs(env, contact.priority);
         obj["createdAtSeconds"] = toJs(env, contact.created);
@@ -64,7 +65,11 @@ void ContactsConfigWrapper::Init(Napi::Env env, Napi::Object exports) {
                     InstanceMethod("get", &ContactsConfigWrapper::get),
                     InstanceMethod("getAll", &ContactsConfigWrapper::getAll),
                     InstanceMethod("set", &ContactsConfigWrapper::set),
+                    InstanceMethod(
+                            "setProfileUpdatedSeconds",
+                            &ContactsConfigWrapper::setProfileUpdatedSeconds),
                     InstanceMethod("erase", &ContactsConfigWrapper::erase),
+
             });
 }
 
@@ -150,6 +155,32 @@ void ContactsConfigWrapper::set(const Napi::CallbackInfo& info) {
     });
 }
 
+Napi::Value ContactsConfigWrapper::setProfileUpdatedSeconds(const Napi::CallbackInfo& info) {
+    return wrapResult(info, [&] {
+        assertInfoLength(info, 1);
+
+        auto arg = info[0];
+        assertIsObject(arg);
+        auto obj = arg.As<Napi::Object>();
+
+        if (obj.IsEmpty())
+            throw std::invalid_argument("setProfileUpdatedSeconds received empty");
+
+        auto sessionID = toCppString(obj.Get("id"), "contacts.setProfileUpdatedSeconds, id");
+        auto contact = config.get(sessionID);
+
+        auto seconds = maybeNonemptySysSeconds(
+                obj.Get("profileUpdatedSeconds"),
+                "contacts.setProfileUpdatedSeconds, profileUpdatedSeconds");
+        if (contact && seconds) {
+            config.set_profile_updated(sessionID, seconds.value());
+            config.set(*contact);
+            return true;
+        }
+        return false;
+    });
+}
+
 /** ==============================
  *             ERASERS
  * ============================== */
diff --git a/src/groups/meta_group_wrapper.cpp b/src/groups/meta_group_wrapper.cpp
@@ -17,6 +17,7 @@ Napi::Object member_to_js(const Napi::Env& env, const member& info, const member
     obj["pubkeyHex"] = toJs(env, info.session_id);
     obj["name"] = toJs(env, info.name);
     obj["profilePicture"] = toJs(env, info.profile_picture);
+    obj["profileUpdatedSeconds"] = toJs(env, info.profile_updated);
     obj["supplement"] = toJs(env, info.supplement);
 
     switch (status) {
@@ -131,6 +132,9 @@ void MetaGroupWrapper::Init(Napi::Env env, Napi::Object exports) {
                             &MetaGroupWrapper::memberSetPromotionAccepted),
                     InstanceMethod(
                             "memberSetProfilePicture", &MetaGroupWrapper::memberSetProfilePicture),
+                    InstanceMethod(
+                            "memberSetProfileUpdatedSeconds",
+                            &MetaGroupWrapper::memberSetProfileUpdatedSeconds),
                     InstanceMethod(
                             "memberResetAllSendingState",
                             &MetaGroupWrapper::memberResetAllSendingState),
@@ -669,6 +673,23 @@ void MetaGroupWrapper::memberSetProfilePicture(const Napi::CallbackInfo& info) {
     });
 }
 
+void MetaGroupWrapper::memberSetProfileUpdatedSeconds(const Napi::CallbackInfo& info) {
+    wrapExceptions(info, [&] {
+        assertInfoLength(info, 2);
+        assertIsString(info[0]);
+        assertIsObject(info[1]);
+
+        auto pubkeyHex = toCppString(info[0], "memberSetProfiUpdatedSeconds");
+        auto updatedAtSeconds = maybeNonemptySysSeconds(info[1], "memberSetProfiUpdatedSeconds");
+
+        auto m = this->meta_group->members->get(pubkeyHex);
+        if (m) {
+            m->profile_updated = updatedAtSeconds.value();
+            this->meta_group->members->set(*m);
+        }
+    });
+}
+
 Napi::Value MetaGroupWrapper::memberResetAllSendingState(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&] {
         bool changed = false;
diff --git a/src/user_config.cpp b/src/user_config.cpp
@@ -20,10 +20,15 @@ void UserConfigWrapper::Init(Napi::Env env, Napi::Object exports) {
                     InstanceMethod("getPriority", &UserConfigWrapper::getPriority),
                     InstanceMethod("getName", &UserConfigWrapper::getName),
                     InstanceMethod("getProfilePic", &UserConfigWrapper::getProfilePic),
+                    InstanceMethod(
+                            "getProfileUpdatedSeconds",
+                            &UserConfigWrapper::getProfileUpdatedSeconds),
+                    InstanceMethod(
+                            "setReuploadProfilePic", &UserConfigWrapper::setReuploadProfilePic),
                     InstanceMethod("setPriority", &UserConfigWrapper::setPriority),
                     InstanceMethod("setName", &UserConfigWrapper::setName),
                     InstanceMethod("setNameTruncated", &UserConfigWrapper::setNameTruncated),
-                    InstanceMethod("setProfilePic", &UserConfigWrapper::setProfilePic),
+                    InstanceMethod("setNewProfilePic", &UserConfigWrapper::setNewProfilePic),
                     InstanceMethod(
                             "getEnableBlindedMsgRequest",
                             &UserConfigWrapper::getEnableBlindedMsgRequest),
@@ -107,7 +112,7 @@ void UserConfigWrapper::setNameTruncated(const Napi::CallbackInfo& info) {
     });
 }
 
-void UserConfigWrapper::setProfilePic(const Napi::CallbackInfo& info) {
+void UserConfigWrapper::setNewProfilePic(const Napi::CallbackInfo& info) {
     return wrapExceptions(info, [&] {
         assertInfoLength(info, 1);
         auto profile_pic_obj = info[0];
@@ -119,6 +124,23 @@ void UserConfigWrapper::setProfilePic(const Napi::CallbackInfo& info) {
     });
 }
 
+void UserConfigWrapper::setReuploadProfilePic(const Napi::CallbackInfo& info) {
+    assertInfoLength(info, 1);
+    auto profile_pic_obj = info[0];
+
+    if (!profile_pic_obj.IsNull() && !profile_pic_obj.IsUndefined())
+        assertIsObject(profile_pic_obj);
+
+    config.set_reupload_profile_pic(profile_pic_from_object(profile_pic_obj));
+}
+
+Napi::Value UserConfigWrapper::getProfileUpdatedSeconds(const Napi::CallbackInfo& info) {
+    return wrapResult(info, [&] {
+        auto env = info.Env();
+        return config.get_profile_updated();
+    });
+}
+
 Napi::Value UserConfigWrapper::getEnableBlindedMsgRequest(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&] {
         auto env = info.Env();
diff --git a/src/utilities.cpp b/src/utilities.cpp
@@ -138,6 +138,18 @@ std::optional<int64_t> maybeNonemptyInt(Napi::Value x, const std::string& identi
     throw std::invalid_argument{"maybeNonemptyInt with invalid type, called from " + identifier};
 }
 
+std::optional<std::chrono::sys_seconds> maybeNonemptySysSeconds(Napi::Value x, const std::string& identifier) {
+    if (x.IsNull() || x.IsUndefined())
+        return std::nullopt;
+
+    if (x.IsNumber()) {
+        auto num = x.As<Napi::Number>().Int64Value();
+        return std::chrono::sys_seconds{std::chrono::seconds{num}};
+    }
+
+    throw std::invalid_argument{"maybeNonemptyTime with invalid type, called from " + identifier};
+}
+
 std::optional<bool> maybeNonemptyBoolean(Napi::Value x, const std::string& identifier) {
     if (x.IsNull() || x.IsUndefined())
         return std::nullopt;
diff --git a/types/blinding/blinding.d.ts b/types/blinding/blinding.d.ts
@@ -34,7 +34,6 @@ declare module 'libsession_util_nodejs' {
    */
   export class BlindingWrapperNode {
     public static blindVersionPubkey: BlindingWrapper['blindVersionPubkey'];
-    public static blindVersionSignRequest: BlindingWrapper['blindVersionSignRequest'];
     public static blindVersionSign: BlindingWrapper['blindVersionSign'];
   }
 
diff --git a/types/groups/groupmembers.d.ts b/types/groups/groupmembers.d.ts
@@ -61,6 +61,8 @@ declare module 'libsession_util_nodejs' {
      */
     supplement: boolean;
 
+    profileUpdatedSeconds: number;
+
     /**
      * True if the member is scheduled to get the keys (`.admin` field of libsession).
      * This is equivalent of memberStatus being one of:
@@ -116,6 +118,7 @@ declare module 'libsession_util_nodejs' {
     memberSetPromotionAccepted: (pubkeyHex: PubkeyType) => void;
 
     memberSetProfilePicture: (pubkeyHex: PubkeyType, profilePicture: ProfilePicture) => void;
+    memberSetProfileUpdatedSeconds: (pubkeyHex: PubkeyType, profileUpdatedSeconds: number) => void;
     memberResetAllSendingState: () => boolean;
     memberSetSupplement: (pubkeyHex: PubkeyType) => void;
     membersMarkPendingRemoval: (members: Array<PubkeyType>, withMessages: boolean) => void;
diff --git a/types/groups/metagroup.d.ts b/types/groups/metagroup.d.ts
@@ -108,6 +108,7 @@ declare module 'libsession_util_nodejs' {
     public memberEraseAndRekey: MetaGroupWrapper['memberEraseAndRekey'];
     public membersMarkPendingRemoval: MetaGroupWrapper['membersMarkPendingRemoval'];
     public memberSetProfilePicture: MetaGroupWrapper['memberSetProfilePicture'];
+    public memberSetProfileUpdatedSeconds: MetaGroupWrapper['memberSetProfileUpdatedSeconds'];
     public memberResetAllSendingState: MetaGroupWrapper['memberResetAllSendingState'];
     public memberSetSupplement: MetaGroupWrapper['memberSetSupplement'];
 
@@ -159,6 +160,7 @@ declare module 'libsession_util_nodejs' {
     | MakeActionCall<MetaGroupWrapper, 'memberEraseAndRekey'>
     | MakeActionCall<MetaGroupWrapper, 'membersMarkPendingRemoval'>
     | MakeActionCall<MetaGroupWrapper, 'memberSetProfilePicture'>
+    | MakeActionCall<MetaGroupWrapper, 'memberSetProfileUpdatedSeconds'>
     | MakeActionCall<MetaGroupWrapper, 'memberResetAllSendingState'>
     | MakeActionCall<MetaGroupWrapper, 'memberSetSupplement'>
 
diff --git a/types/user/contacts.d.ts b/types/user/contacts.d.ts
@@ -12,6 +12,7 @@ declare module 'libsession_util_nodejs' {
     free: () => void;
     get: (pubkeyHex: string) => ContactInfo | null;
     set: (contact: ContactInfoSet) => void;
+    setProfileUpdatedSeconds: (pubkeyHex: string, profileUpdatedSeconds: number) => void;
     getAll: () => Array<ContactInfo>;
     erase: (pubkeyHex: string) => void;
   };
@@ -29,7 +30,10 @@ declare module 'libsession_util_nodejs' {
     name?: string;
     nickname?: string;
     profilePicture?: ProfilePicture;
-    createdAtSeconds: number; // can only be set the first time a contact is created, a new change won't override the value in the wrapper.
+    /**
+     * Can only be set the first time a contact is created, a new change won't override the value in the wrapper.
+     */
+    createdAtSeconds: number;
     expirationMode?: DisappearingMessageConversationModeType;
     expirationTimerSeconds?: number;
   };
@@ -44,12 +48,18 @@ declare module 'libsession_util_nodejs' {
     approved: boolean;
     approvedMe: boolean;
     blocked: boolean;
+    /**
+     * This should be bumped whenever the contact profile is updated through
+     * `setProfileUpdatedSeconds`.
+     */
+    profileUpdatedSeconds: number;
   };
 
   export class ContactsConfigWrapperNode extends BaseConfigWrapperNode {
     constructor(secretKey: Uint8Array, dump: Uint8Array | null);
     public get: ContactsWrapper['get'];
     public set: ContactsWrapper['set'];
+    public setProfileUpdatedSeconds: ContactsWrapper['setProfileUpdatedSeconds'];
     public getAll: ContactsWrapper['getAll'];
     public erase: ContactsWrapper['erase'];
   }
@@ -59,6 +69,7 @@ declare module 'libsession_util_nodejs' {
     | MakeActionCall<ContactsWrapper, 'free'>
     | MakeActionCall<ContactsWrapper, 'get'>
     | MakeActionCall<ContactsWrapper, 'set'>
+    | MakeActionCall<ContactsWrapper, 'setProfileUpdatedSeconds'>
     | MakeActionCall<ContactsWrapper, 'getAll'>
     | MakeActionCall<ContactsWrapper, 'erase'>;
 }
diff --git a/types/user/userconfig.d.ts b/types/user/userconfig.d.ts
@@ -17,7 +17,17 @@ declare module 'libsession_util_nodejs' {
     setPriority: (priority: number) => void;
     setName: (name: string) => void;
     setNameTruncated: (name: string) => void;
-    setProfilePic: (pic: ProfilePicture) => void;
+    /**
+     * Call this when uploading a new profile picture (i.e. not an auto reupload)
+     */
+    setNewProfilePic: (pic: ProfilePicture) => void;
+    /**
+     * Call this when reuploading a the previous profile picture
+     */
+    setReuploadProfilePic: (pic: ProfilePicture) => void;
+
+    getProfileUpdatedSeconds: () => number;
+
     setEnableBlindedMsgRequest: (msgRequest: boolean) => void;
     getEnableBlindedMsgRequest: () => boolean | undefined;
     setNoteToSelfExpiry: (expirySeconds: number) => void;
@@ -40,7 +50,9 @@ declare module 'libsession_util_nodejs' {
     public setPriority: UserConfigWrapper['setPriority'];
     public setName: UserConfigWrapper['setName'];
     public setNameTruncated: UserConfigWrapper['setNameTruncated'];
-    public setProfilePic: UserConfigWrapper['setProfilePic'];
+    public setNewProfilePic: UserConfigWrapper['setNewProfilePic'];
+    public setReuploadProfilePic: UserConfigWrapper['setReuploadProfilePic'];
+    public getProfileUpdatedSeconds: UserConfigWrapper['getProfileUpdatedSeconds'];
     public getEnableBlindedMsgRequest: UserConfigWrapper['getEnableBlindedMsgRequest'];
     public setEnableBlindedMsgRequest: UserConfigWrapper['setEnableBlindedMsgRequest'];
     public getNoteToSelfExpiry: UserConfigWrapper['getNoteToSelfExpiry'];
@@ -61,7 +73,9 @@ declare module 'libsession_util_nodejs' {
     | MakeActionCall<UserConfigWrapper, 'setPriority'>
     | MakeActionCall<UserConfigWrapper, 'setName'>
     | MakeActionCall<UserConfigWrapper, 'setNameTruncated'>
-    | MakeActionCall<UserConfigWrapper, 'setProfilePic'>
+    | MakeActionCall<UserConfigWrapper, 'setNewProfilePic'>
+    | MakeActionCall<UserConfigWrapper, 'setReuploadProfilePic'>
+    | MakeActionCall<UserConfigWrapper, 'getProfileUpdatedSeconds'>
     | MakeActionCall<UserConfigWrapper, 'getEnableBlindedMsgRequest'>
     | MakeActionCall<UserConfigWrapper, 'setEnableBlindedMsgRequest'>
     | MakeActionCall<UserConfigWrapper, 'getNoteToSelfExpiry'>
