From 1cf16dbafdad197c140683a426863ed22723e0c9 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Wed, 7 Oct 2020 14:35:36 +0200
Subject: [PATCH] Saving data fix round 2

---
 src/modules/api/api.js |  8 ++------
 src/utils/actions.js   | 13 +------------
 src/utils/classes.js   | 17 +++++------------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/modules/api/api.js b/src/modules/api/api.js
index f6ffc57..3178cce 100644
--- a/src/modules/api/api.js
+++ b/src/modules/api/api.js
@@ -728,13 +728,9 @@ function GetApp() {
         user
       )
       .then((result) => {
-        const { newDb, newQuestions } = result
-        if (newQuestions > 0) {
-          data = newDb
-        }
         res.json({
-          success: newQuestions !== -1,
-          newQuestions: newQuestions,
+          success: result !== -1,
+          newQuestions: result,
         })
       })
   })
diff --git a/src/utils/actions.js b/src/utils/actions.js
index a21d6fc..2171d3c 100755
--- a/src/utils/actions.js
+++ b/src/utils/actions.js
@@ -118,7 +118,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
                 3
               )
               logger.DebugLog(currentQuestion, 'actions', 3)
-              qdb = addQuestion(qdb, sName, currentQuestion)
+              addQuestion(qdb, sName, currentQuestion)
             })
 
             currWrites++
@@ -129,17 +129,6 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
             )
             if (currWrites >= writeAfter && !dryRun) {
               currWrites = 0
-              try {
-                qdb.version = infos.version
-                qdb.motd = infos.motd
-                logger.DebugLog(
-                  'version and motd set for data.json',
-                  'actions',
-                  3
-                )
-              } catch (err) {
-                logger.Log('MOTD/Version writing/reading error!')
-              }
               logger.DebugLog('Writing data.json', 'actions', 1)
               utils.WriteFile(JSON.stringify(qdb), dataFile)
               logger.Log('\tData file written', color)
diff --git a/src/utils/classes.js b/src/utils/classes.js
index 3ddfa6c..a5fb198 100755
--- a/src/utils/classes.js
+++ b/src/utils/classes.js
@@ -327,7 +327,6 @@ function addQuestion(data, subj, question) {
   assert(subj)
   assert(question)
   assert(typeof question === 'object')
-  let result = []
 
   var i = 0
   while (
@@ -341,20 +340,14 @@ function addQuestion(data, subj, question) {
 
   if (i < data.length) {
     debugLog('Adding new question to existing subject', 'qdb add', 1)
-    result = [...data]
-    result[i].Questions = [...data[i].Questions, question]
+    data[i].Questions.push(question)
   } else {
     debugLog('Creating new subject for question', 'qdb add', 1)
-    result = [
-      ...data,
-      {
-        Name: subj,
-        Questions: [question],
-      },
-    ]
+    data.push({
+      Name: subj,
+      Questions: [question],
+    })
   }
-
-  return result
 }
 
 function searchData(data, question, subjName, questionData) {