deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-20 06:25:10 +02:00
Code Issues Projects Releases Wiki Activity

Remove actionTypes and check templates directly

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

21
client/js/constants.js
View file

@ -68,26 +68,6 @@ const commands = [
"/whois",
];
const actionTypes = [
"away",
"back",
"ban_list",
"invite",
"join",
"mode",
"kick",
"nick",
"part",
"quit",
"topic",
"topic_set_by",
"action",
"whois",
"ctcp",
"chghost",
"channel_list",
];
const condensedTypes = [
"away",
"back",
@ -110,6 +90,5 @@ module.exports = {
commands: commands,
condensedTypes: condensedTypes,
condensedTypesQuery: "." + condensedTypes.join(", ."),
actionTypes: actionTypes,
timeFormats: timeFormats,
};

3
client/js/render.js
View file

@ -93,8 +93,7 @@ function buildChatMessage(msg) {
msg.highlight = true;
}
if (constants.actionTypes.indexOf(type) !== -1) {
msg.template = "actions/" + type;
if (typeof templates.actions[type] !== "undefined") {
template = "msg_action";
} else if (type === "unhandled") {
template = "msg_unhandled";

18
test/client/js/constantsTest.js
View file

@ -30,25 +30,15 @@ describe("client-side constants", function() {
});
});
describe(".actionTypes", function() {
it("should be a non-empty array", function() {
expect(constants.actionTypes).to.be.an("array").that.is.not.empty;
});
it("should only contain strings with no whitespaces", function() {
constants.actionTypes.forEach((type) => {
expect(type).to.be.a("string").that.does.not.match(/\s/);
});
});
});
describe(".condensedTypes", function() {
it("should be a non-empty array", function() {
expect(constants.condensedTypes).to.be.an("array").that.is.not.empty;
});
it("should be a subset of `actionTypes`", function() {
expect(constants.actionTypes).to.include.members(constants.condensedTypes);
it("should only contain ASCII strings", function() {
constants.condensedTypes.forEach((type) => {
expect(type).to.be.a("string").that.does.match(/^\w+$/);
});
});
});