deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-19 14:46:36 +02:00
Code Issues Projects Releases Wiki Activity

Render MOTD with a single message

Browse source
This commit is contained in:
Pavel Djundik 2018-02-13 13:05:49 +02:00
parent 116a73c8d0
commit d1e5a8f492
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/js/libs/handlebars/ircmessageparser/parseStyle.js
View file

@ -19,7 +19,8 @@ const colorRx = /^(\d{1,2})(?:,(\d{1,2}))?/;
const hexColorRx = /^([0-9a-f]{6})(?:,([0-9a-f]{6}))?/i;
// Represents all other control codes that to be ignored/filtered from the text
const controlCodesRx = /[\u0000-\u001F]/g;
// This regex allows line feed character
const controlCodesRx = /[\u0000-\u0009\u000B-\u001F]/g;
// Converts a given text into an array of objects, each of them representing a
// similarly styled section of the text. Each object carries the `text`, style

10
src/plugins/irc-events/motd.js
View file

@ -9,13 +9,11 @@ module.exports = function(irc, network) {
const lobby = network.channels[0];
if (data.motd) {
data.motd.trim().split("\n").forEach((text) => {
const msg = new Msg({
type: Msg.Type.MOTD,
text: text,
});
lobby.pushMessage(client, msg);
const msg = new Msg({
type: Msg.Type.MOTD,
text: data.motd,
});
lobby.pushMessage(client, msg);
}
if (data.error) {

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

@ -19,10 +19,10 @@ describe("parse Handlebars helper", () => {
expect(actual).to.deep.equal(expected);
});
it("should skip control codes", () => {
it("should skip all <32 ASCII codes except linefeed", () => {
const testCases = [{
input: "text\x01with\x04control\x05codes",
expected: "textwithcontrolcodes",
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",
expected: '<span class="irc-underline irc-strikethrough irc-monospace">text\nwithcontrolcodestest</span>',
}];
const actual = testCases.map((testCase) => parse(testCase.input));