Page MenuHomePhabricator
Differential D10596

[lib] Fix typo in policy-acknowledge-utlis.js filename
ClosedPublic
Actions

Authored by ashoat on Jan 10 2024, 10:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 26, 2:47 AM
Unknown Object (File)
Wed, Mar 26, 2:47 AM
Unknown Object (File)
Wed, Mar 26, 2:47 AM
Unknown Object (File)
Sun, Mar 23, 9:29 PM
Unknown Object (File)
Feb 20 2025, 2:54 PM
Unknown Object (File)
Feb 20 2025, 2:54 PM
Unknown Object (File)
Jan 29 2025, 3:54 PM
Unknown Object (File)
Jan 25 2025, 9:53 PM
View All 72 Files
Subscribers
tomek

Details

Reviewers
kamil
Commits
rCOMM1ef4ba7148f7: [lib] Fix typo in policy-acknowledge-utlis.js filename
Summary

Noticed this while working on D10583. Putting this in my stack to avoid having to deal with merge conflicts while landing.

Depends on D10583

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Branch
ashoat/ident
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

ashoat created this revision.Jan 10 2024, 10:33 AM
Herald added a subscriber: tomek. · View Herald TranscriptJan 10 2024, 10:33 AM
ashoat added a child revision: D10597: [lib] Move keyserver session recovery utils to recovery-utils.js.Jan 10 2024, 10:38 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Jan 10 2024, 10:40 AM
Harbormaster failed remote builds in B25678: Diff 35502!
ashoat requested review of this revision.Jan 10 2024, 10:49 AM
ashoat edited parent revisions, added: D10593: [lib][native][web] Move DispatchActionPromise to a separate file; removed: D10583: [lib][native][web] Move some types and basic functions out of action-utils.js.Jan 10 2024, 12:22 PM
Harbormaster completed remote builds in B25678: Diff 35502.Jan 10 2024, 12:25 PM
kamil accepted this revision.Jan 12 2024, 4:17 AM

Thanks for fixing this

This revision is now accepted and ready to land.Jan 12 2024, 4:17 AM
Closed by commit rCOMM1ef4ba7148f7: [lib] Fix typo in policy-acknowledge-utlis.js filename (authored by ashoat). · Explain WhyJan 12 2024, 6:34 AM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM1ef4ba7148f7: [lib] Fix typo in policy-acknowledge-utlis.js filename.

Revision Contents
Changeset List

PathSize
lib/
utils/
policy-acknowledge-utils.js
policy-acknowledge-utlis.js
32 lines
native/
account/
2 lines
web/
modals/
2 lines

Diff 35502

View Options

lib/utils/policy-acknowledge-utils.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines
View Options

lib/utils/policy-acknowledge-utlis.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines
View Options

native/account/terms-and-privacy-modal.react.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines
View Options

web/modals/terms-and-privacy-modal.react.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines