feat: control available modes depending on the conversation

ts/components/conversation/right-panel/overlay/OverlayDisappearingMessages.tsx

@@ -12,11 +12,11 @@ import { PanelButtonGroup } from '../../../buttons';
 import { PanelLabel } from '../../../buttons/PanelButton';
 import { PanelRadioButton } from '../../../buttons/PanelRadioButton';
 import { SessionIconButton } from '../../../icon';
-import { getSelectedConversationExpirationSettings } from '../../../../state/selectors/conversations';
 import {
-  DisappearingMessageConversationSetting,
+  getSelectedConversationExpirationModes,
-  DisappearingMessageConversationType,
+  getSelectedConversationExpirationSettings,
-} from '../../../../util/expiringMessages';
+} from '../../../../state/selectors/conversations';
+import { DisappearingMessageConversationType } from '../../../../util/expiringMessages';
 import { TimerOptionsArray } from '../../../../state/ducks/timerOptions';
 import { useTimerOptionsByMode } from '../../../../hooks/useParamSelector';
 import { isEmpty } from 'lodash';
@@ -177,7 +177,7 @@ const TimeOptions = (props: TimerOptionsProps) => {
 export const OverlayDisappearingMessages = () => {
   const dispatch = useDispatch();
   const selectedConversationKey = useSelector(getSelectedConversationKey);
-  const disappearingModeOptions = DisappearingMessageConversationSetting;
+  const disappearingModeOptions = useSelector(getSelectedConversationExpirationModes);
 
   const convoProps = useSelector(getSelectedConversationExpirationSettings);
 

ts/models/conversation.ts

@@ -1045,18 +1045,16 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     }
 
     if (this.get('expireTimer') === expireTimer || (!expireTimer && !this.get('expireTimer'))) {
-      return;
+      window.log.info(`WIP: This disappearing message setting is invalid`, {
-    }
-
-    window?.log?.info('WIP: Updated conversation disappearing messages setting', {
         id: this.idForLogging(),
         expirationType,
         expireTimer,
         source,
       });
+      return;
+    }
 
     const isOutgoing = Boolean(!receivedAt);
-
     source = source || UserUtils.getOurPubKeyStrFromCache();
 
     // When we add a disappearing messages notification to the conversation, we want it
@@ -1069,8 +1067,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       lastDisappearingMessageChangeTimestamp: providedChangeTimestamp || undefined,
     });
 
-    const lastDisappearingMessageChangeTimestamp = providedChangeTimestamp || 0;
+    window?.log?.info('WIP: Updated conversation disappearing messages setting', {
+      id: this.idForLogging(),
+      expirationType,
+      expireTimer,
+      source,
+    });
 
+    const lastDisappearingMessageChangeTimestamp = providedChangeTimestamp || 0;
     const commonAttributes = {
       flags: SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE,
       expirationTimerUpdate: {
@@ -1125,6 +1129,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
 
     if (this.isMe()) {
       // TODO Check that the args are correct
+      if (expireUpdate.expirationType === 'deleteAfterRead') {
+        window.log.info(`WIP: Note to Self messages cannot be delete after read!`);
+        return;
+      }
+
       const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate);
       return message.sendSyncMessageOnly(expirationTimerMessage);
     }

ts/receiver/contentMessage.ts

@@ -402,13 +402,14 @@ export async function innerHandleSwarmContentMessage(
 
       perfStart(`handleSwarmDataMessage-${envelope.id}`);
 
+      let expireUpdate = null;
       const expirationType = DisappearingMessageConversationSetting[content.expirationType] || null;
+
+      if (expirationType && content.expirationTimer) {
         // NOTE In the protobuf this is a long
         const lastDisappearingMessageChangeTimestamp =
           Number(content.lastDisappearingMessageChangeTimestamp) || null;
-      let expireUpdate = null;
 
-      if (expirationType && content.expirationTimer) {
         expireUpdate = {
           expirationType,
           // TODO rename to expireTimer

ts/receiver/queuedJob.ts

@@ -1,7 +1,7 @@
 import { queueAttachmentDownloads } from './attachments';
 
 import { Quote } from './types';
-import _, { isEmpty } from 'lodash';
+import _, { isEmpty, isEqual } from 'lodash';
 import { getConversationController } from '../session/conversations';
 import { ConversationModel } from '../models/conversation';
 import { MessageModel, sliceQuoteText } from '../models/message';
@@ -318,6 +318,12 @@ async function handleExpirationTimerUpdateNoCommit(
 ) {
   const providedChangeTimestamp = getNowWithNetworkOffset();
 
+  // TODO Not entirely sure that this works
+  if (conversation.get('lastDisappearingMessageChangeTimestamp') > providedChangeTimestamp) {
+    window.log.info(`WIP: This is an outdated disappearing message setting`);
+    return;
+  }
+
   message.set({
     expirationTimerUpdate: {
       source,
@@ -366,9 +372,9 @@ export async function handleMessageJob(
       const expireTimer = expireUpdate.expireTimer || oldExpireTimer;
 
       // TODO compare types and change timestamps
-      // const oldTypeValue = conversation.get('expirationType');
+      const oldTypeValue = conversation.get('expirationType');
       const oldTimerValue = conversation.get('expireTimer');
-      if (expireTimer === oldTimerValue) {
+      if (isEqual(expirationType, oldTypeValue) && expireTimer === oldTimerValue) {
         confirm?.();
         window?.log?.info(
           'Dropping ExpireTimerUpdate message as we already have the same one set.'

ts/state/selectors/conversations.ts

@@ -37,6 +37,7 @@ import { ConversationTypeEnum } from '../../models/conversationAttributes';
 
 import { MessageReactsSelectorProps } from '../../components/conversation/message/message-content/MessageReactions';
 import { filter, isEmpty, pick, sortBy } from 'lodash';
+import { DisappearingMessageConversationSetting } from '../../util/expiringMessages';
 
 export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
 
@@ -1175,6 +1176,21 @@ export const getIsSelectedConvoInitialLoadingInProgress = createSelector(
   (convo: ReduxConversationType | undefined): boolean => Boolean(convo?.isInitialFetchingInProgress)
 );
 
+export const getSelectedConversationExpirationModes = createSelector(
+  getSelectedConversation,
+  (convo: ReduxConversationType | undefined) => {
+    let modes = DisappearingMessageConversationSetting;
+
+    // Note to Self and Closed Groups only support deleteAfterSend
+    if (convo?.isMe || (convo?.isGroup && !convo.isPublic)) {
+      // only deleteAfterSend
+      modes = [modes[0], modes[2]];
+    }
+
+    return modes;
+  }
+);
+
 export const getSelectedConversationExpirationSettings = createSelector(
   getSelectedConversation,
   (convo: ReduxConversationType | undefined) => ({