Merge pull request #1592 from session-foundation/fix-reupload-issue-userprofile-2

fix: track and drop old profile updates from user messages

Author: Bilb

package.json

@@ -39,7 +39,7 @@
     "build-release-base": "cross-env NODE_ENV=production electron-builder --config.extraMetadata.environment=production",
     "build-release": "yarn build-release-base --publish=never --config.directories.output=release",
     "build-release-publish": "yarn build-release-base --publish=always",
-    "ready": "yarn dedup --fail && yarn build-everything && yarn lint && yarn test",
+    "ready": "yarn dedup --fail && yarn build && yarn lint && yarn test",
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps",
     "update-git-info": "node ./build/updateLocalConfig.js",
     "worker:utils": "webpack  --config=./utils.worker.config.js",
@@ -76,7 +76,7 @@
     "fs-extra": "11.3.0",
     "glob": "10.4.5",
     "image-type": "^4.1.0",
-    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.5.5/libsession_util_nodejs-v0.5.5.tar.gz",
+    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.5.6/libsession_util_nodejs-v0.5.6.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.15",
     "linkify-it": "^5.0.0",
     "lodash": "^4.17.21",

protos/SignalService.proto

@@ -200,6 +200,12 @@ message DataMessage {
   message LokiProfile {
     optional string displayName = 1;
     optional string profilePicture = 2;
+    /**
+     * The timestamp of the last profile update.
+     * This is used to prioritize the correct profile info based on multiple and outdated incoming messages.
+     Note: this is in milliseconds.
+     */
+    optional uint64 lastProfileUpdateMs = 3;
   }
 
   message OpenGroupInvitation {

ts/components/SessionInboxView.tsx

@@ -75,7 +75,7 @@ async function createSessionInboxStore() {
       conversationLookup: makeLookup(conversations, 'id'),
     },
     user: {
-      ourDisplayNameInProfile: UserUtils.getOurProfile()?.displayName || '',
+      ourDisplayNameInProfile: (await UserUtils.getOurProfile()).displayName || '',
       ourNumber: UserUtils.getOurPubKeyStrFromCache(),
       uploadingNewAvatarCurrentUser: false,
       uploadingNewAvatarCurrentUserFailed: false,

ts/components/conversation/header/ConversationHeader.tsx

@@ -164,9 +164,7 @@ function RecreateGroupButton() {
                 ConversationTypeEnum.PRIVATE
               );
               if (!memberConvo.get('active_at')) {
-                memberConvo.set({
-                  active_at: Constants.CONVERSATION.LAST_JOINED_FALLBACK_TIMESTAMP,
-                });
+                memberConvo.setActiveAt(Constants.CONVERSATION.LAST_JOINED_FALLBACK_TIMESTAMP);
                 await memberConvo.commit();
               }
               /* eslint-enable no-await-in-loop */

ts/components/conversation/message/message-content/ClickToTrustSender.tsx

@@ -51,7 +51,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
         },
         closeTheme: SessionButtonColor.Danger,
         onClickOk: async () => {
-          convo.set({ isTrustedForAttachmentDownload: true });
+          convo.setIsTrustedForAttachmentDownload(true);
           await convo.commit();
           const messagesInConvo = await Data.getLastMessagesByConversation(convo.id, 100, false);
 
@@ -104,9 +104,9 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
                 })
               );
 
-              message.set({ preview });
+              message.setPreview(preview);
 
-              message.set({ attachments: downloadedAttachments });
+              message.setAttachments(downloadedAttachments);
               await message.commit();
             })
           );

ts/components/dialog/debug/components.tsx

@@ -35,6 +35,7 @@ import { releasedFeaturesActions } from '../../../state/ducks/releasedFeatures';
 import { networkDataActions } from '../../../state/ducks/networkData';
 import { DEBUG_MENU_PAGE, type DebugMenuPageProps } from './DebugMenuModal';
 import { SimpleSessionInput } from '../../inputs/SessionInput';
+import { NetworkTime } from '../../../util/NetworkTime';
 
 const hexRef = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
 
