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

Move cleanIrcMessage to a separate file

Browse source
This commit is contained in:
Pavel Djundik 2017-09-28 11:58:43 +03:00
parent 8791a17fc4
commit 0402554563
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.npmignore
View file

@ -7,9 +7,10 @@
!.lounge_home
# Ignore client folder as it's being built into public/ folder
# except for the findLinks.js file which is used by the server
# except for the specified files which are used by the server
client/**
!client/js/libs/handlebars/ircmessageparser/findLinks.js
!client/js/libs/handlebars/ircmessageparser/cleanIrcMessage.js
public/js/bundle.vendor.js.map
coverage/

4
client/js/libs/handlebars/ircmessageparser/cleanIrcMessage.js Normal file
View file

@ -0,0 +1,4 @@
"use strict";
// TODO: This does not strip hex based colours - issue #1413
module.exports = (message) => message.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "").trim();

3
client/js/socket-events/msg.js
View file

@ -6,6 +6,7 @@ const render = require("../render");
const utils = require("../utils");
const options = require("../options");
const helpers_roundBadgeNumber = require("../libs/handlebars/roundBadgeNumber");
const cleanIrcMessage = require("../libs/handlebars/ircmessageparser/cleanIrcMessage");
const webpush = require("../webpush");
const chat = $("#chat");
const sidebar = $("#sidebar");
@ -128,7 +129,7 @@ function notifyMessage(targetId, channel, msg) {
if (msg.type === "message") {
title += " says:";
}
body = msg.text.replace(/\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?|[\x00-\x1F]|\x7F/g, "").trim();
body = cleanIrcMessage(msg.text);
}
try {

6
src/helper.js
View file

@ -21,7 +21,6 @@ var Helper = {
getVersion: getVersion,
getGitCommit: getGitCommit,
ip2hex: ip2hex,
cleanIrcMessage: cleanIrcMessage,
password: {
hash: passwordHash,
@ -140,11 +139,6 @@ function expandHome(shortenedPath) {
return path.resolve(shortenedPath.replace(/^~($|\/|\\)/, home + "$1"));
}
function cleanIrcMessage(message) {
// TODO: This does not strip hex based colours
return message.replace(/\x02|\x1D|\x1F|\x16|\x0F|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?/g, "");
}
function passwordRequiresUpdate(password) {
return bcrypt.getRounds(password) !== 11;
}

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

@ -4,6 +4,7 @@ const cheerio = require("cheerio");
const request = require("request");
const url = require("url");
const Helper = require("../../helper");
const cleanIrcMessage = require("../../../client/js/libs/handlebars/ircmessageparser/cleanIrcMessage");
const findLinks = require("../../../client/js/libs/handlebars/ircmessageparser/findLinks");
const storage = require("../storage");
@ -15,7 +16,7 @@ module.exports = function(client, chan, msg) {
}
// Remove all IRC formatting characters before searching for links
const cleanText = Helper.cleanIrcMessage(msg.text);
const cleanText = cleanIrcMessage(msg.text);
// We will only try to prefetch http(s) links
const links = findLinks(cleanText).filter((w) => /^https?:\/\//.test(w.link));

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

@ -3,7 +3,7 @@
const Chan = require("../../models/chan");
const Msg = require("../../models/msg");
const LinkPrefetch = require("./link");
const Helper = require("../../helper");
const cleanIrcMessage = require("../../../client/js/libs/handlebars/ircmessageparser/cleanIrcMessage");
module.exports = function(irc, network) {
const client = this;
@ -107,7 +107,7 @@ module.exports = function(irc, network) {
// Do not send notifications for messages older than 15 minutes (znc buffer for example)
if (highlight && (!data.time || data.time > Date.now() - 900000)) {
let title = chan.name;
let body = Helper.cleanIrcMessage(data.message);
let body = cleanIrcMessage(data.message);
// In channels, prepend sender nickname to the message
if (chan.type !== Chan.Type.QUERY) {

6
test/tests/cleanircmessages.js → test/client/js/libs/handlebars/ircmessageparser/cleanIrcMessage.js
View file

@ -1,9 +1,9 @@
"use strict";
const expect = require("chai").expect;
const Helper = require("../../src/helper");
const cleanIrcMessage = require("../../../../../../client/js/libs/handlebars/ircmessageparser/cleanIrcMessage");
describe("Clean IRC messages", function() {
describe("cleanIrcMessage", function() {
it("should remove all formatting", function() {
const testCases = [{
input: "\x0303",
@ -40,7 +40,7 @@ describe("Clean IRC messages", function() {
expected: "#thelounge",
}];
const actual = testCases.map((testCase) => Helper.cleanIrcMessage(testCase.input));
const actual = testCases.map((testCase) => cleanIrcMessage(testCase.input));
const expected = testCases.map((testCase) => testCase.expected);
expect(actual).to.deep.equal(expected);