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

Responding to pull request review feedback

Browse source 
- messages.getQuoteObjectUrl: early return
- backup.js: explaining variables for long if statement
- types/messages.js: Log if thumbnail has neither data nor path
- sendmessage.js:
  - remove extraneous logging
  - fix indentation
  - upload attachments and thumbnails in parallel
- preload: don't load fs for tests, just fse
- _conversation.scss: split two selectors into two lines, 0px -> 0
- backup_test.js: use fse.existsSync and comment twoSlashes regex
- network_tests_view_test.js: Comment duplicate assignment to window.getSocketStatus
This commit is contained in:
Scott Nonnenberg 2018-04-23 15:36:47 -07:00
parent 6ec6bf08c8
commit c02860af5c
No known key found for this signature in database
GPG key ID: 5F82280C35134661
8 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/modules/backup.js
View file

@ -1030,8 +1030,11 @@ async function importConversation(db, dir, options) {
return false;
}
if ((message.attachments && message.attachments.length) ||
(message.quote && message.quote.attachments && message.quote.attachments.length)) {
const hasAttachments = message.attachments && message.attachments.length;
const hasQuotedAttachments = message.quote && message.quote.attachments &&
message.quote.attachments.length > 0;
if (hasAttachments || hasQuotedAttachments) {
const importMessage = async () => {
const getName = attachmentsDir
? _getAnonymousAttachmentFileName