keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

refactor: disappearingmessageconversationtype to disappearingmessageconversationmodetype

Browse Source
pull/2971/head
William Grant 2 years ago
parent c7f8f4f635
commit cd2f51684d
8 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

16
ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx
Unescape Escape View File

@ -1,9 +1,9 @@
import React from 'react';
import { DisappearingMessageConversationType } from '../../../../../util/expiringMessages';
import { DisappearingMessageConversationModeType } from '../../../../../util/expiringMessages';
import { PanelButtonGroup, PanelLabel } from '../../../../buttons/PanelButton';
import { PanelRadioButton } from '../../../../buttons/PanelRadioButton';
function loadDataTestId(mode: DisappearingMessageConversationType) {
function loadDataTestId(mode: DisappearingMessageConversationModeType) {
const dataTestId = 'disappear-%-option';
switch (mode) {
case 'legacy':
@ -19,9 +19,9 @@ function loadDataTestId(mode: DisappearingMessageConversationType) {
}
type DisappearingModesProps = {
options: Record<DisappearingMessageConversationType, boolean>;
selected?: DisappearingMessageConversationType;
setSelected: (value: DisappearingMessageConversationType) => void;
options: Record<DisappearingMessageConversationModeType, boolean>;
selected?: DisappearingMessageConversationModeType;
setSelected: (value: DisappearingMessageConversationModeType) => void;
hasOnlyOneMode?: boolean;
};
@ -63,11 +63,11 @@ export const DisappearingModes = (props: DisappearingModesProps) => {
value={mode}
isSelected={selected === mode}
onSelect={() => {
setSelected(mode as DisappearingMessageConversationType);
setSelected(mode as DisappearingMessageConversationModeType);
}}
disabled={options[mode as DisappearingMessageConversationType]}
disabled={options[mode as DisappearingMessageConversationModeType]}
noBackgroundColor={true}
dataTestId={loadDataTestId(mode as DisappearingMessageConversationType)}
dataTestId={loadDataTestId(mode as DisappearingMessageConversationModeType)}
/>
);
})}

16
ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
Unescape Escape View File

