From 8bf55527ed5be3f5698bc33e0c6a49386558ef19 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Fri, 7 Aug 2020 19:52:50 +0300
Subject: [PATCH] Use lodash where possible

---
 client/js/store-settings.js |  2 +-
 src/client.js               |  6 +++---
 src/server.js               | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/js/store-settings.js b/client/js/store-settings.js
index 5caa5160..bed36968 100644
--- a/client/js/store-settings.js
+++ b/client/js/store-settings.js
@@ -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(", ");
 	}
 
diff --git a/src/client.js b/src/client.js
index cd0359a8..0793330d 100644
--- a/src/client.js
+++ b/src/client.js
@@ -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 = {};
 	}
 
diff --git a/src/server.js b/src/server.js
index acd9c0bf..f9bb0dc4 100644
--- a/src/server.js
+++ b/src/server.js
@@ -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;
 	}