fix: use reupload and new upload nts profile changes from libsession

Author: Bilb

ts/interactions/avatar-interactions/nts-avatar-interactions.ts

@@ -12,6 +12,7 @@ import { encryptProfile } from '../../util/crypto/profileEncrypter';
 import { Storage } from '../../util/storage';
 import type { ConversationModel } from '../../models/conversation';
 import { processAvatarData } from '../../util/avatar/processAvatarData';
+import { UserConfigWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface';
 
 /**
  * This function can be used for reupload our avatar to the file server.
@@ -61,17 +62,20 @@ export async function reuploadCurrentAvatarUs() {
     decryptedAvatarData,
     ourConvo,
     profileKey,
+    context: 'reuploadAvatar',
   });
 }
 
 export async function uploadAndSetOurAvatarShared({
   decryptedAvatarData,
   ourConvo,
   profileKey,
+  context,
 }: {
   ourConvo: ConversationModel;
   decryptedAvatarData: ArrayBuffer;
   profileKey: Uint8Array;
+  context: 'uploadNewAvatar' | 'reuploadAvatar';
 }) {
   if (!decryptedAvatarData?.byteLength) {
     window.log.warn('uploadAndSetOurAvatarShared: avatar content is empty');
@@ -106,19 +110,28 @@ export async function uploadAndSetOurAvatarShared({
       })
     : null;
 
-  const displayName = ourConvo.getRealSessionUsername();
-
   // Replace our temporary image with the attachment pointer from the server.
   // Note: this commits already to the DB.
   await ourConvo.setSessionProfile({
     avatarPath: savedMainAvatar.path,
     fallbackAvatarPath: processedFallbackAvatar?.path || savedMainAvatar.path,
-    displayName,
+    displayName: null,
     avatarPointer: fileUrl,
     type: 'setAvatarDownloadedPrivate',
     profileKey,
   });
   await Storage.put(SettingsKey.ntsAvatarExpiryMs, expiresMs);
+  if (context === 'uploadNewAvatar') {
+    await UserConfigWrapperActions.setNewProfilePic({
+      key: profileKey,
+      url: fileUrl,
+    });
+  } else if (context === 'reuploadAvatar') {
+    await UserConfigWrapperActions.setReuploadProfilePic({
+      key: profileKey,
+      url: fileUrl,
+    });
+  }
 
   return {
     avatarPointer: ourConvo.getAvatarPointer(),

ts/models/conversation.ts

@@ -111,7 +111,6 @@ import {
 import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 import { PreConditionFailed } from '../session/utils/errors';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
-import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile';
 import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo';
 import {
   selectLibGroupAdminsOutsideRedux,
@@ -1835,10 +1834,35 @@ export class ConversationModel extends Model<ConversationAttributes> {
    * Note: Currently, we do not have an order in the list of pinned conversation, but the libsession util wrapper can handle the order.
    */
   public async togglePinned(shouldCommit: boolean = true) {
-    this.set({ priority: this.isPinned() ? 0 : 1 });
+    const pinnedBefore = this.isPinned();
+    const newPriority = pinnedBefore
+      ? CONVERSATION_PRIORITIES.default
+      : CONVERSATION_PRIORITIES.pinned;
+    this.set({
+      priority: newPriority,
+    });
     if (shouldCommit) {
       await this.commit();
     }
+    const convoType = this.getConvoType();
+    switch (convoType) {
+      case ConvoTypeNarrow.blindedAcquaintance:
+      case ConvoTypeNarrow.blindedContact:
+      case ConvoTypeNarrow.privateAcquaintance:
+      case ConvoTypeNarrow.community:
+      case ConvoTypeNarrow.legacyGroup:
+      case ConvoTypeNarrow.group:
+        // all of the above do not support being hidden (only removed)
+        break;
+      case ConvoTypeNarrow.nts:
+        await UserConfigWrapperActions.setPriority(newPriority);
+        break;
+      case ConvoTypeNarrow.contact:
+        // TODO add cases here for contacts to handle the other cases
+        break;
+      default:
+        assertUnreachable(convoType, `convoType ${convoType} is not supported`);
+    }
     return true;
   }
 
@@ -3093,10 +3117,8 @@ async function commitConversationAndRefreshWrapper(id: string) {
 
     switch (variant) {
       case 'UserConfig':
-        if (SessionUtilUserProfile.isUserProfileToStoreInWrapper(convo.id)) {
-          // eslint-disable-next-line no-await-in-loop
-          await SessionUtilUserProfile.insertUserProfileIntoWrapper(convo.id);
-        }
+        // Note: nothing to do here, the NTS changes in libsession are now done
+        //  when done through the UI
         break;
       case 'ContactsConfig':
         if (SessionUtilContact.isContactToStoreInWrapper(convo)) {

ts/session/utils/libsession/libsession_utils_user_profile.ts

@@ -1,59 +1,4 @@
-import { isEmpty } from 'lodash';
 import { UserUtils } from '..';
-import { SettingsKey } from '../../../data/settings-key';
-import { CONVERSATION_PRIORITIES } from '../../../models/types';
-import { stringify } from '../../../types/sqlSharedTypes';
-import { Storage } from '../../../util/storage';
-import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
-import { ConvoHub } from '../../conversations';
-import { fromHexToArray } from '../String';
-
-async function insertUserProfileIntoWrapper(convoId: string) {
-  if (!SessionUtilUserProfile.isUserProfileToStoreInWrapper(convoId)) {
-    return null;
-  }
-  const us = UserUtils.getOurPubKeyStrFromCache();
-  const ourConvo = ConvoHub.use().get(us);
-
-  if (!ourConvo) {
-    throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist');
-  }
-
-  const dbName = ourConvo.getRealSessionUsername() || '';
-  const dbProfileUrl = ourConvo.getAvatarPointer() || '';
-  const dbProfileKey = fromHexToArray(ourConvo.getProfileKey() || '');
-  const priority = ourConvo.get('priority') || CONVERSATION_PRIORITIES.default; // this has to be a direct call to .get() and not getPriority()
-
-  const areBlindedMsgRequestEnabled = !!Storage.get(SettingsKey.hasBlindedMsgRequestsEnabled);
-
-  const expirySeconds = ourConvo.getExpireTimer() || 0;
-  window.log.debug(
-    `inserting into userprofile wrapper: username:"${dbName}", priority:${priority} image:${JSON.stringify(
-      { url: dbProfileUrl, key: stringify(dbProfileKey) }
-    )}, settings: ${JSON.stringify({ areBlindedMsgRequestEnabled, expirySeconds })}`
-  );
-
-  // we don't want to throw if somehow our display name in the DB is too long here, so we use the truncated version.
-  await UserConfigWrapperActions.setNameTruncated(dbName);
-  await UserConfigWrapperActions.setPriority(priority);
-  if (dbProfileUrl && !isEmpty(dbProfileKey) && dbProfileKey.length === 32) {
-    await UserConfigWrapperActions.setProfilePic({ key: dbProfileKey, url: dbProfileUrl });
-  } else {
-    await UserConfigWrapperActions.setProfilePic({ key: null, url: null });
-  }
-
-  await UserConfigWrapperActions.setEnableBlindedMsgRequest(areBlindedMsgRequestEnabled);
-  await UserConfigWrapperActions.setNoteToSelfExpiry(expirySeconds);
-
-  // returned for testing purposes only
-  return {
-    id: convoId,
-    name: dbName,
-    priority,
-    avatarPointer: dbProfileUrl,
-    expirySeconds,
-  };
-}
 
 function isUserProfileToStoreInWrapper(convoId: string) {
   try {
@@ -64,6 +9,5 @@ function isUserProfileToStoreInWrapper(convoId: string) {
 }
 
 export const SessionUtilUserProfile = {
-  insertUserProfileIntoWrapper,
   isUserProfileToStoreInWrapper,
 };

ts/state/ducks/user.ts

@@ -7,6 +7,7 @@ import { uploadAndSetOurAvatarShared } from '../../interactions/avatar-interacti
 import { ed25519Str } from '../../session/utils/String';
 import { userSettingsModal, updateEditProfilePictureModal } from './modalDialog';
 import { NetworkTime } from '../../util/NetworkTime';
+import { UserConfigWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface';
 
 export type UserStateType = {
   ourDisplayNameInProfile: string;
@@ -44,6 +45,7 @@ const updateOurAvatar = createAsyncThunk(
       decryptedAvatarData: mainAvatarDecrypted,
       ourConvo,
       profileKey,
+      context: 'uploadNewAvatar',
     });
 
     if (res) {
@@ -83,6 +85,10 @@ const clearOurAvatar = createAsyncThunk('user/clearOurAvatar', async () => {
     displayName: null,
     profileUpdatedAtSeconds: NetworkTime.nowSeconds(),
   });
+  await UserConfigWrapperActions.setNewProfilePic({
+    url: null,
+    key: null,
+  });
 
   await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
   window.inboxStore?.dispatch(updateEditProfilePictureModal(null));

ts/state/selectors/modal.ts

@@ -122,5 +122,5 @@ export function useModalStack() {
 
 export function useIsTopModal(modalId: ModalId) {
   const modalStack = useModalStack();
-  return modalStack.length === 0 || modalStack[modalStack.length - 1] === modalId;
+  return !modalStack?.length || modalStack[modalStack.length - 1] === modalId;
 }