Page MenuHomePhabricator
Differential D13024

[lib] allow to overwrite content session
ClosedPublic
Actions

Authored by kamil on Aug 8 2024, 3:12 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 7, 12:01 PM
Unknown Object (File)
Fri, Mar 7, 12:36 AM
Unknown Object (File)
Tue, Mar 4, 4:13 PM
Unknown Object (File)
Thu, Feb 27, 9:28 PM
Unknown Object (File)
Feb 18 2025, 3:50 AM
Unknown Object (File)
Jan 26 2025, 11:16 AM
Unknown Object (File)
Jan 15 2025, 9:51 AM
Unknown Object (File)
Jan 2 2025, 6:26 AM
View All 69 Files
Subscribers
ashoat

Details

Reviewers
marcin
tomek
Commits
rCOMM1f4ac2c550d8: [lib] allow to overwrite content session
Summary

ENG-6982.

When discovering session is malformed we want to create a new one (and resend messages, implemented later in the stack).

initializeContentOutboundSession implementation allow to override session by default.

Test Plan

Being able to create new session even if one already exists

Diff Detail

Repository
rCOMM Comm
Branch
resending-2
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
components/
13 lines
utils/
19 lines

Diff 43252

View Options

lib/components/peer-olm-session-creator-provider.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _debounce from 'lodash/debounce.js'; import _debounce from 'lodash/debounce.js';
import * as React from 'react'; import * as React from 'react';
import { useModalContext } from 'lib/components/modal-provider.react.js'; import { useModalContext } from 'lib/components/modal-provider.react.js';
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js'; import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import { createMessageReply } from 'lib/shared/message-utils.js'; import { createMessageReply } from 'lib/shared/message-utils.js';
import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js'; import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js';
import { import {
threadHasPermission, threadHasPermission,
useSidebarExistsOrCanBeCreated, useSidebarExistsOrCanBeCreated,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { isComposableMessageType } from 'lib/types/message-types.js'; import { isComposableMessageType } from 'lib/types/message-types.js';
▲ Show 20 Lines • Show All 202 Lines • ▼ Show 20 Lines return React.useMemo(() => {
return { return {
actionButtonContent: buttonContent, actionButtonContent: buttonContent,
onClick: onClickTogglePin, onClick: onClickTogglePin,
label: isPinned ? 'Unpin' : 'Pin', label: isPinned ? 'Unpin' : 'Pin',
}; };
}, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]); }, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]);
} }
function useMessageEditAction(
item: ChatMessageInfoItem,
threadInfo: ThreadInfo,
): ?MessageTooltipAction {
const { messageInfo } = item;
const canEditMessage = useCanEditMessage(threadInfo, messageInfo);
return React.useMemo(() => {
if (!canEditMessage) {
return null;
}
const buttonContent = (
<SWMansionIcon icon="edit-1" size={18} disableFill={false} />
);
const onClickEdit = () => {
// TODO: Enter edit mode
};
return {
actionButtonContent: buttonContent,
onClick: onClickEdit,
label: 'Edit',
};
}, [canEditMessage]);
}
function useMessageTooltipActions( function useMessageTooltipActions(
item: ChatMessageInfoItem, item: ChatMessageInfoItem,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
): $ReadOnlyArray<MessageTooltipAction> { ): $ReadOnlyArray<MessageTooltipAction> {
const sidebarAction = useMessageTooltipSidebarAction(item, threadInfo); const sidebarAction = useMessageTooltipSidebarAction(item, threadInfo);
const replyAction = useMessageTooltipReplyAction(item, threadInfo); const replyAction = useMessageTooltipReplyAction(item, threadInfo);
const copyAction = useMessageCopyAction(item); const copyAction = useMessageCopyAction(item);
const reactAction = useMessageReactAction(item, threadInfo); const reactAction = useMessageReactAction(item, threadInfo);
const togglePinAction = useMessageTogglePinAction(item, threadInfo); const togglePinAction = useMessageTogglePinAction(item, threadInfo);
const editAction = useMessageEditAction(item, threadInfo);
return React.useMemo( return React.useMemo(
() => () =>
[ [
replyAction, replyAction,
sidebarAction, sidebarAction,
copyAction, copyAction,
reactAction, reactAction,
togglePinAction, togglePinAction,
editAction,
].filter(Boolean), ].filter(Boolean),
[replyAction, sidebarAction, copyAction, reactAction, togglePinAction], [
replyAction,
sidebarAction,
copyAction,
reactAction,
togglePinAction,
editAction,
],
); );
} }
type UseMessageTooltipArgs = { type UseMessageTooltipArgs = {
+availablePositions: $ReadOnlyArray<TooltipPosition>, +availablePositions: $ReadOnlyArray<TooltipPosition>,
+item: ChatMessageInfoItem, +item: ChatMessageInfoItem,
+threadInfo: ThreadInfo, +threadInfo: ThreadInfo,
}; };
▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines
View Options

