From 6335069b6050b25ab9a40e77845d2a8c91de8f63 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Tue, 22 Mar 2022 18:49:39 +0100
Subject: [PATCH] sanitizeQuery fix, minor chat crash fix

---
 src/modules/api/submodules/chat.ts | 3 +++
 src/utils/dbtools.ts               | 7 +++++--
 submodules/qmining-page            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/api/submodules/chat.ts b/src/modules/api/submodules/chat.ts
index 0823e4f..06b846d 100644
--- a/src/modules/api/submodules/chat.ts
+++ b/src/modules/api/submodules/chat.ts
@@ -113,6 +113,9 @@ function setup(data: SubmoduleData): void {
 
       socket.on('chat message', (message) => {
         const { reciever, msg, type } = message
+        if (!reciever || !msg || !type) {
+          return
+        }
         const recieverUser = dbtools.Select(userDB, 'users', {
           id: reciever,
         })[0]
diff --git a/src/utils/dbtools.ts b/src/utils/dbtools.ts
index 2fd00dc..8a37593 100644
--- a/src/utils/dbtools.ts
+++ b/src/utils/dbtools.ts
@@ -22,8 +22,11 @@ import utils from '../utils/utils'
 
 const debugLog = process.env.NS_SQL_DEBUG_LOG
 
-function sanitizeQuery(val: string): string {
-  return val.replace(/'/g, '').replace(/;/g, '')
+function sanitizeQuery(val) {
+  if (typeof val === 'string') {
+    return val.replace(/'/g, '').replace(/;/g, '')
+  }
+  return val
 }
 
 // { asd: 'asd', basd: 4 } => asd = 'asd', basd = 4
diff --git a/submodules/qmining-page b/submodules/qmining-page
index 1012880..4f82b9d 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit 1012880e899ad328f7a637a6d1512dab7afd24d5
+Subproject commit 4f82b9d8c9c32ebbd9d73b951fc1db26ad1ceb22