Merge pull request #1747 from thelounge/astorije/fix-parse
Fix duplicate text generated when sending channel and link together
This commit is contained in:
commit
823ed0153f
@ -2,6 +2,7 @@
|
||||
|
||||
const Handlebars = require("handlebars/runtime");
|
||||
const parseStyle = require("./ircmessageparser/parseStyle");
|
||||
const anyIntersection = require("./ircmessageparser/anyIntersection");
|
||||
const findChannels = require("./ircmessageparser/findChannels");
|
||||
const findLinks = require("./ircmessageparser/findLinks");
|
||||
const findEmoji = require("./ircmessageparser/findEmoji");
|
||||
@ -66,7 +67,15 @@ module.exports = function parse(text) {
|
||||
const parts = channelParts
|
||||
.concat(linkParts)
|
||||
.concat(emojiParts)
|
||||
.sort((a, b) => a.start - b.start);
|
||||
.sort((a, b) => a.start - b.start || b.end - a.end)
|
||||
.reduce((prev, curr) => {
|
||||
const intersection = prev.some((p) => anyIntersection(p, curr));
|
||||
|
||||
if (intersection) {
|
||||
return prev;
|
||||
}
|
||||
return prev.concat([curr]);
|
||||
}, []);
|
||||
|
||||
// Merge the styling information with the channels / URLs / text objects and
|
||||
// generate HTML strings with the resulting fragments
|
||||
|
@ -312,7 +312,6 @@ describe("parse Handlebars helper", () => {
|
||||
const testCases = [{
|
||||
input: "http://example.com/#hash",
|
||||
expected:
|
||||
"" +
|
||||
"<a href=\"http://example.com/#hash\" target=\"_blank\" rel=\"noopener\">" +
|
||||
"http://example.com/#hash" +
|
||||
"</a>",
|
||||
@ -333,4 +332,15 @@ describe("parse Handlebars helper", () => {
|
||||
"Channel: <span class=\"inline-channel\" role=\"button\" tabindex=\"0\" data-chan=\"##channel\">##channel</span>"
|
||||
);
|
||||
});
|
||||
|
||||
it("should handle overlapping parts by using first starting", () => {
|
||||
const input = "#test-https://example.com";
|
||||
const actual = parse(input);
|
||||
|
||||
expect(actual).to.equal(
|
||||
"<span class=\"inline-channel\" role=\"button\" tabindex=\"0\" data-chan=\"#test-https://example.com\">" +
|
||||
"#test-https://example.com" +
|
||||
"</span>"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user