lib/utils/crypto-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _debounce from 'lodash/debounce.js'; import _debounce from 'lodash/debounce.js';
import * as React from 'react'; import * as React from 'react';
import { useModalContext } from 'lib/components/modal-provider.react.js'; import { useModalContext } from 'lib/components/modal-provider.react.js';
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js'; import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
import { createMessageReply } from 'lib/shared/message-utils.js'; import { createMessageReply } from 'lib/shared/message-utils.js';
import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js'; import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js';
import { import {
threadHasPermission, threadHasPermission,
useSidebarExistsOrCanBeCreated, useSidebarExistsOrCanBeCreated,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { messageTypes } from 'lib/types/message-types-enum.js'; import { messageTypes } from 'lib/types/message-types-enum.js';
import { isComposableMessageType } from 'lib/types/message-types.js'; import { isComposableMessageType } from 'lib/types/message-types.js';
▲ Show 20 Lines • Show All 202 Lines • ▼ Show 20 Lines return React.useMemo(() => {
return { return {
actionButtonContent: buttonContent, actionButtonContent: buttonContent,
onClick: onClickTogglePin, onClick: onClickTogglePin,
label: isPinned ? 'Unpin' : 'Pin', label: isPinned ? 'Unpin' : 'Pin',
}; };
}, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]); }, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]);
} }
function useMessageEditAction(
item: ChatMessageInfoItem,
threadInfo: ThreadInfo,
): ?MessageTooltipAction {
const { messageInfo } = item;
const canEditMessage = useCanEditMessage(threadInfo, messageInfo);
return React.useMemo(() => {
if (!canEditMessage) {
return null;
}
const buttonContent = (
<SWMansionIcon icon="edit-1" size={18} disableFill={false} />
);
const onClickEdit = () => {
// TODO: Enter edit mode
};
return {
actionButtonContent: buttonContent,
onClick: onClickEdit,
label: 'Edit',
};
}, [canEditMessage]);
}
function useMessageTooltipActions( function useMessageTooltipActions(
item: ChatMessageInfoItem, item: ChatMessageInfoItem,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
): $ReadOnlyArray<MessageTooltipAction> { ): $ReadOnlyArray<MessageTooltipAction> {
const sidebarAction = useMessageTooltipSidebarAction(item, threadInfo); const sidebarAction = useMessageTooltipSidebarAction(item, threadInfo);
const replyAction = useMessageTooltipReplyAction(item, threadInfo); const replyAction = useMessageTooltipReplyAction(item, threadInfo);
const copyAction = useMessageCopyAction(item); const copyAction = useMessageCopyAction(item);
const reactAction = useMessageReactAction(item, threadInfo); const reactAction = useMessageReactAction(item, threadInfo);
const togglePinAction = useMessageTogglePinAction(item, threadInfo); const togglePinAction = useMessageTogglePinAction(item, threadInfo);
const editAction = useMessageEditAction(item, threadInfo);
return React.useMemo( return React.useMemo(
() => () =>
[ [
replyAction, replyAction,
sidebarAction, sidebarAction,
copyAction, copyAction,
reactAction, reactAction,
togglePinAction, togglePinAction,
editAction,
].filter(Boolean), ].filter(Boolean),
[replyAction, sidebarAction, copyAction, reactAction, togglePinAction], [
replyAction,
sidebarAction,
copyAction,
reactAction,
togglePinAction,
editAction,
],
); );
} }
type UseMessageTooltipArgs = { type UseMessageTooltipArgs = {
+availablePositions: $ReadOnlyArray<TooltipPosition>, +availablePositions: $ReadOnlyArray<TooltipPosition>,
+item: ChatMessageInfoItem, +item: ChatMessageInfoItem,
+threadInfo: ThreadInfo, +threadInfo: ThreadInfo,
}; };
▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines