Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-22 03:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enforce correct order for previews on server-side prefectch rather than at client parsing

Browse source 
This has the benefit of not adding `.preview` divs everywhere, anytime we use `parse()`, and also to un-tie the position of the preview blocks from the result of the helper. This means that templates that call `parse` and have some extra markup after that are not constrained anymore.

This is effectively an alternative, better way to fix https://github.com/thelounge/lounge/issues/1343, but the initial fix that was put in place (https://github.com/thelounge/lounge/pull/1347) is still relevant, for example to make sure a preview stays hidden (and does not add extra margin/padding/etc.) if the link does not prefetch.
This commit is contained in:
Jérémie Astori 2017-07-19 01:26:29 -04:00
parent d839a9e64a
commit a13c08a45b
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
9 changed files with 55 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/js/libs/handlebars/parse.js
View file

@ -81,8 +81,5 @@ 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("");
};

4
client/views/actions/action.tpl
View file

@ -1,2 +1,6 @@
{{> ../user_name nick=from}}
<span class="action-text">{{{parse text}}}</span>
{{#each links}}
<div class="preview" data-url="{{this}}"></div>
{{/each}}

8
client/views/msg.tpl
View file

@ -7,5 +7,11 @@
{{> user_name nick=from}}
{{/if}}
</span>
<span class="text">{{{parse text}}}</span>
<span class="text">
{{{parse text}}}
{{#each links}}
<div class="preview" data-url="{{this}}"></div>
{{/each}}
</span>
</div>

1
src/models/msg.js
View file

@ -31,6 +31,7 @@ function Msg(attr) {
_.defaults(this, attr, {
from: "",
id: id++,
links: [],
previews: [],
text: "",
type: Msg.Type.MESSAGE,

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

@ -24,19 +24,19 @@ module.exports = function(client, chan, msg) {
return;
}
Array.from(new Set( // Remove duplicate links
msg.links = 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;
}
)).slice(0, 5); // Only preview the first 5 URLs in message to avoid abuse
parse(msg, link, res, client);
});
msg.links.forEach((link) => {
fetch(link, function(res) {
if (res === null) {
return;
}
parse(msg, link, res, client);
});
});
};
function parse(msg, url, res, client) {

3
src/plugins/irc-events/message.js
View file

@ -89,11 +89,12 @@ module.exports = function(irc, network) {
self: self,
highlight: highlight
});
chan.pushMessage(client, msg, !self);
// No prefetch URLs unless are simple MESSAGE or ACTION types
if ([Msg.Type.MESSAGE, Msg.Type.ACTION].indexOf(data.type) !== -1) {
LinkPrefetch(client, chan, msg);
}
chan.pushMessage(client, msg, !self);
}
};

56
test/client/js/libs/handlebars/parse.js
View file

@ -37,15 +37,13 @@ describe("parse Handlebars helper", () => {
expected:
"<a href=\"irc://freenode.net/thelounge\" target=\"_blank\" rel=\"noopener\">" +
"irc://freenode.net/thelounge" +
"</a>" +
"<div class=\"preview\" data-url=\"irc://freenode.net/thelounge\"></div>"
"</a>"
}, {
input: "www.nooooooooooooooo.com",
expected:
"<a href=\"http://www.nooooooooooooooo.com\" target=\"_blank\" rel=\"noopener\">" +
"www.nooooooooooooooo.com" +
"</a>" +
"<div class=\"preview\" data-url=\"http://www.nooooooooooooooo.com\"></div>"
"</a>"
}, {
input: "look at https://thelounge.github.io/ for more information",
expected:
@ -53,8 +51,7 @@ describe("parse Handlebars helper", () => {
"<a href=\"https://thelounge.github.io/\" target=\"_blank\" rel=\"noopener\">" +
"https://thelounge.github.io/" +
"</a>" +
" for more information" +
"<div class=\"preview\" data-url=\"https://thelounge.github.io/\"></div>"
" for more information"
}, {
input: "use www.duckduckgo.com for privacy reasons",
expected:
@ -62,26 +59,13 @@ describe("parse Handlebars helper", () => {
"<a href=\"http://www.duckduckgo.com\" target=\"_blank\" rel=\"noopener\">" +
"www.duckduckgo.com" +
"</a>" +
" for privacy reasons" +
"<div class=\"preview\" data-url=\"http://www.duckduckgo.com\"></div>"
" for privacy reasons"
}, {
input: "svn+ssh://example.org",
expected:
"<a href=\"svn+ssh://example.org\" target=\"_blank\" rel=\"noopener\">" +
"svn+ssh://example.org" +
"</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>"
"</a>"
}];
const actual = testCases.map((testCase) => parse(testCase.input));
@ -97,8 +81,7 @@ describe("parse Handlebars helper", () => {
"bonuspunkt: your URL parser misparses this URL: " +
"<a href=\"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v&#x3D;vs.85).aspx\" target=\"_blank\" rel=\"noopener\">" +
"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v&#x3D;vs.85).aspx" +
"</a>" +
"<div class=\"preview\" data-url=\"https://msdn.microsoft.com/en-us/library/windows/desktop/ms644989(v&#x3D;vs.85).aspx\"></div>";
"</a>";
const actual = parse(input);
@ -113,8 +96,7 @@ 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>" +
"&gt;" +
"<div class=\"preview\" data-url=\"https://theos.kyriasis.com/~kyrias/stats/archlinux.html\"></div>"
"&gt;"
}, {
input: "abc (www.example.com)",
expected:
@ -122,22 +104,19 @@ 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>" +
"<div class=\"preview\" data-url=\"http://example.com/Test_(Page)\"></div>"
"</a>"
}, {
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>" +
"<div class=\"preview\" data-url=\"http://www.example.com/Test_(Page)\"></div>"
"</a>"
}];
const actual = testCases.map((testCase) => parse(testCase.input));
@ -274,8 +253,7 @@ describe("parse Handlebars helper", () => {
"<span class=\"irc-italic\">freenode.net</span>" +
"/" +
"<span class=\"irc-fg4 irc-bg8\">thelounge</span>" +
"</a>" +
"<div class=\"preview\" data-url=\"irc://freenode.net/thelounge\"></div>"
"</a>"
}, {
input: "\x02#\x038,9thelounge",
expected:
@ -314,16 +292,14 @@ describe("parse Handlebars helper", () => {
"like.." +
"<a href=\"http://example.com\" target=\"_blank\" rel=\"noopener\">" +
"http://example.com" +
"</a>" +
"<div class=\"preview\" data-url=\"http://example.com\"></div>"
"</a>"
}, {
input: "like..HTTP://example.com",
expected:
"like.." +
"<a href=\"HTTP://example.com\" target=\"_blank\" rel=\"noopener\">" +
"HTTP://example.com" +
"</a>" +
"<div class=\"preview\" data-url=\"HTTP://example.com\"></div>"
"</a>"
}];
const actual = testCases.map((testCase) => parse(testCase.input));
@ -339,8 +315,7 @@ describe("parse Handlebars helper", () => {
"" +
"<a href=\"http://example.com/#hash\" target=\"_blank\" rel=\"noopener\">" +
"http://example.com/#hash" +
"</a>" +
"<div class=\"preview\" data-url=\"http://example.com/#hash\"></div>"
"</a>"
}];
const actual = testCases.map((testCase) => parse(testCase.input));
@ -355,8 +330,7 @@ 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>" +
"<div class=\"preview\" data-url=\"http://example.com/path\"></div>"
"Channel: <span class=\"inline-channel\" role=\"button\" tabindex=\"0\" data-chan=\"##channel\">##channel</span>"
);
});
});

26
test/plugins/link.js
View file

@ -27,8 +27,9 @@ describe("Link plugin", function() {
});
it("should be able to fetch basic information about URLs", function(done) {
const url = "http://localhost:9002/basic";
const message = this.irc.createMessage({
text: "http://localhost:9002/basic"
text: url
});
link(this.irc, this.network.channels[0], message);
@ -41,8 +42,10 @@ describe("Link plugin", function() {
expect(data.preview.type).to.equal("link");
expect(data.preview.head).to.equal("test title");
expect(data.preview.body).to.equal("simple description");
expect(data.preview.link).to.equal("http://localhost:9002/basic");
expect(message.previews.length).to.equal(1);
expect(data.preview.link).to.equal(url);
expect(message.links).to.deep.equal([url]);
expect(message.previews).to.deep.equal([data.preview]);
done();
});
});
@ -178,6 +181,11 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message);
expect(message.links).to.deep.equal([
"http://localhost:9002/one",
"http://localhost:9002/two"
]);
this.app.get("/one", function(req, res) {
res.send("<title>first title</title>");
});
@ -186,22 +194,18 @@ describe("Link plugin", function() {
res.send("<title>second title</title>");
});
const loaded = {
one: false,
two: false
};
const previews = [];
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;
}
previews.push(data.preview);
if (loaded.one && loaded.two) {
expect(message.previews.length).to.equal(2);
if (previews.length === 2) {
expect(message.previews).to.deep.equal(previews);
done();
}
});

1
test/util.js
View file

@ -21,6 +21,7 @@ MockClient.prototype.createMessage = function(opts) {
text: "dummy message",
nick: "test-user",
target: "#test-channel",
links: [],
previews: [],
}, opts);