deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-09 17:56:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3577 from thelounge/xpaw/thumb-assign

Browse source 
Assign `preview.thumb` only after it is processed
This commit is contained in:
Pavel Djundik 2019-12-14 21:34:07 +02:00 committed by GitHub
parent d99b6d0a17 bbf92f1aa0
commit 6f7444dfe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/models/chan.js
View file

@ -112,7 +112,7 @@ Chan.prototype.dereferencePreviews = function(messages) {
message.previews.forEach((preview) => {
if (preview.thumb) {
storage.dereference(preview.thumb);
preview.thumb = null;
preview.thumb = "";
}
});
}

34
src/plugins/irc-events/link.js
View file

@ -61,7 +61,7 @@ module.exports = function(client, chan, msg) {
preview.type = "error";
preview.error = "message";
preview.message = err.message;
handlePreview(client, chan, msg, preview, null);
emitPreview(client, chan, msg, preview);
});
return cleanLinks;
@ -86,35 +86,32 @@ function parseHtml(preview, res, client) {
$('meta[property="og:description"]').attr("content") ||
$('meta[name="description"]').attr("content") ||
"";
preview.thumb =
let thumb =
$('meta[property="og:image"]').attr("content") ||
$('meta[name="twitter:image:src"]').attr("content") ||
$('link[rel="image_src"]').attr("href") ||
"";
// Make sure thumbnail is a valid and absolute url
if (preview.thumb.length) {
preview.thumb = normalizeURL(preview.thumb, preview.link) || "";
if (thumb.length) {
thumb = normalizeURL(thumb, preview.link) || "";
}
// Verify that thumbnail pic exists and is under allowed size
if (preview.thumb.length) {
fetch(preview.thumb, {language: client.config.browser.language})
if (thumb.length) {
fetch(thumb, {language: client.config.browser.language})
.then((resThumb) => {
if (
resThumb === null ||
!imageTypeRegex.test(resThumb.type) ||
resThumb.size > Helper.config.prefetchMaxImageSize * 1024
resThumb !== null &&
imageTypeRegex.test(resThumb.type) &&
resThumb.size <= Helper.config.prefetchMaxImageSize * 1024
) {
preview.thumb = "";
preview.thumbActualUrl = thumb;
}
resolve(resThumb);
})
.catch(() => {
preview.thumb = "";
resolve(null);
});
.catch(() => resolve(null));
} else {
resolve(res);
}
@ -201,7 +198,7 @@ function parse(msg, chan, preview, res, client) {
preview.maxSize = Helper.config.prefetchMaxImageSize * 1024;
} else {
preview.type = "image";
preview.thumb = preview.link;
preview.thumbActualUrl = preview.link;
}
break;
@ -250,7 +247,11 @@ function parse(msg, chan, preview, res, client) {
}
function handlePreview(client, chan, msg, preview, res) {
if (!preview.thumb.length || !Helper.config.prefetchStorage) {
const thumb = preview.thumbActualUrl || "";
delete preview.thumbActualUrl;
if (!thumb.length || !Helper.config.prefetchStorage) {
preview.thumb = thumb;
return emitPreview(client, chan, msg, preview);
}
@ -265,7 +266,6 @@ function handlePreview(client, chan, msg, preview, res) {
return removePreview(msg, preview);
}
preview.thumb = "";
return emitPreview(client, chan, msg, preview);
}