@ -15,7 +15,7 @@ import {
} from '../../../../../state/selectors/selectedConversation';
import {
DEFAULT_TIMER_OPTION,
DisappearingMessageConversationType,
DisappearingMessageConversationModeType,
} from '../../../../../util/expiringMessages';
import { Flex } from '../../../../basic/Flex';
import { SessionButton } from '../../../../basic/SessionButton';
@ -52,7 +52,7 @@ const StyledNonAdminDescription = styled.div`
`;
// TODO legacy messages support will be removed in a future release
function loadDefaultTimeValue(modeSelected: DisappearingMessageConversationType | undefined) {
function loadDefaultTimeValue(modeSelected: DisappearingMessageConversationModeType | undefined) {
return modeSelected !== 'off'
? modeSelected !== 'legacy'
? modeSelected === 'deleteAfterSend'
@ -63,7 +63,7 @@ function loadDefaultTimeValue(modeSelected: DisappearingMessageConversationType
}
export type PropsForExpirationSettings = {
expirationType: DisappearingMessageConversationType | undefined;
expirationType: DisappearingMessageConversationModeType | undefined;
expireTimer: number | undefined;
isGroup: boolean | undefined;
weAreAdmin: boolean | undefined;
@ -75,11 +75,11 @@ export const OverlayDisappearingMessages = () => {
const disappearingModeOptions = useSelector(getSelectedConversationExpirationModes);
// NOTE if there is only 'off' and one disappearing message mode then we trigger single mode
const singleMode: DisappearingMessageConversationType | undefined =
const singleMode: DisappearingMessageConversationModeType | undefined =
disappearingModeOptions &&
disappearingModeOptions.off !== undefined &&
Object.keys(disappearingModeOptions).length === 2
? (Object.keys(disappearingModeOptions)[1] as DisappearingMessageConversationType)
? (Object.keys(disappearingModeOptions)[1] as DisappearingMessageConversationModeType)
: undefined;
const hasOnlyOneMode = Boolean(singleMode && singleMode.length > 0);
@ -88,9 +88,9 @@ export const OverlayDisappearingMessages = () => {
const expireTimer = useSelectedExpireTimer();
const weAreAdmin = useSelectedWeAreAdmin();
const [modeSelected, setModeSelected] = useState<DisappearingMessageConversationType | undefined>(
hasOnlyOneMode ? singleMode : expirationType
);
const [modeSelected, setModeSelected] = useState<
DisappearingMessageConversationModeType | undefined
>(hasOnlyOneMode ? singleMode : expirationType);
const [timeSelected, setTimeSelected] = useState(expireTimer || 0);
const timerOptions = useTimerOptionsByMode(modeSelected, hasOnlyOneMode);

4
ts/interactions/conversationInteractions.ts
Unescape Escape View File

@ -44,7 +44,7 @@ import { encryptProfile } from '../util/crypto/profileEncrypter';
import { ReleasedFeatures } from '../util/releaseFeature';
import { Storage, setLastProfileUpdateTimestamp } from '../util/storage';
import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface';
import { DisappearingMessageConversationType } from '../util/expiringMessages';
import { DisappearingMessageConversationModeType } from '../util/expiringMessages';
import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
export async function copyPublicKeyByConvoId(convoId: string) {
@ -367,7 +367,7 @@ export function deleteAllMessagesByConvoIdWithConfirmation(conversationId: strin
export async function setDisappearingMessagesByConvoId(
conversationId: string,
expirationType: DisappearingMessageConversationType,
expirationType: DisappearingMessageConversationModeType,
seconds?: number
) {
const conversation = getConversationController().get(conversationId);

6
ts/models/conversation.ts
Unescape Escape View File

@ -118,7 +118,7 @@ import {
} from '../state/selectors/sogsRoomInfo'; // decide it it makes sense to move this to a redux slice?
import {
DisappearingMessageConversationType,
DisappearingMessageConversationModeType,
changeToDisappearingMessageType,
} from '../util/expiringMessages';
import { markAttributesAsReadIfNeeded } from './messageFactory';
@ -811,7 +811,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
shouldCommit = true,
existingMessage,
}: {
providedExpirationType?: DisappearingMessageConversationType;
providedExpirationType?: DisappearingMessageConversationModeType;
providedExpireTimer?: number;
providedChangeTimestamp: number;
providedSource?: string;
@ -2338,7 +2338,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
return [];
}
private isDisappearingMode(mode: DisappearingMessageConversationType) {
private isDisappearingMode(mode: DisappearingMessageConversationModeType) {
const success =
mode === 'deleteAfterRead'
? this.get('expirationType') === 'deleteAfterRead'

4
ts/models/conversationAttributes.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import { defaults } from 'lodash';
import { LastMessageStatusType } from '../state/ducks/conversations';
import { DisappearingMessageConversationType } from '../util/expiringMessages';
import { DisappearingMessageConversationModeType } from '../util/expiringMessages';
/**
* Private chats have always the type `Private`
@ -105,7 +105,7 @@ export interface ConversationAttributes {
blocksSogsMsgReqsTimestamp: number; // if the convo is blinded and the user has denied contact through sogs, this field be set to the user's latest message timestamp
expirationType: DisappearingMessageConversationType; // the type of expiring messages for this conversation
expirationType: DisappearingMessageConversationModeType; // disappearing messages setting for this conversation
lastDisappearingMessageChangeTimestamp: number; // to avoid applying a change of disappear change when our current one was applied more recently
hasOutdatedClient?: string; // to warn the user that the person he is talking to is using an old client which might cause issues
}

6
ts/state/ducks/conversations.ts
Unescape Escape View File

@ -18,7 +18,7 @@ import {
import { getConversationController } from '../../session/conversations';
import { ReactionList } from '../../types/Reaction';
import {
DisappearingMessageConversationType,
DisappearingMessageConversationModeType,
DisappearingMessageType,
} from '../../util/expiringMessages';
@ -86,7 +86,7 @@ export type PropsForExpiringMessage = {
};
export type PropsForExpirationTimer = {
expirationType: DisappearingMessageConversationType;
expirationType: DisappearingMessageConversationModeType;
timespan: string;
disabled: boolean;
pubkey: string;
@ -247,7 +247,7 @@ export interface ReduxConversationType {
weAreAdmin?: boolean;
unreadCount?: number;
mentionedUs?: boolean;
expirationType?: DisappearingMessageConversationType;
expirationType?: DisappearingMessageConversationModeType;
expireTimer?: number;
lastDisappearingMessageChangeTimestamp?: number;
hasOutdatedClient?: string;

10
ts/state/selectors/selectedConversation.ts
Unescape Escape View File

@ -7,8 +7,8 @@ import { StateType } from '../reducer';
import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo';
import { getIsMessageSelectionMode, getSelectedConversation } from './conversations';
import {
DisappearingMessageConversationSetting,
DisappearingMessageConversationType,
DisappearingMessageConversationModes,
DisappearingMessageConversationModeType,
} from '../../util/expiringMessages';
import { ReleasedFeatures } from '../../util/releaseFeature';
import { ReduxConversationType } from '../ducks/conversations';
@ -167,7 +167,7 @@ const getSelectedConversationExpirationModesWithLegacy = (convo: ReduxConversati
}
// NOTE this needs to be as any because the number of modes can change depending on if v2 is released or we are in single mode
let modes: any = DisappearingMessageConversationSetting;
let modes: any = DisappearingMessageConversationModes;
// Note to Self and Closed Groups only support deleteAfterSend and legacy modes
const isClosedGroup = !convo.isPrivate && !convo.isPublic;
@ -202,7 +202,7 @@ export const getSelectedConversationExpirationModes = (state: StateType) => {
}
// NOTE this needs to be as any because the number of modes can change depending on if v2 is released or we are in single mode
let modes: any = DisappearingMessageConversationSetting;
let modes: any = DisappearingMessageConversationModes;
// TODO legacy messages support will be removed in a future release
// TODO remove legacy mode
modes = modes.slice(0, -1);
@ -313,7 +313,7 @@ export function useSelectedExpireTimer(): number | undefined {
}
export function useSelectedConversationExpirationType():
| DisappearingMessageConversationType
| DisappearingMessageConversationModeType
| undefined {
return useSelector((state: StateType) => getSelectedConversation(state)?.expirationType);
}

14
ts/util/expiringMessages.ts
Unescape Escape View File

@ -22,13 +22,13 @@ export type DisappearAfterSendOnly = Exclude<DisappearingMessageType, 'deleteAft
// NOTE these cannot be imported in the nodejs side yet. We need to move the types to the own file with no window imports
// TODO legacy messages support will be removed in a future release
// TODO NOTE legacy is strictly used in the UI and is not a valid disappearing message mode
export const DisappearingMessageConversationSetting = [
export const DisappearingMessageConversationModes = [
'off',
DisappearingMessageMode[1], // deleteAfterRead
DisappearingMessageMode[2], // deleteAfterSend
'legacy',
] as const;
export type DisappearingMessageConversationType = typeof DisappearingMessageConversationSetting[number]; // TODO we should make this type a bit more hardcoded than being just resolved as a string
export type DisappearingMessageConversationModeType = typeof DisappearingMessageConversationModes[number]; // TODO we should make this type a bit more hardcoded than being just resolved as a string
export const DEFAULT_TIMER_OPTION = {
DELETE_AFTER_READ: 43200, // 12 hours
@ -243,7 +243,7 @@ export const ExpirationTimerOptions = {
};
export function setExpirationStartTimestamp(
mode: DisappearingMessageConversationType,
mode: DisappearingMessageConversationModeType,
timestamp?: number,
callLocation?: string // this is for debugging purposes
): number | undefined {
@ -301,7 +301,7 @@ export function setExpirationStartTimestamp(
// TODO legacy messages support will be removed in a future release
export function isLegacyDisappearingModeEnabled(
expirationType: DisappearingMessageConversationType | DisappearingMessageType | undefined
expirationType: DisappearingMessageConversationModeType | DisappearingMessageType | undefined
): boolean {
return Boolean(
expirationType &&
@ -323,7 +323,7 @@ export function isLegacyDisappearingModeEnabled(
export function changeToDisappearingMessageType(
convo: ConversationModel,
expireTimer: number,
expirationType?: DisappearingMessageConversationType
expirationType?: DisappearingMessageConversationModeType
): DisappearingMessageType {
if (expirationType === 'off' || expirationType === 'legacy') {
// NOTE we would want this to be undefined but because of an issue with the protobuf implement we need to have a value
@ -356,7 +356,7 @@ export function changeToDisappearingMessageConversationType(
convo: ConversationModel,
expirationType?: DisappearingMessageType,
expireTimer?: number
): DisappearingMessageConversationType {
): DisappearingMessageConversationModeType {
if (!expirationType || expirationType === 'unknown') {
return expireTimer && expireTimer > 0 ? 'legacy' : 'off';
}
@ -387,7 +387,7 @@ function couldBeLegacyDisappearingMessageContent(contentMessage: SignalService.C
function checkDisappearButIsntMessage(
content: SignalService.Content,
convo: ConversationModel,
expirationMode: DisappearingMessageConversationType,
expirationMode: DisappearingMessageConversationModeType,
expirationTimer: number
): boolean {
return (

Write Preview
Loading…
Cancel
Save