Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Handle umlaut in og:image (WEBAPP-4156) #830

Merged
merged 7 commits into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions electron/js/lib/arrayify.js

This file was deleted.

63 changes: 0 additions & 63 deletions electron/js/lib/base64-image.js

This file was deleted.

26 changes: 0 additions & 26 deletions electron/js/lib/datauri.js

This file was deleted.

81 changes: 57 additions & 24 deletions electron/js/lib/openGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,71 @@


const og = require('open-graph');
const request = require('request');

const arrayify = require('./arrayify');
const base64Images = require('./base64-image');
const _arrayify = (obj = []) => Array.isArray(obj) ? obj : [obj];

const updateMetaDataWithImages = (meta, images) => {
images = arrayify(images);
if (images.length > 1) {
meta.image.url = images;
} else if (images.length > 0) {
meta.image.url = meta.image.data = images[0]; // old version uses data attr
const _bufferToBase64 = (buffer, mimeType) => {
const bufferBase64encoded = Buffer.from(buffer).toString('base64');
return 'data:' + mimeType + ';base64,' + bufferBase64encoded;
};

const _fetchImageAsBase64 = (url) => {
return new Promise((resolve) => {
request({url: encodeURI(url), encoding: null}, (error, response, body) => {
if (!error && response.statusCode === 200) {
resolve(_bufferToBase64(body, response.headers['content-type']));
} else {
// we just skip images that failed to download
resolve();
}
});
});
};

const _fetchOpenGraphData = (url) => {
return new Promise((resolve, reject) => {
og(url, (error, meta) => error ? reject(error) : resolve(meta));
});
};

const _updateMetaDataWithImage = (meta, image) => {
if (image) {
meta.image.data = image;
} else {
delete meta.image;
}

return meta;
};

module.exports = (url, limit = 1, callback) => {
// older version excepts 2 parameters (url, callback)
if (typeof(limit) === 'function') {
callback = limit;
limit = 1;
}
const _getOpenGraphData = (url, callback) => {
return _fetchOpenGraphData(url)
.then((meta) => {
if (meta.image && meta.image.url) {
const [imageUrl] = _arrayify(meta.image.url);

og(url, (error, meta) => {
if (error) {
return callback(error);
}
return _fetchImageAsBase64(imageUrl)
.then((uri) => _updateMetaDataWithImage(meta, uri))
.catch(() => meta);
}

if (meta.image && meta.image.url) {
base64Images(meta.image.url, limit, (dataURIs) => callback(null, updateMetaDataWithImages(meta, dataURIs)));
} else {
callback(null, meta);
}
});
return meta;
})
.then((meta) => {
if (callback) {
callback(null, meta);
}

return meta;
})
.catch((error) => {
if (callback) {
callback(error);
}

throw error;
});
};

module.exports = _getOpenGraphData;
40 changes: 0 additions & 40 deletions tests/arrayifyTest.js

This file was deleted.

38 changes: 0 additions & 38 deletions tests/datauriTest.js

This file was deleted.