chore: renamed setSessionDisplayNameNoCommit as only for non private

Author: Bilb

ts/models/conversation.ts

@@ -203,6 +203,12 @@ type SetSessionProfileDetails = WithDisplayNameChange &
         WithAvatarPathAndFallback)
   );
 
+type SetSessionProfileReturn = {
+  nameChanged: boolean;
+  avatarChanged: boolean;
+  avatarNeedsDownload: boolean;
+};
+
 /**
  *
  * Type guard for the set profile action that is private.
@@ -1480,15 +1486,17 @@ export class ConversationModel extends Model<ConversationAttributes> {
    *
    * This function does commit to the DB if any changes are detected.
    */
-  public async setSessionProfile(newProfile: SetSessionProfileDetails): Promise<{
-    nameChanged: boolean;
-    avatarChanged: boolean;
-    avatarNeedsDownload: boolean;
-  }> {
+  public async setSessionProfile(
+    newProfile: SetSessionProfileDetails
+  ): Promise<SetSessionProfileReturn> {
     let nameChanged = false;
 
     const existingSessionName = this.getRealSessionUsername();
-    if (newProfile.displayName !== existingSessionName && newProfile.displayName) {
+    if (
+      this.shouldApplyPrivateProfileUpdate(newProfile) &&
+      newProfile.displayName !== existingSessionName &&
+      newProfile.displayName
+    ) {
       this.set({
         displayNameInProfile: newProfile.displayName,
       });
@@ -1659,15 +1667,12 @@ export class ConversationModel extends Model<ConversationAttributes> {
 
   /**
    * Update the display name of this conversation with the provided one.
-   * Note: cannot be called with private chats.
-   * Instead use `setSessionProfile`.
-   * The reason is that we might have a more recent name set for this user already, and we need to discard the change
-   * if what we are about to apply is older than what we have.
+   * Note: cannot be called with private chats: instead use `setSessionProfile`.
    */
-  public setSessionDisplayNameNoCommit(newDisplayName?: string | null) {
+  public setNonPrivateNameNoCommit(newDisplayName?: string | null) {
     if (this.isPrivate()) {
       // the name change is only allowed through setSessionProfile for private chats now, see above.
-      throw new Error('setSessionDisplayNameNoCommit should not be called with private chats');
+      throw new Error('setNonPrivateNameNoCommit should not be called with private chats');
     }
     const existingSessionName = this.getRealSessionUsername();
     if (newDisplayName !== existingSessionName && newDisplayName) {
@@ -2108,7 +2113,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
 
     if (details.name && details.name !== this.getRealSessionUsername()) {
       hasChange = hasChange || true;
-      this.setSessionDisplayNameNoCommit(details.name);
+      this.setNonPrivateNameNoCommit(details.name);
     }
 
     if (this.handleRoomDescriptionChange({ description: details.description || '' })) {

ts/receiver/configMessage.ts

@@ -637,7 +637,7 @@ async function handleSingleGroupUpdate({
         ? groupInWrapper.disappearingTimerSeconds
         : undefined;
     created.setActiveAt(joinedAt);
-    created.setSessionDisplayNameNoCommit(groupInWrapper.name || undefined);
+    created.setNonPrivateNameNoCommit(groupInWrapper.name || undefined);
     await created.setPriorityFromWrapper(groupInWrapper.priority);
     created.setLastJoinedTimestamp(joinedAt);
     created.setExpirationArgs({

ts/receiver/groupv2/handleGroupV2Message.ts

@@ -139,13 +139,13 @@ async function handleGroupUpdateInviteMessage({
 
   window.log.debug(`received invite to group ${ed25519Str(groupPk)} by user:${ed25519Str(author)}`);
 
-  const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2);
-  convo.setActiveAt(signatureTimestamp);
-  await convo.setDidApproveMe(true, false);
-  await convo.setOriginConversationID(author, false);
+  const groupConvo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2);
+  groupConvo.setActiveAt(signatureTimestamp);
+  await groupConvo.setDidApproveMe(true, false);
+  await groupConvo.setOriginConversationID(author, false);
 
-  if (inviteMessage.name && isEmpty(convo.getRealSessionUsername())) {
-    convo.setSessionDisplayNameNoCommit(inviteMessage.name);
+  if (inviteMessage.name && isEmpty(groupConvo.getRealSessionUsername())) {
+    groupConvo.setNonPrivateNameNoCommit(inviteMessage.name);
   }
   const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes;
 
@@ -162,10 +162,10 @@ async function handleGroupUpdateInviteMessage({
   await UserGroupsWrapperActions.setGroup(found);
   await UserGroupsWrapperActions.markGroupInvited(groupPk);
   // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request)
-  await convo.markAsUnread(true, false);
-  await convo.commit();
+  await groupConvo.markAsUnread(true, false);
+  await groupConvo.commit();
 
-  await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id);
+  await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(groupConvo.id);
 
   if (wasKicked && !found.kicked) {
     // we have been reinvited to a group which we had been kicked from.
@@ -568,7 +568,7 @@ async function handleGroupUpdatePromoteMessage({
   await convo.setOriginConversationID(author, false);
 
   if (change.name && isEmpty(convo.getRealSessionUsername())) {
-    convo.setSessionDisplayNameNoCommit(change.name);
+    convo.setNonPrivateNameNoCommit(change.name);
   }
   const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes;
 

ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts

@@ -210,7 +210,7 @@ export class OpenGroupManagerV2 {
       // mark active so it's not in the contacts list but in the conversation list
       // mark isApproved as this is a public chat
       conversation.setActiveAt(Date.now());
-      conversation.setSessionDisplayNameNoCommit(updatedRoom.roomName);
+      conversation.setNonPrivateNameNoCommit(updatedRoom.roomName);
       await conversation.setIsApproved(true, false);
       await conversation.setDidApproveMe(true, false);
       await conversation.setPriorityFromWrapper(CONVERSATION_PRIORITIES.default, false);

ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts

@@ -144,7 +144,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) {
   if (convo) {
     let changes = false;
     if (refreshedInfos.name !== convo.get('displayNameInProfile')) {
-      convo.setSessionDisplayNameNoCommit(refreshedInfos.name || undefined);
+      convo.setNonPrivateNameNoCommit(refreshedInfos.name || undefined);
       changes = true;
     }
     const expirationMode = refreshedInfos.expirySeconds ? 'deleteAfterSend' : 'off';

ts/state/ducks/metaGroups.ts

@@ -345,7 +345,7 @@ const handleUserGroupUpdate = createAsyncThunk(
       convo.setActiveAt(Date.now());
     }
 
-    convo.setSessionDisplayNameNoCommit(userGroup.name || undefined);
+    convo.setNonPrivateNameNoCommit(userGroup.name || undefined);
 
     await convo.commit();