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

feat: removed MessageDetails and added MessageInfo

Browse Source 
added other components
pull/3017/head
William Grant 2 years ago
parent 3bf3bf73b1
commit c9a8ea2b81
15 changed files with 384 additions and 296 deletions
Show Stats Download Patch File Download Diff File

10
_locales/en/messages.json
Unescape Escape View File

@ -527,5 +527,13 @@
"reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
"setDisplayPicture": "Set Display Picture",
"settingAppliesToEveryone": "This setting applies to everyone in this conversation.",
"onlyGroupAdminsCanChange": "Only group admins can change this setting."
"onlyGroupAdminsCanChange": "Only group admins can change this setting.",
"messageInfo": "Message Info",
"fileId": "File ID",
"fileSize": "File Size",
"fileType": "File Type",
"resolution": "Resolution",
"duration": "Duration",
"notApplicable": "N/A",
"unknownError": "Unknown Error"
}

6
stylesheets/_conversation.scss
Unescape Escape View File

@ -1,6 +0,0 @@
.message-detail-wrapper {
height: calc(100% - 48px);
width: 100%;
overflow-y: auto;
z-index: 2;
}

1
stylesheets/manifest.scss
Unescape Escape View File

@ -20,7 +20,6 @@
// Build the main view
@import 'index';
@import 'conversation';
// /////////////////// //
// ///// Session ///// //

5
ts/components/conversation/SessionConversation.tsx
Unescape Escape View File

