Report server errors when preview fetch fails
This commit is contained in:
parent
1ce2792fc4
commit
37c61e2413
@ -1365,6 +1365,10 @@ kbd {
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#chat .prefetch-error {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
#chat .toggle-content .thumb {
|
#chat .toggle-content .thumb {
|
||||||
max-width: 48px;
|
max-width: 48px;
|
||||||
max-height: 38px;
|
max-height: 38px;
|
||||||
|
@ -37,6 +37,9 @@
|
|||||||
to open it in a new window.
|
to open it in a new window.
|
||||||
</em>
|
</em>
|
||||||
{{/equal}}
|
{{/equal}}
|
||||||
|
{{#equal error "message"}}
|
||||||
|
<em>There was an error when loading this image. <small class="prefetch-error">({{message}})</small></em>
|
||||||
|
{{/equal}}
|
||||||
{{/equal}}
|
{{/equal}}
|
||||||
</div>
|
</div>
|
||||||
{{/preview}}
|
{{/preview}}
|
||||||
|
@ -38,7 +38,14 @@ module.exports = function(client, chan, msg) {
|
|||||||
})).slice(0, 5); // Only preview the first 5 URLs in message to avoid abuse
|
})).slice(0, 5); // Only preview the first 5 URLs in message to avoid abuse
|
||||||
|
|
||||||
msg.previews.forEach((preview) => {
|
msg.previews.forEach((preview) => {
|
||||||
fetch(preview.link, function(res) {
|
fetch(preview.link, function(res, err) {
|
||||||
|
if (err) {
|
||||||
|
preview.type = "error";
|
||||||
|
preview.error = "message";
|
||||||
|
preview.message = err.message;
|
||||||
|
handlePreview(client, msg, preview, res);
|
||||||
|
}
|
||||||
|
|
||||||
if (res === null) {
|
if (res === null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -204,7 +211,7 @@ function fetch(uri, cb) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return cb(null);
|
return cb(null, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
const buffers = [];
|
const buffers = [];
|
||||||
@ -229,7 +236,7 @@ function fetch(uri, cb) {
|
|||||||
limit = 1024 * 50;
|
limit = 1024 * 50;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.on("error", () => cb(null))
|
.on("error", (e) => cb(null, e))
|
||||||
.on("data", (data) => {
|
.on("data", (data) => {
|
||||||
length += data.length;
|
length += data.length;
|
||||||
buffers.push(data);
|
buffers.push(data);
|
||||||
@ -240,7 +247,7 @@ function fetch(uri, cb) {
|
|||||||
})
|
})
|
||||||
.on("end", () => {
|
.on("end", () => {
|
||||||
if (req.response.statusCode < 200 || req.response.statusCode > 299) {
|
if (req.response.statusCode < 200 || req.response.statusCode > 299) {
|
||||||
return cb(null);
|
return cb(null, new Error(`HTTP ${req.response.statusCode}`));
|
||||||
}
|
}
|
||||||
|
|
||||||
let type = "";
|
let type = "";
|
||||||
|
Loading…
Reference in New Issue
Block a user