mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Allow link previews to be added to an edit if original msg had no links

Browse source
This commit is contained in:
Josh Perez 2023-08-07 12:36:59 -04:00 committed by GitHub
parent d8ea785f4e
commit 1315d3cfe0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ts/state/ducks/composer.ts
View file

@ -20,13 +20,17 @@ import type { BoundActionCreatorsMapObject } from '../../hooks/useBoundActions';
import type { DraftBodyRanges } from '../../types/BodyRange';
import { BodyRange } from '../../types/BodyRange';
import type { LinkPreviewType } from '../../types/message/LinkPreviews';
import type { MessageAttributesType } from '../../model-types.d';
import type {
DraftEditMessageType,
MessageAttributesType,
} from '../../model-types.d';
import type { NoopActionType } from './noop';
import type { ShowToastActionType } from './toast';
import type { StateType as RootStateType } from '../reducer';
import type { UUIDStringType } from '../../types/UUID';
import * as log from '../../logging/log';
import * as Errors from '../../types/errors';
import * as LinkPreview from '../../types/LinkPreview';
import {
ADD_PREVIEW as ADD_LINK_PREVIEW,
REMOVE_PREVIEW as REMOVE_LINK_PREVIEW,
@ -252,6 +256,24 @@ export const actions = {
setQuotedMessage,
};
function hadSameLinkPreviewDismissed(
messageText: string,
draftEditMessage: DraftEditMessageType | undefined
): boolean {
if (!draftEditMessage) {
return false;
}
const currentLink = LinkPreview.findLinks(messageText).find(
LinkPreview.shouldPreviewHref
);
const prevLink = LinkPreview.findLinks(draftEditMessage.body).find(
LinkPreview.shouldPreviewHref
);
return currentLink === prevLink && !draftEditMessage.preview;
}
function incrementSendCounter(conversationId: string): IncrementSendActionType {
return {
type: INCREMENT_SEND_COUNTER,
@ -994,9 +1016,10 @@ function onEditorStateChange({
includePending: true,
}) ||
Boolean(conversation.attributes.draftEditMessage?.attachmentThumbnail) ||
// If we already didn't have a preview attached, don't fetch another one
(conversation.attributes.draftEditMessage &&
!conversation.attributes.draftEditMessage.preview)
hadSameLinkPreviewDismissed(
messageText,
conversation.attributes.draftEditMessage
)
) {
return;
}