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

Merge pull request #3638 from thelounge/xpaw/control-space

Browse Source 
Replace control codes with a space
This commit is contained in:
Pavel Djundik 2019-12-30 19:29:34 +02:00 committed by GitHub
commit 280018e052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/helpers/ircmessageparser/parseStyle.js
View File

@ -67,7 +67,7 @@ function parseStyle(text) {
const textPart = text.slice(start, position); const textPart = text.slice(start, position);
// Filters out all non-style related control codes present in this text // Filters out all non-style related control codes present in this text
const processedText = textPart.replace(controlCodesRx, ""); const processedText = textPart.replace(controlCodesRx, " ");
if (processedText.length) { if (processedText.length) {
// Current fragment starts where the previous one ends, or at 0 if none // Current fragment starts where the previous one ends, or at 0 if none

6
test/client/js/helpers/ircmessageparser/parseStyle.js
View File

@ -4,7 +4,7 @@ const expect = require("chai").expect;
const parseStyle = require("../../../../../client/js/helpers/ircmessageparser/parseStyle").default; const parseStyle = require("../../../../../client/js/helpers/ircmessageparser/parseStyle").default;
describe("parseStyle", () => { describe("parseStyle", () => {
it("should skip control codes", () => { it("should replace control codes", () => {
const input = "text\x01with\x04control\x05codes"; const input = "text\x01with\x04control\x05codes";
const expected = [ const expected = [
{ {
@ -17,10 +17,10 @@ describe("parseStyle", () => {
underline: false, underline: false,
strikethrough: false, strikethrough: false,
monospace: false, monospace: false,
text: "textwithcontrolcodes", text: "text withcontrol codes",
start: 0, start: 0,
end: 20, end: 22,
}, },
]; ];

12
test/client/js/helpers/parse.js
View File

@ -48,7 +48,7 @@ describe("IRC formatted message parser", () => {
input: input:
"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1B\x1D\x1D\x1E\x1Ftext\x0Awithcontrolcodestest", "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1B\x1D\x1D\x1E\x1Ftext\x0Awithcontrolcodestest",
expected: expected:
'<span class="irc-underline irc-strikethrough irc-monospace">text\nwithcontrolcodestest</span>', ' <span class="irc-bold"> </span> <span class="irc-monospace"> </span><span class="irc-underline irc-strikethrough irc-monospace">text\nwithcontrolcodestest</span>',
}, },
]; ];
@ -606,4 +606,14 @@ describe("IRC formatted message parser", () => {
"</span>" "</span>"
); );
}); });
it("should find links separated by tab character", async () => {
const input = "example.com\texample.org";
const actual = await getParsedMessageContents(input);
expect(actual).to.equal(
'<a href="http://example.com" dir="auto" target="_blank" rel="noopener">example.com</a>' +
' <a href="http://example.org" dir="auto" target="_blank" rel="noopener">example.org</a>'
);
});
}); });