From db51e5f20289ea0279d9ca640969c5dcf7ef5cbe Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Wed, 6 Oct 2021 19:13:15 +0200
Subject: [PATCH] Adding date to submitted questions, sqlite insert fixes

---
 scripts/make.sh                    | 7 ++++++-
 scripts/runDocker.sh               | 2 --
 src/modules/api/submodules/chat.ts | 2 +-
 src/utils/actions.ts               | 5 ++++-
 submodules/qmining-page            | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/make.sh b/scripts/make.sh
index 44ee1b7..13400c7 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -31,9 +31,14 @@ makeNextSubmodule() {
   npm audit fix
   npm run export
   popd
-  ln -sf "$PWD/submodules/${1}/out" "$PWD/nextStatic/${2}"
+  linkTarget="$PWD/nextStatic/${2}"
+  if [ ! -f "${linkTarget}" ]; then
+    ln -sf "$PWD/submodules/${1}/out" "${linkTarget}"
+  fi
 }
 
+./setup.sh
+
 log "Making project"
 npm install
 npm audit fix
diff --git a/scripts/runDocker.sh b/scripts/runDocker.sh
index e51fab1..6f3a1c1 100755
--- a/scripts/runDocker.sh
+++ b/scripts/runDocker.sh
@@ -21,11 +21,9 @@ elif [ "$1" == "stop" ]; then
   docker stop $(getContainerId)
 elif [ "$1" == "start" ]; then
   # --entrypoint bash \
-  scripts/setup.sh
   docker start -i $(getContainerId)
 elif [ "$1" == "run" ]; then
   # --entrypoint bash \
-  scripts/setup.sh
   docker run -it \
     -p 8080:80 \
     --mount src="$(pwd)/stats",target=/server/stats,type=bind \
diff --git a/src/modules/api/submodules/chat.ts b/src/modules/api/submodules/chat.ts
index 6432615..1bf64a6 100644
--- a/src/modules/api/submodules/chat.ts
+++ b/src/modules/api/submodules/chat.ts
@@ -131,7 +131,7 @@ function setup(data: SubmoduleData): void {
         const msgObj = {
           sender: userid,
           reciever: parseInt(reciever),
-          msg: msg,
+          msg: msg.replace(/'/g, '').replace(/;/g, ''),
           type: type || 'text',
           date: new Date().getTime(),
           unread: 1,
diff --git a/src/utils/actions.ts b/src/utils/actions.ts
index f0dd26b..fff85f3 100755
--- a/src/utils/actions.ts
+++ b/src/utils/actions.ts
@@ -214,7 +214,10 @@ function processIncomingRequestUsingDb(
                   3
                 )
                 logger.DebugLog(currentQuestion, 'isadding', 3)
-                addQuestion(qdb.data, sName, currentQuestion)
+                addQuestion(qdb.data, sName, {
+                  ...currentQuestion,
+                  date: new Date(),
+                })
               })
 
               currWrites++
diff --git a/submodules/qmining-page b/submodules/qmining-page
index 11e7c5c..2b491e6 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit 11e7c5c5679457e999a95bd24b80108f6d7811ab
+Subproject commit 2b491e6bec6eee78400e3e042418def12df3243f