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

Skip invalid attachments and make function sync

Browse source
This commit is contained in:
Daniel Gasienica 2018-03-13 21:47:56 -04:00
parent 3dfc823716
commit add4b11df3
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/modules/types/attachment.js
View file

@ -176,7 +176,12 @@ exports._replaceUnicodeOrderOverridesSync = (attachment) => {
exports.replaceUnicodeOrderOverrides = async attachment => exports.replaceUnicodeOrderOverrides = async attachment =>
exports._replaceUnicodeOrderOverridesSync(attachment); exports._replaceUnicodeOrderOverridesSync(attachment);
exports.removeSchemaVersion = async (attachment) => { exports.removeSchemaVersion = (attachment) => {
if (!exports.isValid(attachment)) {
console.log('Attachment.removeSchemaVersion: Invalid input attachment:', attachment);
return attachment;
}
const attachmentWithoutSchemaVersion = Object.assign({}, attachment); const attachmentWithoutSchemaVersion = Object.assign({}, attachment);
delete attachmentWithoutSchemaVersion.schemaVersion; delete attachmentWithoutSchemaVersion.schemaVersion;
return attachmentWithoutSchemaVersion; return attachmentWithoutSchemaVersion;

4
test/modules/types/attachment_test.js
View file

@ -245,7 +245,7 @@ describe('Attachment', () => {
}); });
describe('removeSchemaVersion', () => { describe('removeSchemaVersion', () => {
it('should remove existing schema version', async () => { it('should remove existing schema version', () => {
const input = { const input = {
contentType: 'image/jpeg', contentType: 'image/jpeg',
data: null, data: null,
@ -261,7 +261,7 @@ describe('Attachment', () => {
size: 1111, size: 1111,
}; };
const actual = await Attachment.removeSchemaVersion(input); const actual = Attachment.removeSchemaVersion(input);
assert.deepEqual(actual, expected); assert.deepEqual(actual, expected);
}); });
}); });