Merge pull request #1303 from thelounge/astorije/multiple-previews
Support multiple previews per message
This commit is contained in:
commit
199bc459b4
@ -205,6 +205,7 @@ kbd {
|
||||
#chat .whois .from:before,
|
||||
#chat .nick .from:before,
|
||||
#chat .action .from:before,
|
||||
#chat .toggle-button:after,
|
||||
.context-menu-item:before,
|
||||
#nick button:before {
|
||||
font: normal normal normal 14px/1 FontAwesome;
|
||||
@ -293,6 +294,16 @@ kbd {
|
||||
content: "\f005"; /* http://fontawesome.io/icon/star/ */
|
||||
}
|
||||
|
||||
#chat .toggle-button {
|
||||
/* These 2 directives are loosely taken from .fa-fw */
|
||||
width: 1.35em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#chat .toggle-button:after {
|
||||
content: "\f0da"; /* http://fontawesome.io/icon/caret-right/ */
|
||||
}
|
||||
|
||||
#chat .count:before {
|
||||
color: #cfcfcf;
|
||||
content: "\f002"; /* http://fontawesome.io/icon/search/ */
|
||||
@ -1113,17 +1124,18 @@ kbd {
|
||||
}
|
||||
|
||||
#chat .toggle-button {
|
||||
background: #f5f5f5;
|
||||
border-radius: 2px;
|
||||
display: inline-block;
|
||||
color: #666;
|
||||
height: 1em;
|
||||
line-height: 0;
|
||||
padding: 0 6px;
|
||||
transition: color .2s, transform .2s;
|
||||
}
|
||||
|
||||
#chat .toggle-button:after {
|
||||
content: "···";
|
||||
#chat .toggle-button.opened {
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
#chat .toggle-button:hover {
|
||||
/* transform and opacity together glitch, so need to use RGBA transition */
|
||||
color: rgba(102, 102, 102, .8); /* #666 x .8 opacity */
|
||||
}
|
||||
|
||||
#chat .toggle-content {
|
||||
@ -1134,7 +1146,7 @@ kbd {
|
||||
font-size: 12px;
|
||||
max-width: 100%;
|
||||
padding: 6px;
|
||||
margin-top: 2px;
|
||||
margin: 2px 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
@ -81,5 +81,8 @@ module.exports = function parse(text) {
|
||||
}
|
||||
|
||||
return fragments;
|
||||
}).join("") + linkParts.map((part) => {
|
||||
const escapedLink = Handlebars.Utils.escapeExpression(part.link);
|
||||
return `<div class="preview" data-url="${escapedLink}"></div>`;
|
||||
}).join("");
|
||||
};
|
||||
|
@ -3,6 +3,7 @@
|
||||
const $ = require("jquery");
|
||||
const templates = require("../views");
|
||||
const options = require("./options");
|
||||
const renderPreview = require("./renderPreview");
|
||||
const utils = require("./utils");
|
||||
const sorting = require("./sorting");
|
||||
|
||||
@ -15,7 +16,7 @@ module.exports = {
|
||||
renderChannel,
|
||||
renderChannelMessages,
|
||||
renderChannelUsers,
|
||||
renderNetworks
|
||||
renderNetworks,
|
||||
};
|
||||
|
||||
function buildChannelMessages(channel, messages) {
|
||||
@ -35,9 +36,9 @@ function buildChatMessage(data) {
|
||||
target = "#chan-" + chat.find(".active").data("id");
|
||||
}
|
||||
|
||||
if (data.msg.preview) {
|
||||
data.msg.preview.shown = options.shouldOpenMessagePreview(data.msg.preview.type);
|
||||
}
|
||||
data.msg.previews.forEach((preview) => {
|
||||
preview.shown = options.shouldOpenMessagePreview(preview.type);
|
||||
});
|
||||
|
||||
const chan = chat.find(target);
|
||||
let template = "msg";
|
||||
@ -72,6 +73,12 @@ function buildChatMessage(data) {
|
||||
const msg = $(templates[template](data.msg));
|
||||
const text = msg.find(".text");
|
||||
|
||||
if (data.msg.previews.length) {
|
||||
data.msg.previews.forEach((preview) => {
|
||||
renderPreview(preview, msg);
|
||||
});
|
||||
}
|
||||
|
||||
if (template === "msg_action") {
|
||||
text.html(templates.actions[type](data.msg));
|
||||
}
|
||||
|
63
client/js/renderPreview.js
Normal file
63
client/js/renderPreview.js
Normal file
@ -0,0 +1,63 @@
|
||||
"use strict";
|
||||
|
||||
const $ = require("jquery");
|
||||
|
||||
const options = require("./options");
|
||||
const templates = require("../views");
|
||||
|
||||
module.exports = renderPreview;
|
||||
|
||||
function renderPreview(preview, msg) {
|
||||
preview.shown = options.shouldOpenMessagePreview(preview.type);
|
||||
|
||||
const container = msg.closest(".chat");
|
||||
let bottom = false;
|
||||
if (container.length) {
|
||||
bottom = container.isScrollBottom();
|
||||
}
|
||||
|
||||
msg.find(`.text a[href="${preview.link}"]`)
|
||||
.first()
|
||||
.after(templates.msg_preview_toggle({preview: preview}));
|
||||
|
||||
msg.find(`.preview[data-url="${preview.link}"]`)
|
||||
.first()
|
||||
.append(templates.msg_preview({preview: preview}));
|
||||
|
||||
if (preview.shown && bottom) {
|
||||
handleImageInPreview(msg.find(".toggle-content"), container);
|
||||
}
|
||||
|
||||
container.trigger("keepToBottom");
|
||||
}
|
||||
|
||||
$("#chat").on("click", ".toggle-button", function() {
|
||||
const self = $(this);
|
||||
const container = self.closest(".chat");
|
||||
const content = self.closest(".text")
|
||||
.find(`.preview[data-url="${self.data("url")}"] .toggle-content`);
|
||||
const bottom = container.isScrollBottom();
|
||||
|
||||
if (bottom && !content.hasClass("show")) {
|
||||
handleImageInPreview(content, container);
|
||||
}
|
||||
|
||||
self.toggleClass("opened");
|
||||
content.toggleClass("show");
|
||||
|
||||
// If scrollbar was at the bottom before toggling the preview, keep it at the bottom
|
||||
if (bottom) {
|
||||
container.scrollBottom();
|
||||
}
|
||||
});
|
||||
|
||||
function handleImageInPreview(content, container) {
|
||||
const img = content.find("img");
|
||||
|
||||
// Trigger scroll logic after the image loads
|
||||
if (img.length && !img.width()) {
|
||||
img.on("load", function() {
|
||||
container.trigger("keepToBottom");
|
||||
});
|
||||
}
|
||||
}
|
@ -1,51 +1,13 @@
|
||||
"use strict";
|
||||
|
||||
const $ = require("jquery");
|
||||
const Handlebars = require("handlebars/runtime");
|
||||
const renderPreview = require("../renderPreview");
|
||||
const socket = require("../socket");
|
||||
const templates = require("../../views");
|
||||
const options = require("../options");
|
||||
|
||||
socket.on("msg:preview", function(data) {
|
||||
data.preview.shown = options.shouldOpenMessagePreview(data.preview.type);
|
||||
|
||||
const msg = $("#msg-" + data.id);
|
||||
const container = msg.closest(".chat");
|
||||
const bottom = container.isScrollBottom();
|
||||
|
||||
msg.find(".text").append(templates.msg_preview({preview: data.preview}));
|
||||
|
||||
if (data.preview.shown && bottom) {
|
||||
handleImageInPreview(msg.find(".toggle-content"), container);
|
||||
}
|
||||
|
||||
container.trigger("keepToBottom");
|
||||
data.link = Handlebars.Utils.escapeExpression(data.link);
|
||||
renderPreview(data.preview, msg);
|
||||
});
|
||||
|
||||
$("#chat").on("click", ".toggle-button", function() {
|
||||
const self = $(this);
|
||||
const container = self.closest(".chat");
|
||||
const content = self.parent().next(".toggle-content");
|
||||
const bottom = container.isScrollBottom();
|
||||
|
||||
if (bottom && !content.hasClass("show")) {
|
||||
handleImageInPreview(content, container);
|
||||
}
|
||||
|
||||
content.toggleClass("show");
|
||||
|
||||
// If scrollbar was at the bottom before toggling the preview, keep it at the bottom
|
||||
if (bottom) {
|
||||
container.scrollBottom();
|
||||
}
|
||||
});
|
||||
|
||||
function handleImageInPreview(content, container) {
|
||||
const img = content.find("img");
|
||||
|
||||
// Trigger scroll logic after the image loads
|
||||
if (img.length && !img.width()) {
|
||||
img.on("load", function() {
|
||||
container.trigger("keepToBottom");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -26,6 +26,7 @@ module.exports = {
|
||||
msg: require("./msg.tpl"),
|
||||
msg_action: require("./msg_action.tpl"),
|
||||
msg_preview: require("./msg_preview.tpl"),
|
||||
msg_preview_toggle: require("./msg_preview_toggle.tpl"),
|
||||
msg_unhandled: require("./msg_unhandled.tpl"),
|
||||
network: require("./network.tpl"),
|
||||
unread_marker: require("./unread_marker.tpl"),
|
||||
|
@ -7,10 +7,5 @@
|
||||
{{> user_name nick=from}}
|
||||
{{/if}}
|
||||
</span>
|
||||
<span class="text">
|
||||
{{~{parse text}~}}
|
||||
{{#if preview}}
|
||||
{{> msg_preview}}
|
||||
{{/if}}
|
||||
</span>
|
||||
<span class="text">{{{parse text}}}</span>
|
||||
</div>
|
||||
|
@ -1,7 +1,4 @@
|
||||
{{#preview}}
|
||||
<div>
|
||||
<button class="toggle-button" aria-label="Toggle prefetched media"></button>
|
||||
</div>
|
||||
<a href="{{link}}" target="_blank" rel="noopener" class="toggle-content toggle-type-{{type}}{{#if shown}} show{{/if}}">
|
||||
{{#equal type "image"}}
|
||||
<img src="{{link}}">
|
||||
|
10
client/views/msg_preview_toggle.tpl
Normal file
10
client/views/msg_preview_toggle.tpl
Normal file
@ -0,0 +1,10 @@
|
||||
{{#preview}}
|
||||
<button class="toggle-button {{#if shown}} opened{{/if}}"
|
||||
data-url="{{link}}"
|
||||
{{#equal type "image"}}
|
||||
aria-label="Toggle image preview"
|
||||
{{else}}
|
||||
aria-label="Toggle website preview"
|
||||
{{/equal}}
|
||||
></button>
|
||||
{{/preview}}
|
@ -31,6 +31,7 @@ function Msg(attr) {
|
||||
_.defaults(this, attr, {
|
||||
from: "",
|
||||
id: id++,
|
||||
previews: [],
|
||||
text: "",
|
||||
type: Msg.Type.MESSAGE,
|
||||
self: false
|
||||
|
@ -23,14 +23,19 @@ module.exports = function(client, chan, msg) {
|
||||
return;
|
||||
}
|
||||
|
||||
const link = escapeHeader(links[0].link);
|
||||
fetch(link, function(res) {
|
||||
if (res === null) {
|
||||
return;
|
||||
}
|
||||
Array.from(new Set( // Remove duplicate links
|
||||
links.map((link) => escapeHeader(link.link))
|
||||
))
|
||||
.slice(0, 5) // Only preview the first 5 URLs in message to avoid abuse
|
||||
.forEach((link) => {
|
||||
fetch(link, function(res) {
|
||||
if (res === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
parse(msg, link, res, client);
|
||||
});
|
||||
parse(msg, link, res, client);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
function parse(msg, url, res, client) {
|
||||
@ -110,7 +115,7 @@ function emitPreview(client, msg, preview) {
|
||||
}
|
||||
}
|
||||
|
||||
msg.preview = preview;
|
||||
msg.previews.push(preview);
|
||||
|
||||
client.emit("msg:preview", {
|
||||
id: msg.id,
|
||||
|
@ -37,13 +37,15 @@ describe("parse Handlebars helper", () => {
|
||||
expected:
|
||||
"<a href=\"irc://freenode.net/thelounge\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"irc://freenode.net/thelounge" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"irc://freenode.net/thelounge\"></div>"
|
||||
}, {
|
||||
input: "www.nooooooooooooooo.com",
|
||||
expected:
|
||||
"<a href=\"http://www.nooooooooooooooo.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"www.nooooooooooooooo.com" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"http://www.nooooooooooooooo.com\"></div>"
|
||||
}, {
|
||||
input: "look at https://thelounge.github.io/ for more information",
|
||||
expected:
|
||||
@ -51,7 +53,8 @@ describe("parse Handlebars helper", () => {
|
||||
"<a href=\"https://thelounge.github.io/\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"https://thelounge.github.io/" +
|
||||
"</a>" +
|
||||
" for more information",
|
||||
" for more information" +
|
||||
"<div class=\"preview\" data-url=\"https://thelounge.github.io/\"></div>"
|
||||
}, {
|
||||
input: "use www.duckduckgo.com for privacy reasons",
|
||||
expected:
|
||||
@ -59,13 +62,26 @@ describe("parse Handlebars helper", () => {
|
||||
"<a href=\"http://www.duckduckgo.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"www.duckduckgo.com" +
|
||||
"</a>" +
|
||||
" for privacy reasons"
|
||||
" for privacy reasons" +
|
||||
"<div class=\"preview\" data-url=\"http://www.duckduckgo.com\"></div>"
|
||||
}, {
|
||||
input: "svn+ssh://example.org",
|
||||
expected:
|
||||
"<a href=\"svn+ssh://example.org\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"svn+ssh://example.org" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"svn+ssh://example.org\"></div>"
|
||||
}, {
|
||||
input: "https://example.com https://example.org",
|
||||
expected:
|
||||
"<a href=\"https://example.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"https://example.com" +
|
||||
"</a> " +
|
||||
"<a href=\"https://example.org\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"https://example.org" +
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"https://example.com\"></div>" +
|
||||
"<div class=\"preview\" data-url=\"https://example.org\"></div>"
|
||||
}];
|
||||
|
||||
const actual = testCases.map((testCase) => parse(testCase.input));
|
||||
@ -81,7 +97,8 @@ describe("parse Handlebars helper", () => {
|
||||
"bonuspunkt: your URL parser misparses this URL: " +
|
||||
"<a href=\"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx" +
|
||||
"</a>";
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v=vs.85).aspx\"></div>";
|
||||
|
||||
const actual = parse(input);
|
||||
|
||||
@ -96,7 +113,8 @@ describe("parse Handlebars helper", () => {
|
||||
"<a href=\"https://theos.kyriasis.com/~kyrias/stats/archlinux.html\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"https://theos.kyriasis.com/~kyrias/stats/archlinux.html" +
|
||||
"</a>" +
|
||||
">"
|
||||
">" +
|
||||
"<div class=\"preview\" data-url=\"https://theos.kyriasis.com/~kyrias/stats/archlinux.html\"></div>"
|
||||
}, {
|
||||
input: "abc (www.example.com)",
|
||||
expected:
|
||||
@ -104,19 +122,22 @@ describe("parse Handlebars helper", () => {
|
||||
"<a href=\"http://www.example.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"www.example.com" +
|
||||
"</a>" +
|
||||
")"
|
||||
")" +
|
||||
"<div class=\"preview\" data-url=\"http://www.example.com\"></div>"
|
||||
}, {
|
||||
input: "http://example.com/Test_(Page)",
|
||||
expected:
|
||||
"<a href=\"http://example.com/Test_(Page)\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"http://example.com/Test_(Page)" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"http://example.com/Test_(Page)\"></div>"
|
||||
}, {
|
||||
input: "www.example.com/Test_(Page)",
|
||||
expected:
|
||||
"<a href=\"http://www.example.com/Test_(Page)\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"www.example.com/Test_(Page)" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"http://www.example.com/Test_(Page)\"></div>"
|
||||
}];
|
||||
|
||||
const actual = testCases.map((testCase) => parse(testCase.input));
|
||||
@ -253,7 +274,8 @@ describe("parse Handlebars helper", () => {
|
||||
"<span class=\"irc-italic\">freenode.net</span>" +
|
||||
"/" +
|
||||
"<span class=\"irc-fg4 irc-bg8\">thelounge</span>" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"irc://freenode.net/thelounge\"></div>"
|
||||
}, {
|
||||
input: "\x02#\x038,9thelounge",
|
||||
expected:
|
||||
@ -292,14 +314,16 @@ describe("parse Handlebars helper", () => {
|
||||
"like.." +
|
||||
"<a href=\"http://example.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"http://example.com" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"http://example.com\"></div>"
|
||||
}, {
|
||||
input: "like..HTTP://example.com",
|
||||
expected:
|
||||
"like.." +
|
||||
"<a href=\"HTTP://example.com\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"HTTP://example.com" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"HTTP://example.com\"></div>"
|
||||
}];
|
||||
|
||||
const actual = testCases.map((testCase) => parse(testCase.input));
|
||||
@ -315,7 +339,8 @@ describe("parse Handlebars helper", () => {
|
||||
"" +
|
||||
"<a href=\"http://example.com/#hash\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"http://example.com/#hash" +
|
||||
"</a>"
|
||||
"</a>" +
|
||||
"<div class=\"preview\" data-url=\"http://example.com/#hash\"></div>"
|
||||
}];
|
||||
|
||||
const actual = testCases.map((testCase) => parse(testCase.input));
|
||||
@ -330,7 +355,8 @@ describe("parse Handlebars helper", () => {
|
||||
|
||||
expect(actual).to.equal(
|
||||
"Url: <a href=\"http://example.com/path\" target=\"_blank\" rel=\"noopener\">http://example.com/path</a> " +
|
||||
"Channel: <span class=\"inline-channel\" role=\"button\" tabindex=\"0\" data-chan=\"##channel\">##channel</span>"
|
||||
"Channel: <span class=\"inline-channel\" role=\"button\" tabindex=\"0\" data-chan=\"##channel\">##channel</span>" +
|
||||
"<div class=\"preview\" data-url=\"http://example.com/path\"></div>"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
|
||||
var assert = require("assert");
|
||||
const expect = require("chai").expect;
|
||||
|
||||
var util = require("../util");
|
||||
var link = require("../../src/plugins/irc-events/link.js");
|
||||
@ -36,9 +36,10 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.type, "link");
|
||||
assert.equal(data.preview.head, "test title");
|
||||
assert.equal(data.preview.body, "simple description");
|
||||
expect(data.preview.type).to.equal("link");
|
||||
expect(data.preview.head).to.equal("test title");
|
||||
expect(data.preview.body).to.equal("simple description");
|
||||
expect(message.previews.length).to.equal(1);
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -55,7 +56,7 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.head, "opengraph test");
|
||||
expect(data.preview.head, "opengraph test");
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -72,7 +73,7 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.body, "opengraph description");
|
||||
expect(data.preview.body).to.equal("opengraph description");
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -89,8 +90,8 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.head, "Google");
|
||||
assert.equal(data.preview.thumb, "http://localhost:9002/real-test-image.png");
|
||||
expect(data.preview.head).to.equal("Google");
|
||||
expect(data.preview.thumb).to.equal("http://localhost:9002/real-test-image.png");
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -107,7 +108,7 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.thumb, "");
|
||||
expect(data.preview.thumb).to.be.empty;
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -124,8 +125,8 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.head, "Untitled page");
|
||||
assert.equal(data.preview.thumb, "http://localhost:9002/real-test-image.png");
|
||||
expect(data.preview.head).to.equal("Untitled page");
|
||||
expect(data.preview.thumb).to.equal("http://localhost:9002/real-test-image.png");
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -142,8 +143,8 @@ describe("Link plugin", function() {
|
||||
});
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.head, "404 image");
|
||||
assert.equal(data.preview.thumb, "");
|
||||
expect(data.preview.head).to.equal("404 image");
|
||||
expect(data.preview.thumb).to.be.empty;
|
||||
done();
|
||||
});
|
||||
});
|
||||
@ -156,9 +157,45 @@ describe("Link plugin", function() {
|
||||
link(this.irc, this.network.channels[0], message);
|
||||
|
||||
this.irc.once("msg:preview", function(data) {
|
||||
assert.equal(data.preview.type, "image");
|
||||
assert.equal(data.preview.link, "http://localhost:9002/real-test-image.png");
|
||||
expect(data.preview.type).to.equal("image");
|
||||
expect(data.preview.link).to.equal("http://localhost:9002/real-test-image.png");
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it("should load multiple URLs found in messages", function(done) {
|
||||
const message = this.irc.createMessage({
|
||||
text: "http://localhost:9002/one http://localhost:9002/two"
|
||||
});
|
||||
|
||||
link(this.irc, this.network.channels[0], message);
|
||||
|
||||
this.app.get("/one", function(req, res) {
|
||||
res.send("<title>first title</title>");
|
||||
});
|
||||
|
||||
this.app.get("/two", function(req, res) {
|
||||
res.send("<title>second title</title>");
|
||||
});
|
||||
|
||||
const loaded = {
|
||||
one: false,
|
||||
two: false
|
||||
};
|
||||
|
||||
this.irc.on("msg:preview", function(data) {
|
||||
if (data.preview.link === "http://localhost:9002/one") {
|
||||
expect(data.preview.head).to.equal("first title");
|
||||
loaded.one = true;
|
||||
} else if (data.preview.link === "http://localhost:9002/two") {
|
||||
expect(data.preview.head).to.equal("second title");
|
||||
loaded.two = true;
|
||||
}
|
||||
|
||||
if (loaded.one && loaded.two) {
|
||||
expect(message.previews.length).to.equal(2);
|
||||
done();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
@ -20,7 +20,8 @@ MockClient.prototype.createMessage = function(opts) {
|
||||
var message = _.extend({
|
||||
text: "dummy message",
|
||||
nick: "test-user",
|
||||
target: "#test-channel"
|
||||
target: "#test-channel",
|
||||
previews: [],
|
||||
}, opts);
|
||||
|
||||
return message;
|
||||
|
Loading…
Reference in New Issue
Block a user