From 8a19b50c0f3663d7a0fbade9629512072846085e Mon Sep 17 00:00:00 2001 From: audric Date: Tue, 17 Aug 2021 16:03:57 +1000 Subject: [PATCH] fix attachment not being uploaded since electron upgrade --- ...hmentList.tsx => StagedAttachmentList.tsx} | 0 ts/components/dialog/InviteContactsDialog.tsx | 8 +- .../conversation/SessionCompositionBox.tsx | 63 +++++++------ .../conversation/SessionConversation.tsx | 94 +++++++++---------- .../conversation/SessionStagedLinkPreview.tsx | 2 +- ts/data/data.ts | 4 + ts/models/conversation.ts | 39 ++++---- ts/util/attachmentsUtil.ts | 2 +- ts/window.d.ts | 2 +- 9 files changed, 115 insertions(+), 99 deletions(-) rename ts/components/conversation/{AttachmentList.tsx => StagedAttachmentList.tsx} (100%) diff --git a/ts/components/conversation/AttachmentList.tsx b/ts/components/conversation/StagedAttachmentList.tsx similarity index 100% rename from ts/components/conversation/AttachmentList.tsx rename to ts/components/conversation/StagedAttachmentList.tsx diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 670d146dc..fb8e87925 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -121,7 +121,13 @@ const InviteContactsDialogInner = (props: Props) => { ); if (privateConvo) { - void privateConvo.sendMessage('', null, null, null, groupInvitation); + void privateConvo.sendMessage({ + body: '', + attachments: undefined, + groupInvitation, + preview: undefined, + quote: undefined, + }); } }); } diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx index 8c3004592..36224b1d2 100644 --- a/ts/components/session/conversation/SessionCompositionBox.tsx +++ b/ts/components/session/conversation/SessionCompositionBox.tsx @@ -1,20 +1,18 @@ import React from 'react'; import _, { debounce } from 'lodash'; -import { Attachment, AttachmentType } from '../../../types/Attachment'; +import { AttachmentType } from '../../../types/Attachment'; import * as MIME from '../../../types/MIME'; import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon'; import { SessionEmojiPanel } from './SessionEmojiPanel'; import { SessionRecording } from './SessionRecording'; -import { SignalService } from '../../../protobuf'; - import { Constants } from '../../../session'; import { toArray } from 'react-emoji-render'; import { Flex } from '../../basic/Flex'; -import { StagedAttachmentList } from '../../conversation/AttachmentList'; +import { StagedAttachmentList } from '../../conversation/StagedAttachmentList'; import { ToastUtils } from '../../../session/utils'; import { AttachmentUtil } from '../../../util'; import { @@ -79,8 +77,16 @@ export interface StagedAttachmentType extends AttachmentType { file: File; } +export type SendMessageType = { + body: string; + attachments: Array | undefined; + quote: any | undefined; + preview: any | undefined; + groupInvitation: { url: string | undefined; name: string } | undefined; +}; + interface Props { - sendMessage: any; + sendMessage: (msg: SendMessageType) => void; draft: string; onLoadVoiceNoteView: any; @@ -872,14 +878,13 @@ class SessionCompositionBoxInner extends React.Component { try { const attachments = await this.getFiles(); - await this.props.sendMessage( - messagePlaintext, - attachments, - extractedQuotedMessageProps, - linkPreviews, - null, - {} - ); + this.props.sendMessage({ + body: messagePlaintext, + attachments: attachments || [], + quote: extractedQuotedMessageProps, + preview: linkPreviews, + groupInvitation: undefined, + }); this.props.clearAttachments(); @@ -921,27 +926,27 @@ class SessionCompositionBoxInner extends React.Component { return; } - const fileBuffer = await new Response(audioBlob).arrayBuffer(); + const file = new File([audioBlob], 'audio-blob'); - const audioAttachment: Attachment = { - data: fileBuffer, - flags: SignalService.AttachmentPointer.Flags.VOICE_MESSAGE, + const audioAttachment: StagedAttachmentType = { + file, contentType: MIME.AUDIO_MP3, size: audioBlob.size, + fileSize: null, + screenshot: null, + fileName: 'audio-message', + thumbnail: null, + url: '', + isVoiceMessage: true, }; - const messageSuccess = this.props.sendMessage( - '', - [audioAttachment], - undefined, - undefined, - null, - {} - ); - - if (messageSuccess) { - // success! - } + await this.props.sendMessage({ + body: '', + attachments: [audioAttachment], + preview: undefined, + quote: undefined, + groupInvitation: undefined, + }); this.onExitVoiceNoteView(); } diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index e5e922d88..1d9dc99c3 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -2,7 +2,11 @@ import React from 'react'; import classNames from 'classnames'; -import { SessionCompositionBox, StagedAttachmentType } from './SessionCompositionBox'; +import { + SendMessageType, + SessionCompositionBox, + StagedAttachmentType, +} from './SessionCompositionBox'; import { Constants } from '../../../session'; import _ from 'lodash'; @@ -178,6 +182,47 @@ export class SessionConversation extends React.Component { } } + public sendMessageFn(msg: SendMessageType) { + const { selectedConversationKey } = this.props; + const conversationModel = getConversationController().get(selectedConversationKey); + + if (!conversationModel) { + return; + } + + const sendAndScroll = () => { + void conversationModel.sendMessage(msg); + if (this.messageContainerRef.current) { + (this.messageContainerRef + .current as any).scrollTop = this.messageContainerRef.current?.scrollHeight; + } + }; + + // const recoveryPhrase = window.textsecure.storage.get('mnemonic'); + const recoveryPhrase = UserUtils.getCurrentRecoveryPhrase(); + + // string replace to fix case where pasted text contains invis characters causing false negatives + if (msg.body.replace(/\s/g, '').includes(recoveryPhrase.replace(/\s/g, ''))) { + window.inboxStore?.dispatch( + updateConfirmModal({ + title: window.i18n('sendRecoveryPhraseTitle'), + message: window.i18n('sendRecoveryPhraseMessage'), + okTheme: SessionButtonColor.Danger, + onClickOk: () => { + sendAndScroll(); + }, + onClickClose: () => { + window.inboxStore?.dispatch(updateConfirmModal(null)); + }, + }) + ); + } else { + sendAndScroll(); + } + + window.inboxStore?.dispatch(quoteMessage(undefined)); + } + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~ RENDER METHODS ~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -186,7 +231,6 @@ export class SessionConversation extends React.Component { const { selectedConversation, - selectedConversationKey, messagesProps, showMessageDetails, selectedMessages, @@ -200,50 +244,6 @@ export class SessionConversation extends React.Component { } const selectionMode = selectedMessages.length > 0; - const conversationModel = getConversationController().get(selectedConversationKey); - const sendMessageFn = ( - body: any, - attachments: any, - quote: any, - preview: any, - groupInvitation: any - ) => { - if (!conversationModel) { - return; - } - - const sendAndScroll = () => { - void conversationModel.sendMessage(body, attachments, quote, preview, groupInvitation); - if (this.messageContainerRef.current) { - (this.messageContainerRef - .current as any).scrollTop = this.messageContainerRef.current?.scrollHeight; - } - }; - - // const recoveryPhrase = window.textsecure.storage.get('mnemonic'); - const recoveryPhrase = UserUtils.getCurrentRecoveryPhrase(); - - // string replace to fix case where pasted text contains invis characters causing false negatives - if (body.replace(/\s/g, '').includes(recoveryPhrase.replace(/\s/g, ''))) { - window.inboxStore?.dispatch( - updateConfirmModal({ - title: window.i18n('sendRecoveryPhraseTitle'), - message: window.i18n('sendRecoveryPhraseMessage'), - okTheme: SessionButtonColor.Danger, - onClickOk: () => { - sendAndScroll(); - }, - onClickClose: () => { - window.inboxStore?.dispatch(updateConfirmModal(null)); - }, - }) - ); - } else { - sendAndScroll(); - } - - window.inboxStore?.dispatch(quoteMessage(undefined)); - }; return ( @@ -273,7 +273,7 @@ export class SessionConversation extends React.Component { void; } -export const LINK_PREVIEW_TIMEOUT = 60 * 1000; +export const LINK_PREVIEW_TIMEOUT = 20 * 1000; export interface GetLinkPreviewResultImage { data: ArrayBuffer; diff --git a/ts/data/data.ts b/ts/data/data.ts index 622259d7a..15f6bf306 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -195,6 +195,7 @@ export function init() { // We can't send ArrayBuffers or BigNumbers (what we get from proto library for dates). function _cleanData(data: any): any { const keys = Object.keys(data); + for (let index = 0, max = keys.length; index < max; index += 1) { const key = keys[index]; const value = data[key]; @@ -210,6 +211,9 @@ function _cleanData(data: any): any { } else if (Array.isArray(value)) { // eslint-disable-next-line no-param-reassign data[key] = value.map(_cleanData); + } else if (_.isObject(value) && value instanceof File) { + // eslint-disable-next-line no-param-reassign + data[key] = { name: value.name, path: value.path, size: value.size, type: value.type }; } else if (_.isObject(value)) { // eslint-disable-next-line no-param-reassign data[key] = _cleanData(value); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 976a70a62..66a539101 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -43,7 +43,10 @@ import { OpenGroupRequestCommonType } from '../opengroup/opengroupV2/ApiUtil'; import { getOpenGroupV2FromConversationId } from '../opengroup/utils/OpenGroupUtils'; import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout'; import { perfEnd, perfStart } from '../session/utils/Performance'; -import { ReplyingToMessageProps } from '../components/session/conversation/SessionCompositionBox'; +import { + ReplyingToMessageProps, + SendMessageType, +} from '../components/session/conversation/SessionCompositionBox'; import { ed25519Str } from '../session/onions/onionPath'; export enum ConversationTypeEnum { @@ -702,13 +705,8 @@ export class ConversationModel extends Backbone.Model { return null; } } - public async sendMessage( - body: string, - attachments: any, - quote: any, - preview: any, - groupInvitation: any = null - ) { + public async sendMessage(msg: SendMessageType) { + const { attachments, body, groupInvitation, preview, quote } = msg; this.clearTypingTimers(); const destination = this.id; @@ -745,40 +743,43 @@ export class ConversationModel extends Backbone.Model { if (!this.isPublic()) { messageWithSchema.destination = destination; + // set the serverTimestamp only if this conversation is a public one. + + messageWithSchema.serverTimestamp = new Date().getTime(); } messageWithSchema.source = UserUtils.getOurPubKeyStrFromCache(); messageWithSchema.sourceDevice = 1; - // set the serverTimestamp only if this conversation is a public one. const attributes: MessageAttributesOptionals = { ...messageWithSchema, groupInvitation, conversationId: this.id, destination: isPrivate ? destination : undefined, - serverTimestamp: this.isPublic() ? new Date().getTime() : undefined, }; const messageModel = await this.addSingleMessage(attributes); - this.set({ - lastMessage: messageModel.getNotificationText(), - lastMessageStatus: 'sending', - active_at: now, - }); - await this.commit(); - // We're offline! if (!window.textsecure.messaging) { const error = new Error('Network is not available'); error.name = 'SendMessageNetworkError'; (error as any).number = this.id; await messageModel.saveErrors([error]); - return null; + await this.commit(); + + return; } + + this.set({ + lastMessage: messageModel.getNotificationText(), + lastMessageStatus: 'sending', + active_at: now, + }); + await this.commit(); + this.queueJob(async () => { await this.sendMessageJob(messageModel, expireTimer); }); - return null; } public async bouncyUpdateLastMessage() { diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts index e78470ee2..548a50a1a 100644 --- a/ts/util/attachmentsUtil.ts +++ b/ts/util/attachmentsUtil.ts @@ -90,7 +90,7 @@ export async function autoScale( resolve({ ...attachment, - file: blob, + file: new File([blob], 'blob-file'), }); }; img.src = url; diff --git a/ts/window.d.ts b/ts/window.d.ts index 7807f6e6c..b540c3d1f 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -70,7 +70,7 @@ declare global { profileImages: any; MediaRecorder: any; dataURLToBlobSync: any; - autoOrientImage: any; + autoOrientImage: (fileOrBlobOrURL: string | File | Blob, options: any = {}) => Promise; contextMenuShown: boolean; inboxStore?: Store; openConversationWithMessages: (args: {