supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2504 from thelounge/xpaw/fix-2438

Browse Source 
If a preview fails to load, remove the link from msg object
This commit is contained in:
Pavel Djundik 2018-06-03 20:39:14 +03:00 committed by GitHub
commit cd1763cbf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/irc-events/link.js
View File

@ -238,7 +238,7 @@ function parse(msg, preview, res, client) {
break; break;
default: default:
return; return removePreview(msg, preview);
} }
if (!promise) { if (!promise) {
@ -261,7 +261,7 @@ function handlePreview(client, msg, preview, res) {
// For link previews, drop the thumbnail // For link previews, drop the thumbnail
// For other types, do not display preview at all // For other types, do not display preview at all
if (preview.type !== "link") { if (preview.type !== "link") {
return; return removePreview(msg, preview);
} }
preview.thumb = ""; preview.thumb = "";
@ -282,7 +282,7 @@ function emitPreview(client, msg, preview) {
if (preview.thumb.length || preview.body.length) { if (preview.thumb.length || preview.body.length) {
preview.head = "Untitled page"; preview.head = "Untitled page";
} else { } else {
return; return removePreview(msg, preview);
} }
} }
@ -290,6 +290,16 @@ function emitPreview(client, msg, preview) {
client.emit("msg:preview", {id, preview}); client.emit("msg:preview", {id, preview});
} }
function removePreview(msg, preview) {
// If a preview fails to load, remove the link from msg object
// So that client doesn't attempt to display an preview on page reload
const index = msg.previews.indexOf(preview);
if (index > -1) {
msg.previews.splice(index, 1);
}
}
function getRequestHeaders(headers) { function getRequestHeaders(headers) {
const formattedHeaders = { const formattedHeaders = {
"User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/thelounge)", "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/thelounge)",