@@ -57,9 +58,13 @@ async function generateOneRandomContact() {
   // createdAt is set to now in libsession-util itself,
   // but we still need to mark that conversation as active
   // for it to be inserted in the config
-  created.setKey('active_at', Date.now());
-  created.setKey('isApproved', true);
-  created.setSessionDisplayNameNoCommit(id.slice(2, 8));
+  created.setActiveAt(Date.now());
+  await created.setIsApproved(true, false);
+  await created.setSessionProfile({
+    type: 'displayNameChangeOnlyPrivate',
+    displayName: id.slice(2, 8),
+    profileUpdatedAtSeconds: NetworkTime.nowSeconds(),
+  });
 
   await created.commit();
   return created;

ts/components/dialog/user-settings/pages/PrivacySettingsPage.tsx

@@ -20,18 +20,18 @@ import {
   useUserSettingsCloseAction,
   useUserSettingsTitle,
 } from './userSettingsHooks';
-import { CallManager, UserUtils } from '../../../../session/utils';
+import { CallManager } from '../../../../session/utils';
 import { SessionButtonColor } from '../../../basic/SessionButton';
 import {
   useHasLinkPreviewEnabled,
   useWeHaveBlindedMsgRequestsEnabled,
 } from '../../../../state/selectors/settings';
 import { SettingsKey } from '../../../../data/settings-key';
-import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile';
 import { getPasswordHash, Storage } from '../../../../util/storage';
 import { SettingsToggleBasic } from '../components/SettingsToggleBasic';
 import { SettingsPanelButtonInlineBasic } from '../components/SettingsPanelButtonInlineBasic';
 import { UserSettingsModalContainer } from '../components/UserSettingsModalContainer';
+import { UserConfigWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface';
 
 const toggleCallMediaPermissions = async (triggerUIUpdate: () => void) => {
   const currentValue = window.getCallMediaPermissions();
@@ -193,9 +193,8 @@ export function PrivacySettingsPage(modalState: UserSettingsModalState) {
           onClick={async () => {
             const toggledValue = !weHaveBlindedRequestsEnabled;
             await window.setSettingValue(SettingsKey.hasBlindedMsgRequestsEnabled, toggledValue);
-            await SessionUtilUserProfile.insertUserProfileIntoWrapper(
-              UserUtils.getOurPubKeyStrFromCache()
-            );
+            await UserConfigWrapperActions.setEnableBlindedMsgRequest(toggledValue);
+
             forceUpdate();
           }}
           text={{ token: 'messageRequestsCommunities' }}

ts/components/leftpane/overlay/OverlayMessage.tsx

@@ -86,7 +86,7 @@ export const OverlayMessage = () => {
     if (!convo.isActive() || convo.isHidden()) {
       // bump the timestamp only if we were not active before
       if (!convo.isActive()) {
-        convo.set({ active_at: Date.now() });
+        convo.setActiveAt(Date.now());
       }
       await convo.unhideIfNeeded(false);
 

ts/components/menuAndSettingsHooks/useSetNotificationsFor.ts

@@ -9,7 +9,7 @@ async function setNotificationForConvoId(
 
   const existingSettings = conversation.getNotificationsFor();
   if (existingSettings !== selected) {
-    conversation.set({ triggerNotificationsFor: selected });
+    conversation.setNotificationsFor(selected);
     await conversation.commit();
   }
 }

ts/data/data.ts

@@ -35,7 +35,6 @@ import {
   FindAllMessageHashesInConversationTypeArgs,
 } from './sharedDataTypes';
 import { GuardNode, Snode } from './types';
-import { makeMessageModels } from '../models/models';
 
 const ERASE_SQL_KEY = 'erase-sql-key';
 const ERASE_ATTACHMENTS_KEY = 'erase-attachments';
@@ -324,6 +323,10 @@ async function filterAlreadyFetchedOpengroupMessage(
   return msgDetailsNotAlreadyThere || [];
 }
 
+function makeMessageModels(modelsOrAttrs: Array<MessageAttributes>) {
+  return modelsOrAttrs.map(a => new MessageModel(a));
+}
+
 /**
  * Fetch all messages that match the sender pubkey and sent_at timestamp
  * @param propsList An array of objects containing a source (the sender id) and timestamp of the message - not to be confused with the serverTimestamp. This is equivalent to sent_at