feat: DisappearingMessageType -> DisappearingMessageConversationType

this is more explicit and allows use to use DisappearingMessageType in the message model

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

@@ -3,8 +3,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 import { setDisappearingMessagesByConvoId } from '../../../../interactions/conversationInteractions';
 import {
-  DisappearingMessageSetting,
+  DisappearingMessageConversationSetting,
-  DisappearingMessageType,
+  DisappearingMessageConversationType,
 } from '../../../../models/conversationAttributes';
 import { closeRightPanel } from '../../../../state/ducks/conversations';
 import { resetRightOverlayMode } from '../../../../state/ducks/section';
@@ -93,8 +93,8 @@ const Header = (props: HeaderProps) => {
 };
 
 type DisappearingModesProps = {
-  options: Array<DisappearingMessageType>;
+  options: Array<DisappearingMessageConversationType>;
-  selected?: DisappearingMessageType;
+  selected?: DisappearingMessageConversationType;
   setSelected: (value: string) => void;
 };
 
@@ -104,7 +104,7 @@ const DisappearingModes = (props: DisappearingModesProps) => {
     <>
       <PanelLabel>{window.i18n('disappearingMessagesModeLabel')}</PanelLabel>
       <PanelButtonGroup>
-        {options.map((option: DisappearingMessageType) => {
+        {options.map((option: DisappearingMessageConversationType) => {
           const optionI18n =
             option === 'off'
               ? window.i18n('disappearingMessagesModeOff')
@@ -170,7 +170,7 @@ const TimeOptions = (props: TimerOptionsProps) => {
 
 export const OverlayDisappearingMessages = () => {
   const selectedConversationKey = useSelector(getSelectedConversationKey);
-  const disappearingModeOptions = DisappearingMessageSetting;
+  const disappearingModeOptions = DisappearingMessageConversationSetting;
   const timerOptions = useSelector(getTimerOptions).timerOptions;
 
   const convoProps = useSelector(getSelectedConversationExpirationSettings);

ts/interactions/conversationInteractions.ts

@@ -8,7 +8,7 @@ import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils'
 import {
   ConversationNotificationSettingType,
   ConversationTypeEnum,
-  DisappearingMessageType,
+  DisappearingMessageConversationType,
 } from '../models/conversationAttributes';
 
 import _ from 'lodash';
@@ -344,7 +344,7 @@ export function deleteAllMessagesByConvoIdWithConfirmation(conversationId: strin
 
 export async function setDisappearingMessagesByConvoId(
   conversationId: string,
-  expirationType: DisappearingMessageType,
+  expirationType: DisappearingMessageConversationType,
   seconds?: number
 ) {
   const conversation = getConversationController().get(conversationId);

ts/models/conversation.ts

@@ -78,7 +78,7 @@ import {
   ConversationAttributes,
   ConversationNotificationSetting,
   ConversationTypeEnum,
-  DisappearingMessageType,
+  DisappearingMessageConversationType,
   fillConvoAttributesWithDefaults,
 } from './conversationAttributes';
 import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding';
@@ -1017,7 +1017,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async updateExpireTimer(
-    providedExpirationType: DisappearingMessageType,
+    providedExpirationType: DisappearingMessageConversationType,
     providedExpireTimer?: number,
     providedSource?: string,
     receivedAt?: number, // is set if it comes from outside

ts/models/conversationAttributes.ts

@@ -15,8 +15,8 @@ export const ConversationNotificationSetting = ['all', 'disabled', 'mentions_onl
 export type ConversationNotificationSettingType = typeof ConversationNotificationSetting[number];
 
 // TODO Might need to be improved by using an enum
-export const DisappearingMessageSetting = ['off', 'deleteAfterRead', 'deleteAfterSend'];
+export const DisappearingMessageConversationSetting = ['off', 'deleteAfterRead', 'deleteAfterSend'];
-export type DisappearingMessageType = typeof DisappearingMessageSetting[number];
+export type DisappearingMessageConversationType = typeof DisappearingMessageConversationSetting[number];
 
 export interface ConversationAttributes {
   id: string;
@@ -34,7 +34,7 @@ export interface ConversationAttributes {
   zombies: Array<string>; // only used for closed groups. Zombies are users which left but not yet removed by the admin
   left: boolean;
 
-  expirationType: DisappearingMessageType;
+  expirationType: DisappearingMessageConversationType;
   expireTimer: number;
   lastDisappearingMessageChangeTimestamp: number;
 

ts/receiver/queuedJob.ts

@@ -14,7 +14,10 @@ import { MessageDirection } from '../models/messageType';
 import { LinkPreviews } from '../util/linkPreviews';
 import { GoogleChrome } from '../util';
 import { appendFetchAvatarAndProfileJob } from './userProfileImageUpdates';
-import { ConversationTypeEnum, DisappearingMessageType } from '../models/conversationAttributes';
+import {
+  ConversationTypeEnum,
+  DisappearingMessageConversationType,
+} from '../models/conversationAttributes';
 import { getUsBlindedInThatServer } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
 
 function contentTypeSupported(type: string): boolean {
@@ -311,7 +314,7 @@ async function handleExpirationTimerUpdateNoCommit(
   conversation: ConversationModel,
   message: MessageModel,
   source: string,
-  expirationType: DisappearingMessageType,
+  expirationType: DisappearingMessageConversationType,
   expireTimer: number
 ) {
   message.set({

ts/session/group/closed-group.ts

@@ -31,7 +31,7 @@ import { getNowWithNetworkOffset } from '../apis/snode_api/SNodeAPI';
 import {
   ConversationAttributes,
   ConversationTypeEnum,
-  DisappearingMessageType,
+  DisappearingMessageConversationType,
 } from '../../models/conversationAttributes';
 
 export type GroupInfo = {
@@ -40,7 +40,7 @@ export type GroupInfo = {
   members: Array<string>;
   zombies?: Array<string>;
   activeAt?: number;
-  expirationType?: DisappearingMessageType[0] | DisappearingMessageType[2];
+  expirationType?: DisappearingMessageConversationType[0] | DisappearingMessageConversationType[2];
   expireTimer?: number | null;
   blocked?: boolean;
   admins?: Array<string>;

ts/state/ducks/conversations.ts

@@ -14,7 +14,7 @@ import { LightBoxOptions } from '../../components/conversation/SessionConversati
 import {
   ConversationNotificationSettingType,
   ConversationTypeEnum,
-  DisappearingMessageType,
+  DisappearingMessageConversationType,
 } from '../../models/conversationAttributes';
 import { ReactionList } from '../../types/Reaction';
 
@@ -247,7 +247,7 @@ export interface ReduxConversationType {
   unreadCount?: number;
   mentionedUs?: boolean;
   isSelected?: boolean;
-  expirationType?: DisappearingMessageType;
+  expirationType?: DisappearingMessageConversationType;
   expireTimer?: number;
   lastDisappearingMessageChangeTimestamp?: number;