From 26830f0116bce1c40dcf0e669d8cfea40efd5a40 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 22:16:01 +0200
Subject: [PATCH] Quick vote logging, changed data.json save path to
 qminingPublic

---
 middlewares/reqlogger.middleware.js | 1 +
 modules/api/api.js                  | 6 ++++--
 utils/actions.js                    | 2 +-
 utils/utils.js                      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/middlewares/reqlogger.middleware.js b/middlewares/reqlogger.middleware.js
index ec5d499..48ee698 100644
--- a/middlewares/reqlogger.middleware.js
+++ b/middlewares/reqlogger.middleware.js
@@ -18,6 +18,7 @@ module.exports = function (options) {
         logger.Log('Hostname is undefined!', logger.GetColor('redbg'))
         console.log(req.body)
         console.log(req.query)
+        console.log(req.headers)
       }
 
       // fixme: regexp includes checking
diff --git a/modules/api/api.js b/modules/api/api.js
index c4b22bf..2384bff 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -134,6 +134,7 @@ function GetApp () {
   app.get('/quickvote', (req, res) => {
     const key = req.query.key
     const val = req.query.val
+    const user = req.session.user
 
     if (!key || !val) {
       res.render('votethank', {
@@ -147,6 +148,7 @@ function GetApp () {
     if (utils.FileExists(quickVotes)) {
       votes = utils.ReadJSON(quickVotes)
     } else {
+      logger.Log(`No such vote "${key}", and quickVotes.json is missing ( #${user.id}: ${key}-${val} )`, logger.GetColor('blue'))
       res.render('votethank', {
         result: 'no such pool'
       })
@@ -154,6 +156,7 @@ function GetApp () {
     }
 
     if (!votes.voteNames.includes(key)) {
+      logger.Log(`No such vote "${key}" ( #${user.id}: ${key}-${val} )`, logger.GetColor('blue'))
       res.render('votethank', {
         result: 'no such pool'
       })
@@ -161,7 +164,6 @@ function GetApp () {
     }
 
     const voteFile = quickVoteResultsDir + '/' + key + '.json'
-    const user = req.session.user
 
     let voteData = {
       votes: {},
@@ -175,7 +177,7 @@ function GetApp () {
     }
 
     if (!voteData.users.includes(user.id)) {
-      if (voteData[val]) {
+      if (voteData.votes[val]) {
         voteData.votes[val]++
       } else {
         voteData.votes[val] = 1
diff --git a/utils/actions.js b/utils/actions.js
index a1b39f9..6c84190 100755
--- a/utils/actions.js
+++ b/utils/actions.js
@@ -22,7 +22,7 @@ module.exports = {
   LoadJSON: LoadJSON
 }
 
-const dataFile = './public/data.json'
+const dataFile = './qminingPublic/data.json'
 const recDataFile = './stats/recdata'
 
 const logger = require('../utils/logger.js')
diff --git a/utils/utils.js b/utils/utils.js
index b56392b..f23b230 100755
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -18,7 +18,7 @@ var fs = require('fs')
 
 var logger = require('../utils/logger.js')
 
-const dataFile = './public/data.json'
+const dataFile = './qminingPublic/data.json'
 
 function GetDateString () {
   const m = new Date()