@ -52,7 +52,6 @@ import { InConversationCallContainer } from '../calling/InConversationCallContai
import { LightboxGallery, MediaItemType } from '../lightbox/LightboxGallery';
import { NoMessageInConversation } from './SubtleNotification';
import { ConversationHeaderWithDetails } from './header/ConversationHeader';
import { MessageDetail } from './message/message-item/MessageDetail';
import { isAudio } from '../../types/MIME';
import { HTMLDirection } from '../../util/i18n';
@ -241,7 +240,6 @@ export class SessionConversation extends React.Component<Props, State> {
ourDisplayNameInProfile,
selectedConversation,
messagesProps,
showMessageDetails,
selectedMessages,
isRightPanelShowing,
lightBoxOptions,
@ -287,9 +285,6 @@ export class SessionConversation extends React.Component<Props, State> {
onKeyDown={this.onKeyDown}
role="navigation"
>
<div className={classNames('conversation-info-panel', showMessageDetails && 'show')}>
<MessageDetail />
</div>
{lightBoxOptions?.media && this.renderLightBox(lightBoxOptions)}
<div className="conversation-messages">

157
ts/components/conversation/message/message-item/MessageDetail.tsx
Unescape Escape View File

@ -1,157 +0,0 @@
import classNames from 'classnames';
import moment from 'moment';
import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import useKey from 'react-use/lib/useKey';
import { Message } from './Message';
import { deleteMessagesById } from '../../../../interactions/conversations/unsendingInteractions';
import {
ContactPropsMessageDetail,
closeMessageDetailsView,
} from '../../../../state/ducks/conversations';
import { getMessageDetailsViewProps } from '../../../../state/selectors/conversations';
import { Avatar, AvatarSize } from '../../../avatar/Avatar';
import { ContactName } from '../../ContactName';
import { useMessageIsDeletable } from '../../../../state/selectors';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
const AvatarItem = (props: { pubkey: string }) => {
const { pubkey } = props;
return <Avatar size={AvatarSize.S} pubkey={pubkey} />;
};
const DeleteButtonItem = (props: { messageId: string; convoId: string; isDeletable: boolean }) => {
const { i18n } = window;
return props.isDeletable ? (
<div className="module-message-detail__delete-button-container">
<SessionButton
text={i18n('delete')}
buttonColor={SessionButtonColor.Danger}
buttonType={SessionButtonType.Solid}
onClick={async () => {
await deleteMessagesById([props.messageId], props.convoId);
}}
/>
</div>
) : null;
};
const ContactsItem = (props: { contacts: Array<ContactPropsMessageDetail> }) => {
const { contacts } = props;
if (!contacts || !contacts.length) {
return null;
}
return (
<div className="module-message-detail__contact-container">
{contacts.map(contact => (
<ContactItem key={contact.pubkey} contact={contact} />
))}
</div>
);
};
const ContactItem = (props: { contact: ContactPropsMessageDetail }) => {
const { contact } = props;
const errors = contact.errors || [];
const statusComponent = (
<div
className={classNames(
'module-message-detail__contact__status-icon',
`module-message-detail__contact__status-icon--${contact.status}`
)}
/>
);
return (
<div key={contact.pubkey} className="module-message-detail__contact">
<AvatarItem pubkey={contact.pubkey} />
<div className="module-message-detail__contact__text">
<div className="module-message-detail__contact__name">
<ContactName
pubkey={contact.pubkey}
name={contact.name}
profileName={contact.profileName}
shouldShowPubkey={true}
/>
</div>
{errors.map((error, index) => (
<div key={index} className="module-message-detail__contact__error">
{error.message}
</div>
))}
</div>
{statusComponent}
</div>
);
};
export const MessageDetail = () => {
const { i18n } = window;
const messageDetailProps = useSelector(getMessageDetailsViewProps);
const isDeletable = useMessageIsDeletable(messageDetailProps?.messageId);
const dispatch = useDispatch();
useKey('Escape', () => {
dispatch(closeMessageDetailsView());
});
if (!messageDetailProps) {
return null;
}
const { errors, receivedAt, sentAt, convoId, direction, messageId } = messageDetailProps;
return (
<div className="message-detail-wrapper">
<div className="module-message-detail">
<div className="module-message-detail__message-container">
<Message messageId={messageId} isDetailView={true} />
</div>
<table className="module-message-detail__info">
<tbody>
{(errors || []).map((error, index) => (
<tr key={index}>
<td className="module-message-detail__label">{i18n('error')}</td>
<td>
{' '}
<span className="error-message text-selectable">{error.message}</span>{' '}
</td>
</tr>
))}
<tr>
<td className="module-message-detail__label">{i18n('sent')}</td>
<td>
{moment(sentAt).format('LLLL')} <span>({sentAt})</span>
</td>
</tr>
{receivedAt ? (
<tr>
<td className="module-message-detail__label">{i18n('received')}</td>
<td>
{moment(receivedAt).format('LLLL')} <span>({receivedAt})</span>
</td>
</tr>
) : null}
<tr>
<td className="module-message-detail__label">
{direction === 'incoming' ? i18n('from') : i18n('to')}
</td>
</tr>
</tbody>
</table>
<ContactsItem contacts={messageDetailProps.contacts} />
<DeleteButtonItem convoId={convoId} messageId={messageId} isDeletable={isDeletable} />
</div>
</div>
);
};

216
ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
Unescape Escape View File

@ -19,7 +19,7 @@ import {
} from '../../../../interactions/conversationInteractions';
import { Constants } from '../../../../session';
import { closeRightPanel } from '../../../../state/ducks/conversations';
import { setRightOverlayMode } from '../../../../state/ducks/section';
import { resetRightOverlayMode, setRightOverlayMode } from '../../../../state/ducks/section';
import {
useSelectedConversationKey,
useSelectedDisplayNameInProfile,
@ -35,11 +35,13 @@ import {
import { AttachmentTypeWithPath } from '../../../../types/Attachment';
import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment';
import { Avatar, AvatarSize } from '../../../avatar/Avatar';
import { Flex } from '../../../basic/Flex';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../../../basic/SessionButton';
import { SpacerLG } from '../../../basic/Text';
import { SpacerMD } from '../../../basic/Text';
import { PanelButtonGroup, PanelIconButton } from '../../../buttons';
import { MediaItemType } from '../../../lightbox/LightboxGallery';
import { MediaGallery } from '../../media-gallery/MediaGallery';
import { Header } from './components';
async function getMediaGalleryProps(
conversationId: string
@ -116,44 +118,62 @@ async function getMediaGalleryProps(
const HeaderItem = () => {
const selectedConvoKey = useSelectedConversationKey();
const displayNameInProfile = useSelectedDisplayNameInProfile();
const dispatch = useDispatch();
const isBlocked = useSelectedIsBlocked();
const isKickedFromGroup = useSelectedIsKickedFromGroup();
const left = useSelectedIsLeft();
const isGroup = useSelectedIsGroup();
const subscriberCount = useSelectedSubscriberCount();
if (!selectedConvoKey) {
return null;
}
const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked && !left;
const showMemberCount = !!(subscriberCount && subscriberCount > 0);
return (
<div className="right-panel-header">
<SessionIconButton
iconType="chevron"
iconSize="medium"
iconRotation={270}
onClick={() => {
dispatch(closeRightPanel());
}}
style={{ position: 'absolute' }}
dataTestId="back-button-conversation-options"
/>
<Avatar size={AvatarSize.XL} pubkey={selectedConvoKey} />
{showInviteContacts && (
<SessionIconButton
iconType="addUser"
iconSize="medium"
onClick={() => {
if (selectedConvoKey) {
showInviteContactByConvoId(selectedConvoKey);
}
}}
dataTestId="add-user-button"
/>
<Header
backButtonDirection="right"
backButtonOnClick={() => {
dispatch(closeRightPanel());
dispatch(resetRightOverlayMode());
}}
hideCloseButton={true}
>
<Flex
container={true}
justifyContent={'center'}
alignItems={'center'}
width={'100%'}
style={{ position: 'relative' }}
>
<Avatar size={AvatarSize.XL} pubkey={selectedConvoKey} />
{showInviteContacts && (
<SessionIconButton
iconType="addUser"
iconSize="medium"
onClick={() => {
if (selectedConvoKey) {
showInviteContactByConvoId(selectedConvoKey);
}
}}
style={{ position: 'absolute', right: '0px', top: '4px' }}
dataTestId="add-user-button"
/>
)}
</Flex>
<StyledName data-testid="right-panel-group-name">{displayNameInProfile}</StyledName>
{showMemberCount && (
<Flex container={true} flexDirection={'column'}>
<div role="button" className="subtle">
{window.i18n('members', [`${subscriberCount}`])}
</div>
<SpacerMD />
</Flex>
)}
</div>
</Header>
);
};
@ -176,26 +196,6 @@ const StyledLeaveButton = styled.div`
}
`;
const StyledGroupSettingsItem = styled.div`
display: flex;
align-items: center;
min-height: 3rem;
font-size: var(--font-size-md);
color: var(--right-panel-item-text-color);
background-color: var(--right-panel-item-background-color);
border-top: 1px solid var(--border-color);
border-bottom: 1px solid var(--border-color);
width: -webkit-fill-available;
padding: 0 var(--margins-md);
transition: var(--default-duration);
cursor: pointer;
&:hover {
background-color: var(--right-panel-item-background-hover-color);
}
`;
const StyledName = styled.h4`
padding-inline: var(--margins-md);
font-size: var(--font-size-md);
@ -208,10 +208,8 @@ export const OverlayRightPanelSettings = () => {
const selectedConvoKey = useSelectedConversationKey();
const dispatch = useDispatch();
const isShowing = useIsRightPanelShowing();
const subscriberCount = useSelectedSubscriberCount();
const isActive = useSelectedIsActive();
const displayNameInProfile = useSelectedDisplayNameInProfile();
const isBlocked = useSelectedIsBlocked();
const isKickedFromGroup = useSelectedIsKickedFromGroup();
const left = useSelectedIsLeft();
@ -265,7 +263,6 @@ export const OverlayRightPanelSettings = () => {
return null;
}
const showMemberCount = !!(subscriberCount && subscriberCount > 0);
const commonNoShow = isKickedFromGroup || left || isBlocked || !isActive;
const hasDisappearingMessages = !isPublic && !commonNoShow;
const leaveGroupString = isPublic
@ -292,65 +289,48 @@ export const OverlayRightPanelSettings = () => {
return (
<>
<HeaderItem />
<StyledName data-testid="right-panel-group-name">{displayNameInProfile}</StyledName>
{showMemberCount && (
<>
<SpacerLG />
<div role="button" className="subtle">
{window.i18n('members', [`${subscriberCount}`])}
</div>
<SpacerLG />
</>
)}
{showUpdateGroupNameButton && (
<StyledGroupSettingsItem
className="right-panel-item"
role="button"
onClick={() => {
void showUpdateGroupNameByConvoId(selectedConvoKey);
}}
>
{isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
</StyledGroupSettingsItem>
)}
{showAddRemoveModeratorsButton && (
<>
<StyledGroupSettingsItem
className="right-panel-item"
role="button"
<PanelButtonGroup style={{ margin: '0 var(--margins-lg)' }}>
{showUpdateGroupNameButton && (
<PanelIconButton
iconType={'group'}
text={isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
onClick={() => {
showAddModeratorsByConvoId(selectedConvoKey);
void showUpdateGroupNameByConvoId(selectedConvoKey);
}}
>
{window.i18n('addModerators')}
</StyledGroupSettingsItem>
<StyledGroupSettingsItem
className="right-panel-item"
role="button"
/>
)}
{showAddRemoveModeratorsButton && (
<>
<PanelIconButton
iconType={'addModerator'}
text={window.i18n('addModerators')}
onClick={() => {
showAddModeratorsByConvoId(selectedConvoKey);
}}
/>
<PanelIconButton
iconType={'deleteModerator'}
text={window.i18n('removeModerators')}
onClick={() => {
showRemoveModeratorsByConvoId(selectedConvoKey);
}}
/>
</>
)}
{showUpdateGroupMembersButton && (
<PanelIconButton
iconType={'groupMembers'}
text={window.i18n('groupMembers')}
onClick={() => {
showRemoveModeratorsByConvoId(selectedConvoKey);
void showUpdateGroupMembersByConvoId(selectedConvoKey);
}}
>
{window.i18n('removeModerators')}
</StyledGroupSettingsItem>
</>
)}
{showUpdateGroupMembersButton && (
<StyledGroupSettingsItem
className="right-panel-item"
role="button"
onClick={() => {
void showUpdateGroupMembersByConvoId(selectedConvoKey);
}}
>
{window.i18n('groupMembers')}
</StyledGroupSettingsItem>
)}
/>
)}
{hasDisappearingMessages && (
/* TODO Move ButtonGroup around all settings items */
<PanelButtonGroup>
{hasDisappearingMessages && (
<PanelIconButton
iconType={'timer50'}
text={window.i18n('disappearingMessages')}
@ -358,21 +338,21 @@ export const OverlayRightPanelSettings = () => {
dispatch(setRightOverlayMode({ type: 'disappearing_messages', params: null }));
}}
/>
</PanelButtonGroup>
)}
<MediaGallery documents={documents} media={media} />
{isGroup && (
<StyledLeaveButton>
<SessionButton
text={leaveGroupString}
buttonColor={SessionButtonColor.Danger}
buttonType={SessionButtonType.Simple}
disabled={isKickedFromGroup || left}
onClick={deleteConvoAction}
/>
</StyledLeaveButton>
)}
)}
<MediaGallery documents={documents} media={media} />
{isGroup && (
<StyledLeaveButton>
<SessionButton
text={leaveGroupString}
buttonColor={SessionButtonColor.Danger}
buttonType={SessionButtonType.Simple}
disabled={isKickedFromGroup || left}
onClick={deleteConvoAction}
/>
</StyledLeaveButton>
)}
</PanelButtonGroup>
</>
);
};

7
ts/components/conversation/right-panel/overlay/components/Containers.tsx
Unescape Escape View File

@ -0,0 +1,7 @@
import styled from 'styled-components';
export const StyledScrollContainer = styled.div`
width: 100%;
height: 100%;
overflow: hidden auto;
`;

89
ts/components/conversation/right-panel/overlay/components/Header.tsx
Unescape Escape View File

@ -0,0 +1,89 @@
import React, { ReactNode } from 'react';
import { useDispatch } from 'react-redux';
import styled from 'styled-components';
import { closeRightPanel } from '../../../../../state/ducks/conversations';
import { resetRightOverlayMode } from '../../../../../state/ducks/section';
import { Flex } from '../../../../basic/Flex';
import { SessionIconButton } from '../../../../icon';
export const HeaderTitle = styled.h2`
font-family: var(--font-default);
font-size: var(--font-size-h2);
text-align: center;
margin-top: 0px;
margin-bottom: 0px;
`;
export const HeaderSubtitle = styled.h3`
font-family: var(--font-default);
font-size: 11px;
font-weight: 400;
text-align: center;
padding-top: 0px;
margin-top: 0;
`;
type HeaderProps = {
hideBackButton?: boolean;
backButtonDirection?: 'left' | 'right';
backButtonOnClick?: () => void;
hideCloseButton?: boolean;
closeButtonOnClick?: () => void;
children?: ReactNode;
};
export const Header = (props: HeaderProps) => {
const {
children,
hideBackButton = false,
backButtonDirection = 'left',
backButtonOnClick,
hideCloseButton = false,
closeButtonOnClick,
} = props;
const dispatch = useDispatch();
return (
<Flex container={true} width={'100%'} padding={'32px var(--margins-lg) var(--margins-md)'}>
{!hideBackButton && (
<SessionIconButton
iconSize={'medium'}
iconType={'chevron'}
iconRotation={backButtonDirection === 'left' ? 90 : 270}
onClick={() => {
if (backButtonOnClick) {
backButtonOnClick();
} else {
dispatch(resetRightOverlayMode());
}
}}
dataTestId="back-button-conversation-options"
/>
)}
<Flex
container={true}
flexDirection={'column'}
justifyContent={'flex-start'}
alignItems={'center'}
width={'100%'}
margin={'-5px auto auto'}
>
{children}
</Flex>
{!hideCloseButton && (
<SessionIconButton
iconSize={'tiny'}
iconType={'exit'}
onClick={() => {
if (closeButtonOnClick) {
closeButtonOnClick();
} else {
dispatch(closeRightPanel());
dispatch(resetRightOverlayMode());
}
}}
/>
)}
</Flex>
);
};

4
ts/components/conversation/right-panel/overlay/components/index.tsx
Unescape Escape View File

@ -0,0 +1,4 @@
import { StyledScrollContainer } from './Containers';
import { Header, HeaderSubtitle, HeaderTitle } from './Header';
export { Header, HeaderSubtitle, HeaderTitle, StyledScrollContainer };

97
ts/components/conversation/right-panel/overlay/message-info/components/MessageInfo.tsx
Unescape Escape View File

@ -0,0 +1,97 @@
import { ipcRenderer } from 'electron';
import { isEmpty } from 'lodash';
import moment from 'moment';
import React from 'react';
import { useSelector } from 'react-redux';
import styled from 'styled-components';
import { MessageFrom } from '.';
import { getMessageDetailsViewProps } from '../../../../../../state/selectors/conversations';
import { Flex } from '../../../../../basic/Flex';
import { SpacerSM } from '../../../../../basic/Text';
export const MessageInfoLabel = styled.label<{ color?: string }>`
font-size: var(--font-size-lg);
font-weight: bold;
${props => props.color && `color: ${props.color};`}
`;
const MessageInfoData = styled.div<{ color?: string }>`
font-size: var(--font-size-md);
user-select: text;
${props => props.color && `color: ${props.color};`}
`;
const LabelWithInfoContainer = styled.div`
margin-bottom: var(--margins-md);
${props => props.onClick && 'cursor: pointer;'}
`;
type LabelWithInfoProps = {
label: string;
info: string;
labelColor?: string;
dataColor?: string;
title?: string;
onClick?: () => void;
};
export const LabelWithInfo = (props: LabelWithInfoProps) => {
return (
<LabelWithInfoContainer title={props.title || undefined} onClick={props.onClick}>
<MessageInfoLabel color={props.labelColor}>{props.label}</MessageInfoLabel>
<MessageInfoData color={props.dataColor}>{props.info}</MessageInfoData>
</LabelWithInfoContainer>
);
};
// Message timestamp format: "06:02 PM Tue, 15/11/2022"
const formatTimestamps = 'hh:mm A ddd, D/M/Y';
const showDebugLog = () => {
ipcRenderer.send('show-debug-log');
};
export const MessageInfo = () => {
const messageDetailProps = useSelector(getMessageDetailsViewProps);
if (!messageDetailProps) {
return null;
}
const { errors, receivedAt, sentAt, direction, sender } = messageDetailProps;
const sentAtStr = `${moment(sentAt).format(formatTimestamps)}`;
const receivedAtStr = `${moment(receivedAt).format(formatTimestamps)}`;
const hasError = !isEmpty(errors);
const errorString = hasError
? errors?.reduce((previous, current, currentIndex) => {
return `${previous}${current.message}${
errors.length > 1 && currentIndex < errors.length - 1 ? ', ' : ''
}`;
}, '')
: null;
return (
<Flex container={true} flexDirection="column">
<LabelWithInfo label={`${window.i18n('sent')}:`} info={sentAtStr} />
{direction === 'incoming' ? (
<LabelWithInfo label={`${window.i18n('received')}:`} info={receivedAtStr} />
) : null}
<SpacerSM />
<MessageFrom sender={sender} />
{hasError && (
<>
<SpacerSM />
<LabelWithInfo
title={window.i18n('shareBugDetails')}
label={`${window.i18n('error')}:`}
info={errorString || window.i18n('unknownError')}
dataColor={'var(--danger-color)'}
onClick={showDebugLog}
/>
</>
)}
</Flex>
);
};

48
ts/components/icon/Icons.tsx
Unescape Escape View File

@ -2,6 +2,7 @@
/* eslint-disable no-multi-str */
export type SessionIconType =
| 'addUser'
| 'addModerator'
| 'arrow'
| 'bell'
| 'brand'
@ -22,6 +23,7 @@ export type SessionIconType =
| 'crown'
| 'communities'
| 'delete'
| 'deleteModerator'
| 'ellipses'
| 'emoji'
| 'error'
@ -31,6 +33,7 @@ export type SessionIconType =
| 'fullscreen'
| 'gear'
| 'group'
| 'groupMembers'
| 'hangup'
| 'image'
| 'info'
@ -52,6 +55,8 @@ export type SessionIconType =
| 'plusThin'
| 'plusFat'
| 'reply'
| 'resend'
| 'saveToDisk'
| 'save'
| 'send'
| 'search'
@ -91,6 +96,12 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
viewBox: '0 0 25 21',
ratio: 1,
},
addModerator: {
path:
'M21.7.7H5.1c-1.2 0-2.2.5-3 1.3C1.3 2.8.9 3.8.9 5v10.5c0 1.1.4 2.2 1.2 3 .8.8 1.8 1.2 2.9 1.2h16.7c1.1 0 2.2-.5 2.9-1.2.8-.8 1.2-1.9 1.2-3V5c0-.6-.1-1.1-.3-1.6-.2-.5-.5-1-.9-1.4-.4-.4-.8-.7-1.4-.9-.4-.3-.9-.4-1.5-.4zm2.1 14.8c0 .6-.2 1.1-.6 1.5-.4.4-.9.6-1.5.6H5.1c-.6 0-1.1-.2-1.5-.6-.4-.4-.6-1-.6-1.5V5c0-.6.2-1.1.6-1.5.4-.4.9-.6 1.5-.6h16.7c.6 0 1.1.2 1.5.6.4.4.6.9.6 1.5-.1 0-.1 10.5-.1 10.5zM17.1 9.2h-2.7V6.5c0-.3-.1-.6-.3-.8-.4-.4-1.1-.4-1.5 0-.2.2-.3.5-.3.8v2.7H9.7c-.3 0-.5.1-.7.3-.4.4-.4 1.1 0 1.5.2.2.5.3.7.3h2.6V14c0 .3.1.6.3.8.2.2.5.3.7.3.3 0 .5-.1.7-.3.2-.2.3-.5.3-.8v-2.7H17c.3 0 .5-.1.7-.3.4-.4.4-1.1 0-1.5-.1-.2-.4-.3-.6-.3z',
viewBox: '0 0 26 20',
ratio: 1.18,
},
arrow: {
path:
'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438',
@ -167,10 +178,16 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
},
delete: {
path:
'M11.17 37.16h83.48a8.4 8.4 0 012 .16 5.93 5.93 0 012.88 1.56 5.43 5.43 0 011.64 3.34 7.65 7.65 0 01-.06 1.44L94 117.31V117.72a7.06 7.06 0 01-.2.9v.06a5.89 5.89 0 01-5.47 4.07H17.32a6.17 6.17 0 01-1.25-.19 6.17 6.17 0 01-1.16-.48 6.18 6.18 0 01-3.08-4.88l-7-73.49a7.69 7.69 0 01-.06-1.66 5.37 5.37 0 011.63-3.29 6 6 0 013-1.58 8.94 8.94 0 011.79-.13zM5.65 8.8h31.47V6a2.44 2.44 0 010-.27 6 6 0 011.76-4A6 6 0 0143.09 0h19.67a6 6 0 015.7 6v2.8h32.39a4.7 4.7 0 014.31 4.43v10.36a2.59 2.59 0 01-2.59 2.59H2.59A2.59 2.59 0 010 23.62V13.53a1.56 1.56 0 010-.31 4.72 4.72 0 013.88-4.34 10.4 10.4 0 011.77-.08zm42.1 52.7a4.77 4.77 0 019.49 0v37a4.77 4.77 0 01-9.49 0v-37zm23.73-.2a4.58 4.58 0 015-4.06 4.47 4.47 0 014.51 4.46l-2 37a4.57 4.57 0 01-5 4.06 4.47 4.47 0 01-4.51-4.46l2-37zM25 61.7a4.46 4.46 0 014.5-4.46 4.58 4.58 0 015 4.06l2 37a4.47 4.47 0 01-4.51 4.46 4.57 4.57 0 01-5-4.06l-2-37z',
viewBox: '0 0 105.16 122.88',
'M8.28716 24.5373H18.7049C20.724 24.5373 21.6111 23.5401 21.9231 21.534L23.5096 5.93218L21.6088 6.01432L20.0303 21.4227C19.8884 22.3331 19.4284 22.6989 18.6145 22.6989H8.38546C7.55548 22.6989 7.1036 22.3331 6.96978 21.4227L5.39126 6.01432L3.49037 5.93218L5.07693 21.534C5.38087 23.5482 6.27599 24.5373 8.28716 24.5373ZM3.60064 6.95776H23.4011C24.7332 6.95776 25.5 6.10588 25.5 4.78464V3.35104C25.5 2.03156 24.7332 1.17969 23.4011 1.17969H3.60064C2.32036 1.17969 1.5 2.03156 1.5 3.35104V4.78464C1.5 6.10588 2.27032 6.95776 3.60064 6.95776ZM3.97815 5.20931C3.52823 5.20931 3.33202 5.00521 3.33202 4.55387V3.58181C3.33202 3.13048 3.52823 2.92638 3.97815 2.92638H23.0299C23.4798 2.92638 23.668 3.13048 23.668 3.58181V4.55387C23.668 5.00521 23.4798 5.20931 23.0299 5.20931H3.97815Z',
viewBox: '0 0 26 26',
ratio: 1,
},
deleteModerator: {
path:
'M21.7.7H5.1c-1.2 0-2.2.5-3 1.3C1.3 2.8.9 3.8.9 5v10.5c0 1.1.4 2.2 1.2 3 .8.8 1.8 1.2 2.9 1.2h16.7c1.1 0 2.2-.5 2.9-1.2.8-.8 1.2-1.9 1.2-3V5c0-.6-.1-1.1-.3-1.6-.2-.5-.5-1-.9-1.4-.4-.4-.8-.7-1.4-.9-.4-.3-.9-.4-1.5-.4zm2.1 14.8c0 .6-.2 1.1-.6 1.5-.4.4-.9.6-1.5.6H5.1c-.6 0-1.1-.2-1.5-.6-.4-.4-.6-1-.6-1.5V5c0-.6.2-1.1.6-1.5.4-.4.9-.6 1.5-.6h16.7c.6 0 1.1.2 1.5.6.4.4.6.9.6 1.5-.1 0-.1 10.5-.1 10.5zM14.4 11.3h2.7c.3 0 .5-.1.7-.3.4-.4.4-1.1 0-1.5-.2-.2-.5-.3-.7-.3H9.7c-.3 0-.5.1-.7.3-.4.4-.4 1.1 0 1.5.2.2.5.3.7.3h4.7z',
viewBox: '0 0 26 20',
ratio: 1.18,
},
doubleCheckCircleFilled: {
path:
'M7.91731278,0.313257194 C6.15053376,1.58392424 5,3.65760134 5,6 C5,6.343797 5.0247846,6.68180525 5.07266453,7.01233547 L5,7.085 L3.205,5.295 L2.5,6 L5,8.5 L5.33970233,8.16029767 C5.80439817,9.59399486 6.71914823,10.8250231 7.91731278,11.6867428 C7.31518343,11.8898758 6.67037399,12 6,12 C2.688,12 0,9.312 0,6 C0,2.688 2.688,0 6,0 C6.67037399,0 7.31518343,0.110124239 7.91731278,0.313257194 Z M12,0 C15.312,0 18,2.688 18,6 C18,9.312 15.312,12 12,12 C8.688,12 6,9.312 6,6 C6,2.688 8.688,0 12,0 Z M11,8.5 L15.5,4 L14.795,3.29 L11,7.085 L9.205,5.295 L8.5,6 L11,8.5 Z',
@ -208,6 +225,13 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
ratio: 1,
},
group: {
path:
'M10.39 12.447a6.35 6.35 0 0 0 3.468-1.027 6.128 6.128 0 0 0 2.298-2.736 5.96 5.96 0 0 0 .355-3.521 6.051 6.051 0 0 0-1.71-3.12A6.29 6.29 0 0 0 11.606.375a6.382 6.382 0 0 0-3.607.348 6.211 6.211 0 0 0-2.8 2.246 5.992 5.992 0 0 0-1.05 3.387 6.03 6.03 0 0 0 1.832 4.304 6.327 6.327 0 0 0 4.41 1.786Zm0-10.568c.907 0 1.793.263 2.547.755a4.503 4.503 0 0 1 1.69 2.01 4.38 4.38 0 0 1 .26 2.587 4.447 4.447 0 0 1-1.255 2.292 4.62 4.62 0 0 1-2.348 1.226 4.69 4.69 0 0 1-2.65-.255 4.563 4.563 0 0 1-2.057-1.65 4.403 4.403 0 0 1-.773-2.487 4.429 4.429 0 0 1 1.344-3.165A4.647 4.647 0 0 1 10.39 1.88ZM13.792 13.975H6.83c-.837 0-1.665.16-2.438.474a6.375 6.375 0 0 0-2.066 1.35A6.204 6.204 0 0 0 .948 17.82a6.084 6.084 0 0 0-.48 2.382v1.616a.44.44 0 0 0 .135.318.462.462 0 0 0 .325.131h.741a.465.465 0 0 0 .322-.133.443.443 0 0 0 .133-.316v-1.616a4.54 4.54 0 0 1 1.379-3.249 4.764 4.764 0 0 1 3.327-1.346h6.962c1.248 0 2.445.484 3.327 1.346a4.54 4.54 0 0 1 1.378 3.249v1.426c0 .119.048.232.134.316a.465.465 0 0 0 .322.133h.74a.465.465 0 0 0 .325-.131.443.443 0 0 0 .135-.318v-1.426a6.084 6.084 0 0 0-.48-2.382 6.203 6.203 0 0 0-1.377-2.02 6.375 6.375 0 0 0-2.066-1.351 6.496 6.496 0 0 0-2.438-.474ZM16.713 1.754a.358.358 0 0 0 .26.138 4.628 4.628 0 0 1 3.06 1.398c.801.83 1.247 1.927 1.247 3.067 0 1.14-.446 2.237-1.246 3.067-.8.83-1.895 1.33-3.06 1.398a.35.35 0 0 0-.261.134 8.159 8.159 0 0 1-.77.869.345.345 0 0 0-.088.37.348.348 0 0 0 .12.16c.056.04.123.063.191.068a6.204 6.204 0 0 0 2.6-.323 6.206 6.206 0 0 0 3.31-2.657 5.968 5.968 0 0 0 .773-4.115 6.058 6.058 0 0 0-2.128-3.63A6.328 6.328 0 0 0 16.15.287a.361.361 0 0 0-.19.07.348.348 0 0 0-.13.356c.016.065.05.125.1.171.282.271.544.562.783.87ZM20.112 13.975h-.327a.422.422 0 0 0-.251.055.396.396 0 0 0-.055.656c.243.24.471.496.683.764a.41.41 0 0 0 .306.161 4.742 4.742 0 0 1 3.088 1.466 4.527 4.527 0 0 1 1.241 3.125v1.426c0 .12.049.233.135.318a.465.465 0 0 0 .325.131h.74a.465.465 0 0 0 .323-.133.443.443 0 0 0 .133-.316v-1.426a6.079 6.079 0 0 0-.476-2.378 6.2 6.2 0 0 0-1.373-2.019 6.368 6.368 0 0 0-2.06-1.351 6.489 6.489 0 0 0-2.432-.48Z',
viewBox: '0 0 27 23',
ratio: 1.17,
},
// NOTE this is a temporary icon until the closed group rebuild is done
groupMembers: {
path:
'M19.0674 11.1167C22.141 11.1167 24.647 8.6258 24.647 5.55835C24.647 2.4909 22.1466 0 19.0674 0C15.9882 0 13.4878 2.4909 13.4878 5.55835C13.4878 8.6258 15.9882 11.1167 19.0674 11.1167ZM19.0674 2.24461C20.9048 2.24461 22.3994 3.73355 22.3994 5.56395C22.3994 7.39434 20.9048 8.88329 19.0674 8.88329C17.23 8.88329 15.7354 7.39434 15.7354 5.56395C15.7354 3.73355 17.23 2.24461 19.0674 2.24461ZM19.0674 12.9415C14.7015 12.9415 11.0098 15.2757 9.82422 18.4719C9.5489 19.2108 10.0771 20 10.8693 20C11.3582 20 11.7684 19.681 11.9369 19.222C12.7966 16.8934 15.6623 15.1805 19.0674 15.1805C22.4724 15.1805 25.3381 16.899 26.1978 19.222C26.3664 19.6754 26.7766 20 27.2654 20C28.0577 20 28.5858 19.2108 28.3105 18.4719C27.1249 15.2757 23.4333 12.9415 19.0674 12.9415ZM30.5581 10.8928C33.0136 10.8928 35.0139 8.90009 35.0139 6.44836C35.0139 3.99664 33.0136 2.00952 30.5581 2.00952C28.1026 2.00952 26.1023 4.00224 26.1023 6.44836C26.1023 8.89449 28.1026 10.8928 30.5581 10.8928ZM30.5581 3.80073C32.0247 3.80073 33.2215 4.9874 33.2215 6.45396C33.2215 7.92051 32.0303 9.1072 30.5581 9.1072C29.086 9.1072 27.8947 7.91492 27.8947 6.45396C27.8947 4.993 29.086 3.80073 30.5581 3.80073ZM7.45314 10.8928C9.90861 10.8928 11.9089 8.90009 11.9089 6.44836C11.9089 3.99664 9.90861 2.00952 7.45314 2.00952C4.99766 2.00952 2.99731 4.00224 2.99731 6.44836C2.99731 8.89449 4.99766 10.8928 7.45314 10.8928ZM7.45314 3.80073C8.91968 3.80073 10.1165 4.9874 10.1165 6.45396C10.1165 7.92051 8.9253 9.1072 7.45314 9.1072C5.98097 9.1072 4.78976 7.91492 4.78976 6.45396C4.78976 4.993 5.98097 3.80073 7.45314 3.80073ZM37.9415 16.7702C36.9919 14.2177 34.042 12.3481 30.5526 12.3481C28.9681 12.3481 27.4959 12.7344 26.271 13.3949C26.8217 13.7699 27.333 14.1897 27.7881 14.6487C28.6141 14.3241 29.5525 14.1338 30.5526 14.1338C33.2722 14.1338 35.5647 15.5052 36.2502 17.3635C36.3851 17.7274 36.711 17.9849 37.1043 17.9849C37.7392 17.9849 38.1607 17.3523 37.9415 16.7646V16.7702ZM11.8021 13.4397C10.5604 12.7568 9.06572 12.3538 7.44747 12.3538C3.95811 12.3538 1.00817 14.2233 0.0585709 16.7758C-0.160568 17.3691 0.260847 17.9961 0.895787 17.9961C1.28349 17.9961 1.61501 17.7386 1.74987 17.3748C2.43538 15.5164 4.7279 14.145 7.44747 14.145C8.48697 14.145 9.45904 14.3465 10.3075 14.6935C10.757 14.2345 11.2571 13.8203 11.8021 13.4397Z',
viewBox: '0 0 38 20',
@ -251,8 +275,8 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
},
fullscreen: {
path:
'M205.801,122.042c-22.778,0-45.56,0-68.334,0c-6.081,0-11.301,5-11.301,11.14 c0.004,22.774,0.007,45.552,0.007,68.326c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-13.777-0.004-27.55-0.004-41.326 c16.136,16.136,32.277,32.276,48.413,48.409c10.224,10.224,26.035-5.703,15.785-15.953c-16.11-16.11-32.217-32.213-48.323-48.319 c13.717,0,27.437,0,41.154,0C220.128,144.487,220.255,122.042,205.801,122.042zM323.064,261.753c0.004,13.777,0.004,27.546,0.004,41.323 c-16.136-16.136-32.276-32.276-48.413-48.413c-10.224-10.224-26.035,5.699-15.785,15.953c16.11,16.11,32.213,32.213,48.323,48.323 c-13.721,0-27.437,0.004-41.154,0.004c-14.487,0.004-14.614,22.445-0.161,22.445c22.778-0.004,45.56-0.007,68.334-0.007 c6.081-0.004,11.301-5,11.301-11.14c-0.004-22.774-0.007-45.548-0.007-68.323C345.506,247.427,323.064,247.3,323.064,261.753zM265.882,144.494c13.777-0.004,27.546-0.004,41.323-0.004 c-16.136,16.133-32.276,32.273-48.413,48.405c-10.224,10.224,5.699,26.035,15.953,15.785c16.11-16.106,32.213-32.209,48.323-48.316 c0,13.713,0.004,27.43,0.004,41.147c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-22.774-0.007-45.552-0.007-68.326 c0-6.081-5-11.301-11.14-11.301c-22.774,0.004-45.548,0.007-68.323,0.007C251.556,122.053,251.428,144.494,265.882,144.494zM205.801,318.932c-13.777,0.004-27.55,0.004-41.323,0.004 c16.133-16.133,32.273-32.273,48.405-48.405c10.224-10.224-5.699-26.035-15.953-15.785c-16.11,16.106-32.213,32.213-48.319,48.319 c0-13.717,0-27.434,0-41.151c0-14.487-22.445-14.614-22.445-0.161c0,22.774,0,45.552,0,68.326c0,6.081,5,11.301,11.14,11.301 c22.778-0.004,45.552-0.007,68.326-0.007C220.128,341.373,220.255,318.932,205.801,318.932z',
viewBox: '80 80 310 310',
'M1.58658 5.92245C2.01016 5.92245 2.31996 5.6113 2.31996 5.18773V4.70291L2.17962 2.57199L3.76098 4.23964L5.7154 6.20761C5.85248 6.35146 6.03318 6.41781 6.22865 6.41781C6.68419 6.41781 7.01132 6.11115 7.01132 5.65994C7.01132 5.45147 6.93451 5.26698 6.79187 5.12434L4.82948 3.1687L3.16061 1.58856L5.3044 1.72889H5.82145C6.24503 1.72889 6.56173 1.42465 6.56173 0.996737C6.56173 0.566388 6.25059 0.257812 5.82145 0.257812H2.06855C1.29481 0.257812 0.847656 0.704963 0.847656 1.47748V5.18773C0.847656 5.60575 1.163 5.92245 1.58658 5.92245ZM8.9068 13.3075H12.6609C13.4334 13.3075 13.8862 12.8603 13.8862 12.0866V8.37629C13.8862 7.95952 13.5708 7.6428 13.1417 7.6428C12.7237 7.6428 12.4083 7.95397 12.4083 8.37629V8.86235L12.5542 10.992L10.9673 9.32438L9.0184 7.35763C8.88137 7.21378 8.69509 7.14743 8.49962 7.14743C8.04962 7.14743 7.71695 7.4541 7.71695 7.9041C7.71695 8.11257 7.79931 8.29827 7.94195 8.43969L9.89881 10.3953L11.5732 11.9755L9.42945 11.8352H8.9068C8.48448 11.8352 8.16655 12.1394 8.16655 12.5685C8.16655 12.9989 8.48448 13.3075 8.9068 13.3075Z',
viewBox: '0 0 14 14',
ratio: 1,
},
gear: {
@ -388,8 +412,20 @@ export const icons: Record<string, { path: string; viewBox: string; ratio: numbe
},
reply: {
path:
'M4,3 C4.55228475,3 5,3.44771525 5,4 L5,4 L5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 L17.585,14 L14.2928932,10.7071068 C13.9324093,10.3466228 13.9046797,9.77939176 14.2097046,9.38710056 L14.2928932,9.29289322 C14.6834175,8.90236893 15.3165825,8.90236893 15.7071068,9.29289322 L15.7071068,9.29289322 L20.7071068,14.2928932 C20.7355731,14.3213595 20.7623312,14.3515341 20.787214,14.3832499 C20.788658,14.3849951 20.7902348,14.3870172 20.7918027,14.389044 C20.8140715,14.4179625 20.8348358,14.4480862 20.8539326,14.4793398 C20.8613931,14.4913869 20.8685012,14.5036056 20.8753288,14.5159379 C20.8862061,14.5357061 20.8966234,14.5561086 20.9063462,14.5769009 C20.914321,14.5939015 20.9218036,14.6112044 20.9287745,14.628664 C20.9366843,14.6484208 20.9438775,14.6682023 20.9504533,14.6882636 C20.9552713,14.7031487 20.9599023,14.7185367 20.9641549,14.734007 C20.9701664,14.7555635 20.9753602,14.7772539 20.9798348,14.7992059 C20.9832978,14.8166247 20.9863719,14.834051 20.9889822,14.8515331 C20.9962388,14.8996379 21,14.9493797 21,15 L20.9962979,14.9137692 C20.9978436,14.9317345 20.9989053,14.9497336 20.9994829,14.9677454 L21,15 C21,15.0112225 20.9998151,15.0224019 20.9994483,15.0335352 C20.9988772,15.050591 20.997855,15.0679231 20.996384,15.0852242 C20.994564,15.1070574 20.9920941,15.1281144 20.9889807,15.1489612 C20.9863719,15.165949 20.9832978,15.1833753 20.9797599,15.2007258 C20.9753602,15.2227461 20.9701664,15.2444365 20.964279,15.2658396 C20.9599023,15.2814633 20.9552713,15.2968513 20.9502619,15.3121425 C20.9438775,15.3317977 20.9366843,15.3515792 20.928896,15.3710585 C20.9218036,15.3887956 20.914321,15.4060985 20.9063266,15.4232215 C20.8974314,15.4421635 20.8879327,15.4609002 20.8778732,15.4792864 C20.8703855,15.4931447 20.862375,15.5070057 20.8540045,15.5207088 C20.8382813,15.546275 20.8215099,15.5711307 20.8036865,15.5951593 C20.774687,15.6343256 20.7425008,15.6717127 20.7071068,15.7071068 L20.787214,15.6167501 C20.7849289,15.6196628 20.7826279,15.6225624 20.7803112,15.625449 L20.7071068,15.7071068 L15.7071068,20.7071068 C15.3165825,21.0976311 14.6834175,21.0976311 14.2928932,20.7071068 C13.9023689,20.3165825 13.9023689,19.6834175 14.2928932,19.2928932 L14.2928932,19.2928932 L17.585,16 L8,16 C5.3112453,16 3.11818189,13.8776933 3.00461951,11.2168896 L3,11 L3,4 C3,3.44771525 3.44771525,3 4,3',
viewBox: '-0.5 0.3 23 22',
'M10.3866 3.67969V8.08093C19.9715 8.81448 23.0606 17.026 23.407 21.0401C19.2992 14.9762 13.0151 14.5198 10.3866 15.0496V19.5731L2.50098 11.8098L10.3866 3.67969Z',
viewBox: '0 0 26 26',
ratio: 1,
},
resend: {
path:
'M13.4676 20.291C15.6689 20.291 17.7946 19.5483 19.3069 18.3295C20.2204 17.6274 20.4142 16.6462 19.8212 15.9426C19.2067 15.2292 18.3395 15.2238 17.5257 15.7939C16.2964 16.745 15.0736 17.2348 13.4676 17.2348C10.1089 17.2348 7.3268 14.9998 6.532 12.0107H8.26073C9.13784 12.0107 9.37752 11.1344 8.86794 10.4512L5.96015 6.43365C5.44875 5.74004 4.58148 5.69501 4.05514 6.43365L1.18378 10.4512C0.674203 11.1496 0.898943 12.0107 1.77604 12.0107H3.55576C4.43505 16.8892 8.43121 20.291 13.4676 20.291ZM13.4378 0.291016C11.2549 0.291016 9.11089 1.01868 7.61675 2.23754C6.69994 2.93957 6.50944 3.92089 7.10243 4.62439C7.71691 5.33776 8.58419 5.33996 9.37969 4.77298C10.6122 3.83705 11.835 3.33231 13.4378 3.33231C16.7998 3.33231 19.5786 5.56727 20.3917 8.55621H18.5701C17.678 8.55621 17.45 9.43248 17.9478 10.1159L20.8707 14.1334C21.382 14.8269 22.2493 14.8721 22.7755 14.1334L25.6469 10.1159C26.1565 9.43248 25.9318 8.55621 25.0397 8.55621H23.3496C22.4854 3.67456 18.4924 0.291016 13.4378 0.291016Z',
viewBox: '0 0 26 21',
ratio: 1,
},
saveToDisk: {
path:
'M11.134 21.796c5.846 0 10.673-4.834 10.673-10.671 0-5.846-4.835-10.67-10.681-10.67C5.29.454.464 5.278.464 11.124c0 5.837 4.835 10.67 10.67 10.67Zm0-2.102a8.533 8.533 0 0 1-8.56-8.57 8.526 8.526 0 0 1 8.552-8.568 8.549 8.549 0 0 1 8.579 8.569 8.542 8.542 0 0 1-8.57 8.569ZM11.117 14.28a.838.838 0 0 0 .578-.255l3.422-3.426a.768.768 0 0 0 .243-.575c0-.43-.305-.767-.73-.767a.805.805 0 0 0-.576.24l-.643.657-1.633 1.85.117-1.763V5.936a.754.754 0 0 0-.777-.782c-.466 0-.778.326-.778.782v4.305l.117 1.772-1.659-1.867-.6-.65a.716.716 0 0 0-.563-.24c-.436 0-.742.322-.742.768 0 .184.09.416.237.567l3.41 3.434a.807.807 0 0 0 .578.256Zm-3.764 2.254h7.557c.44 0 .758-.327.758-.775A.737.737 0 0 0 14.91 15H7.353a.744.744 0 0 0-.767.758c0 .448.326.775.767.775Z',
viewBox: '0 0 22 22',
ratio: 1,
},
save: {

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

@ -536,7 +536,7 @@ export async function replyToMessage(messageId: string) {
const quotedMessageModel = await Data.getMessageById(messageId);
if (!quotedMessageModel) {
window.log.warn('Failed to find message to reply to');
return;
return false;
}
const conversationModel = getConversationController().getOrThrow(
quotedMessageModel.get('conversationId')
@ -549,6 +549,20 @@ export async function replyToMessage(messageId: string) {
} else {
window.inboxStore?.dispatch(quoteMessage(undefined));
}
return true;
}
export async function resendMessage(messageId: string) {
const foundMessageModel = await Data.getMessageById(messageId);
if (!foundMessageModel) {
window.log.warn('Failed to find message to resend');
return false;
}
await foundMessageModel.retrySend();
return true;
}
/**

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

@ -58,10 +58,14 @@ export type MessagePropsDetails = {
sentAt: number;
receivedAt: number;
errors: Array<Error>;
sender: string;
contacts: Array<ContactPropsMessageDetail>;
convoId: string;
messageId: string;
direction: MessageModelType;
attachments: Array<PropsForAttachment>;
timestamp?: number;
serverTimestamp?: number;
};
export type LastMessageStatusType = 'sending' | 'sent' | 'read' | 'error' | undefined;
@ -148,6 +152,7 @@ export type PropsForAttachment = {
size: number;
width?: number;
height?: number;
duration?: string;
url: string;
path: string;
fileSize: string | null;

11
ts/state/selectors/messages.ts
Unescape Escape View File

@ -4,6 +4,7 @@ import {
LastMessageStatusType,
MessageModelPropsWithConvoProps,
PropsForAttachment,
PropsForQuote,
ReduxConversationType,
} from '../ducks/conversations';
import { StateType } from '../reducer';
@ -110,7 +111,7 @@ export function useMessageSender(messageId: string) {
return useMessagePropsByMessageId(messageId)?.propsForMessage.sender;
}
export function useMessageIsDeletableForEveryone(messageId: string) {
export function useMessageIsDeletableForEveryone(messageId: string | undefined) {
return useMessagePropsByMessageId(messageId)?.propsForMessage.isDeletableForEveryone;
}
@ -125,3 +126,11 @@ export function useMessageTimestamp(messageId: string) {
export function useMessageBody(messageId: string) {
return useMessagePropsByMessageId(messageId)?.propsForMessage.text;
}
export const useMessageQuote = (messageId: string | undefined): PropsForQuote | undefined => {
return useMessagePropsByMessageId(messageId)?.propsForMessage.quote;
};
export const useMessageText = (messageId: string | undefined): string | undefined => {
return useMessagePropsByMessageId(messageId)?.propsForMessage.text;
};

8
ts/types/LocalizerKeys.ts
Unescape Escape View File

@ -162,6 +162,7 @@ export type LocalizerKeys =
| 'documentsEmptyState'
| 'done'
| 'downloadAttachment'
| 'duration'
| 'editGroup'
| 'editGroupName'
| 'editMenuCopy'
@ -192,7 +193,10 @@ export type LocalizerKeys =
| 'failedToAddAsModerator'
| 'failedToRemoveFromModerator'
| 'faq'
| 'fileId'
| 'fileSize'
| 'fileSizeWarning'
| 'fileType'
| 'from'
| 'getStarted'
| 'goToReleaseNotes'
@ -263,6 +267,7 @@ export type LocalizerKeys =
| 'messageBodyMissing'
| 'messageDeletedPlaceholder'
| 'messageDeletionForbidden'
| 'messageInfo'
| 'messageRequestAccepted'
| 'messageRequestAcceptedOurs'
| 'messageRequestAcceptedOursNoName'
@ -297,6 +302,7 @@ export type LocalizerKeys =
| 'noModeratorsToRemove'
| 'noNameOrMessage'
| 'noSearchResults'
| 'notApplicable'
| 'noteToSelf'
| 'notificationForConvo'
| 'notificationForConvo_all'
@ -389,6 +395,7 @@ export type LocalizerKeys =
| 'requestsPlaceholder'
| 'requestsSubtitle'
| 'resend'
| 'resolution'
| 'respondingToRequestWarning'
| 'restoreUsingRecoveryPhrase'
| 'ringing'
@ -495,6 +502,7 @@ export type LocalizerKeys =
| 'unblocked'
| 'unknown'
| 'unknownCountry'
| 'unknownError'
| 'unpinConversation'
| 'unreadMessages'
| 'updateGroupDialogTitle'

Write Preview
Loading…
Cancel
Save