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

Merge pull request #4020 from thelounge/xpaw/obj

Browse Source 
Use lodash where possible
This commit is contained in:
Pavel Djundik 2020-08-10 15:57:12 +03:00 committed by GitHub
commit b6782da837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/store-settings.js
View File

@ -82,7 +82,7 @@ function loadFromLocalStorage() {
}
// Older The Lounge versions converted highlights to an array, turn it back into a string
if (typeof storedSettings.highlights === "object") {
if (storedSettings.highlights !== null && typeof storedSettings.highlights === "object") {
storedSettings.highlights = storedSettings.highlights.join(", ");
}

6
src/client.js
View File

@ -83,15 +83,15 @@ function Client(manager, name, config = {}) {
}
}
if (typeof client.config.sessions !== "object") {
if (!_.isPlainObject(client.config.sessions)) {
client.config.sessions = {};
}
if (typeof client.config.clientSettings !== "object") {
if (!_.isPlainObject(client.config.clientSettings)) {
client.config.clientSettings = {};
}
if (typeof client.config.browser !== "object") {
if (!_.isPlainObject(client.config.browser)) {
client.config.browser = {};
}

24
src/server.js
View File

@ -363,13 +363,13 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("input", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
client.input(data);
}
});
socket.on("more", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
const history = client.more(data);
if (history !== null) {
@ -379,7 +379,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("network:new", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
// prevent people from overriding webirc settings
data.uuid = null;
data.commands = null;
@ -404,7 +404,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("network:edit", (data) => {
if (typeof data !== "object") {
if (!_.isPlainObject(data)) {
return;
}
@ -418,14 +418,14 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("history:clear", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
client.clearHistory(data);
}
});
if (!Helper.config.public && !Helper.config.ldap.enable) {
socket.on("change-password", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
const old = data.old_password;
const p1 = data.new_password;
const p2 = data.verify_password;
@ -475,13 +475,13 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("sort", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
client.sort(data);
}
});
socket.on("names", (data) => {
if (typeof data === "object") {
if (_.isPlainObject(data)) {
client.names(data);
}
});
@ -496,7 +496,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
});
socket.on("msg:preview:toggle", (data) => {
if (typeof data !== "object") {
if (!_.isPlainObject(data)) {
return;
}
@ -597,7 +597,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
if (!Helper.config.public) {
socket.on("setting:set", (newSetting) => {
if (!newSetting || typeof newSetting !== "object") {
if (!_.isPlainObject(newSetting)) {
return;
}
@ -646,7 +646,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
socket.on("sign-out", (tokenToSignOut) => {
// If no token provided, sign same client out
if (!tokenToSignOut) {
if (!tokenToSignOut || typeof tokenToSignOut !== "string") {
tokenToSignOut = token;
}
@ -752,7 +752,7 @@ function getServerConfiguration() {
}
function performAuthentication(data) {
if (typeof data !== "object") {
if (!_.isPlainObject(data)) {
return;
}