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

Standardize on showConversation function, delete unused functions

Browse source
This commit is contained in:
Scott Nonnenberg 2022-12-14 11:05:32 -08:00 • committed by GitHub
parent 1dc3ed914f
commit f2f1c3c021
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 174 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ts/background.ts
View file

@ -158,6 +158,8 @@ import type AccountManager from './textsecure/AccountManager';
import { onStoryRecipientUpdate } from './util/onStoryRecipientUpdate';
import { StoryViewModeType, StoryViewTargetType } from './types/Stories';
import { downloadOnboardingStory } from './util/downloadOnboardingStory';
import { clearConversationDraftAttachments } from './util/clearConversationDraftAttachments';
import { removeLinkPreview } from './services/LinkPreview';
const MAX_ATTACHMENT_DOWNLOAD_AGE = 3600 * 72 * 1000;
@ -1545,10 +1547,9 @@ export async function startApp(): Promise<void> {
showToast(ToastConversationArchived, {
undo: () => {
conversation.setArchived(false);
window.Whisper.events.trigger(
'showConversation',
conversation.get('id')
);
window.reduxActions.conversations.showConversation({
conversationId: conversation.get('id'),
});
},
});
@ -1702,7 +1703,7 @@ export async function startApp(): Promise<void> {
!shiftKey &&
(key === 'p' || key === 'P')
) {
conversation.trigger('remove-link-review');
removeLinkPreview();
event.preventDefault();
event.stopPropagation();
@ -1716,7 +1717,10 @@ export async function startApp(): Promise<void> {
shiftKey &&
(key === 'p' || key === 'P')
) {
conversation.trigger('remove-all-draft-attachments');
clearConversationDraftAttachments(
conversation.id,
conversation.get('draftAttachments')
);
event.preventDefault();
event.stopPropagation();
@ -1924,7 +1928,10 @@ export async function startApp(): Promise<void> {
viewTarget: StoryViewTargetType.Replies,
});
} else {
window.Whisper.events.trigger('showConversation', id, messageId);
window.reduxActions.conversations.showConversation({
conversationId: id,
messageId,
});
}
} else {
window.reduxActions.app.openInbox();