-{{/toggle}}
diff --git a/src/models/msg.js b/src/models/msg.js
index 3b36256e7b..c71aa7d61c 100644
--- a/src/models/msg.js
+++ b/src/models/msg.js
@@ -16,7 +16,6 @@ Msg.Type = {
NOTICE: "notice",
PART: "part",
QUIT: "quit",
- TOGGLE: "toggle",
CTCP: "ctcp",
TOPIC: "topic",
TOPIC_SET_BY: "topic_set_by",
diff --git a/src/plugins/irc-events/link.js b/src/plugins/irc-events/link.js
index 04e84b759a..7dd593b992 100644
--- a/src/plugins/irc-events/link.js
+++ b/src/plugins/irc-events/link.js
@@ -1,35 +1,29 @@
"use strict";
const cheerio = require("cheerio");
-const Msg = require("../../models/msg");
const request = require("request");
const Helper = require("../../helper");
+const findLinks = require("../../../client/js/libs/handlebars/ircmessageparser/findLinks");
const es = require("event-stream");
process.setMaxListeners(0);
-module.exports = function(client, chan, originalMsg) {
+module.exports = function(client, chan, msg) {
if (!Helper.config.prefetch) {
return;
}
- const links = originalMsg.text
- .replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "")
- .split(" ")
- .filter((w) => /^https?:\/\//.test(w));
+ // Remove all IRC formatting characters before searching for links
+ const cleanText = msg.text.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "");
+
+ // We will only try to prefetch http(s) links
+ const links = findLinks(cleanText).filter((w) => /^https?:\/\//.test(w.link));
if (links.length === 0) {
return;
}
- const msg = new Msg({
- type: Msg.Type.TOGGLE,
- time: originalMsg.time,
- self: originalMsg.self,
- });
- chan.pushMessage(client, msg);
-
- const link = escapeHeader(links[0]);
+ const link = escapeHeader(links[0].link);
fetch(link, function(res) {
if (res === null) {
return;
@@ -40,8 +34,7 @@ module.exports = function(client, chan, originalMsg) {
};
function parse(msg, url, res, client) {
- var toggle = msg.toggle = {
- id: msg.id,
+ const preview = {
type: "",
head: "",
body: "",
@@ -52,35 +45,35 @@ function parse(msg, url, res, client) {
switch (res.type) {
case "text/html":
var $ = cheerio.load(res.text);
- toggle.type = "link";
- toggle.head =
+ preview.type = "link";
+ preview.head =
$("meta[property=\"og:title\"]").attr("content")
|| $("title").text()
|| "";
- toggle.body =
+ preview.body =
$("meta[property=\"og:description\"]").attr("content")
|| $("meta[name=\"description\"]").attr("content")
|| "";
- toggle.thumb =
+ preview.thumb =
$("meta[property=\"og:image\"]").attr("content")
|| $("meta[name=\"twitter:image:src\"]").attr("content")
|| "";
// Make sure thumbnail is a valid url
- if (!/^https?:\/\//.test(toggle.thumb)) {
- toggle.thumb = "";
+ if (!/^https?:\/\//.test(preview.thumb)) {
+ preview.thumb = "";
}
// Verify that thumbnail pic exists and is under allowed size
- if (toggle.thumb.length) {
- fetch(escapeHeader(toggle.thumb), (resThumb) => {
+ if (preview.thumb.length) {
+ fetch(escapeHeader(preview.thumb), (resThumb) => {
if (resThumb === null
|| !(/^image\/.+/.test(resThumb.type))
|| resThumb.size > (Helper.config.prefetchMaxImageSize * 1024)) {
- toggle.thumb = "";
+ preview.thumb = "";
}
- emitToggle(client, toggle);
+ emitPreview(client, msg, preview);
});
return;
@@ -93,7 +86,7 @@ function parse(msg, url, res, client) {
case "image/jpg":
case "image/jpeg":
if (res.size < (Helper.config.prefetchMaxImageSize * 1024)) {
- toggle.type = "image";
+ preview.type = "image";
} else {
return;
}
@@ -103,21 +96,26 @@ function parse(msg, url, res, client) {
return;
}
- emitToggle(client, toggle);
+ emitPreview(client, msg, preview);
}
-function emitToggle(client, toggle) {
+function emitPreview(client, msg, preview) {
// If there is no title but there is preview or description, set title
// otherwise bail out and show no preview
- if (!toggle.head.length) {
- if (toggle.thumb.length || toggle.body.length) {
- toggle.head = "Untitled page";
+ if (!preview.head.length && preview.type === "link") {
+ if (preview.thumb.length || preview.body.length) {
+ preview.head = "Untitled page";
} else {
return;
}
}
- client.emit("toggle", toggle);
+ msg.preview = preview;
+
+ client.emit("msg:preview", {
+ id: msg.id,
+ preview: preview
+ });
}
function fetch(url, cb) {
diff --git a/test/plugins/link.js b/test/plugins/link.js
index 2dd38a5c6e..2a7acba575 100644
--- a/test/plugins/link.js
+++ b/test/plugins/link.js
@@ -4,10 +4,14 @@ var assert = require("assert");
var util = require("../util");
var link = require("../../src/plugins/irc-events/link.js");
+const path = require("path");
describe("Link plugin", function() {
before(function(done) {
this.app = util.createWebserver();
+ this.app.get("/real-test-image.png", function(req, res) {
+ res.sendFile(path.resolve(__dirname, "../../client/img/apple-touch-icon-120x120.png"));
+ });
this.connection = this.app.listen(9002, done);
});
@@ -28,11 +32,132 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message);
this.app.get("/basic", function(req, res) {
- res.send("