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

Merge pull request #2217 from thelounge/xpaw/fix-url-caret

Browse Source 
Fix some URLs not being sent as-is to the client
This commit is contained in:
Jérémie Astori 2018-03-13 19:11:43 -04:00 committed by GitHub
commit 88b7f5bc2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ module.exports = function(client, chan, msg) {
} }
msg.previews = Array.from(new Set( // Remove duplicate links msg.previews = Array.from(new Set( // Remove duplicate links
links.map((link) => normalizeURL(link.link)) links.map((link) => link.link)
)).map((link) => ({ )).map((link) => ({
type: "loading", type: "loading",
head: "", head: "",
@ -52,7 +52,7 @@ 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, {language: client.language}, function(res, err) { fetch(normalizeURL(preview.link), {language: client.language}, function(res, err) {
if (err) { if (err) {
preview.type = "error"; preview.type = "error";
preview.error = "message"; preview.error = "message";

19
test/plugins/link.js
View File

@ -284,6 +284,19 @@ describe("Link plugin", function() {
link(this.irc, this.network.channels[0], message); link(this.irc, this.network.channels[0], message);
}); });
it("should not add slash to url", function(done) {
const message = this.irc.createMessage({
text: "http://localhost:9002",
});
link(this.irc, this.network.channels[0], message);
this.irc.once("msg:preview", function(data) {
expect(data.preview.link).to.equal("http://localhost:9002");
done();
});
});
it("should work on non-ASCII urls", function(done) { it("should work on non-ASCII urls", function(done) {
const message = this.irc.createMessage({ const message = this.irc.createMessage({
text: text:
@ -310,11 +323,11 @@ describe("Link plugin", function() {
this.irc.on("msg:preview", function(data) { this.irc.on("msg:preview", function(data) {
previews.push(data.preview.link); previews.push(data.preview.link);
if (data.preview.link.includes("%C4%B1o%C4%B1-test")) { if (data.preview.link.includes("ıoı-test")) {
expect(data.preview.head).to.equal("ıoı-test"); expect(data.preview.head).to.equal("ıoı-test");
} else if (data.preview.link.includes("%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9-%D1%82%D0%B5%D0%BA%D1%81%D1%82-test")) { } else if (data.preview.link.includes("русский-текст-test")) {
expect(data.preview.head).to.equal("русский-текст-test"); expect(data.preview.head).to.equal("русский-текст-test");
} else if (data.preview.link.includes("%F0%9F%99%88-emoji-test")) { } else if (data.preview.link.includes("🙈-emoji-test")) {
expect(data.preview.head).to.equal("🙈-emoji-test"); expect(data.preview.head).to.equal("🙈-emoji-test");
} else { } else {
expect("This should never happen").to.equal(data.preview.link); expect("This should never happen").to.equal(data.preview.link);