From e371744f180149361851ef9c234cc2e9c9ac1473 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:07:13 +0200
Subject: [PATCH 1/5] No https on NS_DEVEL

---
 server.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/server.js b/server.js
index 26b7633..81462a1 100755
--- a/server.js
+++ b/server.js
@@ -89,18 +89,20 @@ function exit (reason) {
 
 const app = express()
 
-app.use(function (req, res, next) {
-  if (req.secure) {
-    next()
-  } else {
-    logger.DebugLog(`HTTPS ${req.method} redirect to: ${'https://' + req.headers.host + req.url}`, 'https', 1)
-    if (req.method === 'POST') {
-      res.redirect(307, 'https://' + req.headers.host + req.url)
+if (!process.env.NS_DEVEL) {
+  app.use(function (req, res, next) {
+    if (req.secure) {
+      next()
     } else {
-      res.redirect('https://' + req.headers.host + req.url)
+      logger.DebugLog(`HTTPS ${req.method} redirect to: ${'https://' + req.headers.host + req.url}`, 'https', 1)
+      if (req.method === 'POST') {
+        res.redirect(307, 'https://' + req.headers.host + req.url)
+      } else {
+        res.redirect('https://' + req.headers.host + req.url)
+      }
     }
-  }
-})
+  })
+}
 // https://github.com/expressjs/cors#configuration-options
 app.use(cors({
   credentials: true,

From d2a8f29b2178c23070c086af847fceca1057c2f4 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:09:29 +0200
Subject: [PATCH 2/5] Auth exception fix

---
 middlewares/auth.middleware.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/middlewares/auth.middleware.js b/middlewares/auth.middleware.js
index d11e606..62586ac 100644
--- a/middlewares/auth.middleware.js
+++ b/middlewares/auth.middleware.js
@@ -47,6 +47,12 @@ module.exports = function (options) {
     const user = GetUserBySessionID(userDB, sessionID, req)
 
     if (!user) {
+      if (isException) {
+        logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1)
+        req.session = { isException: true }
+        next()
+        return
+      }
       logger.DebugLog(`No user:${req.url}`, 'auth', 1)
       renderLogin(req, res)
       return

From f482c65f3c61b406b852c15568f4fa4c9e38b267 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:34:10 +0200
Subject: [PATCH 3/5] Logging in on enter press

---
 sharedViews/login.ejs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sharedViews/login.ejs b/sharedViews/login.ejs
index 94128d1..2914f7b 100644
--- a/sharedViews/login.ejs
+++ b/sharedViews/login.ejs
@@ -101,7 +101,7 @@
       </div>
       <div id='form'>
         <div class='inputContainer'>
-          <input type='text' id='pw' name='pw' autocomplete="off" autofocus/>
+          <input onkeyup="PWKeyUp(this)" type='text' id='pw' name='pw' autocomplete="off" autofocus/>
           <input type='hidden' id='cid' name='pw' autocomplete="off"/>
         </div>
         <div class='ircLinkContainer' >
@@ -112,6 +112,12 @@
     </div>
   </body>
   <script>
+    function PWKeyUp (inputField) {
+      if (event.keyCode === 13) {
+        event.preventDefault();
+        Login(document.getElementById('sendButton'))
+      }
+    }
     function HandleFeedbackResp (resp) {
       document.getElementById('sendButton').innerText = 'Submit'
       const textNode = document.getElementById('text')

From d55115f353bf0a948d8dea6686403a2d20a3dc03 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:34:25 +0200
Subject: [PATCH 4/5] Added quick vote for user feedback

---
 modules/api/api.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/modules/api/api.js b/modules/api/api.js
index fc1be82..027a9a9 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -39,6 +39,7 @@ const passwordFile = 'data/dataEditorPasswords.json'
 const dataEditsLog = 'stats/dataEdits'
 const dailyDataCountFile = 'stats/dailyDataCount'
 const usersDbBackupPath = 'data/dbs/backup'
+const quickVoteResultsDir = 'stats/qvote'
 
 // other constants
 const maxVeteranPwGetCount = 10
@@ -129,6 +130,56 @@ function GetApp () {
 
   // -------------------------------------------------------------
 
+  app.get('/quickvote', (req, res) => {
+    const key = req.query.key
+    const val = req.query.val
+
+    if (!key || !val) {
+      res.json({
+        results: 'error',
+        msg: 'no key or val query param!'
+      })
+      return
+    }
+
+    const voteFile = quickVoteResultsDir + '/' + key + '.json'
+    const user = req.session.user
+
+    let voteData = {
+      votes: {},
+      users: []
+    }
+
+    if (utils.FileExists(voteFile)) {
+      voteData = utils.ReadJSON(voteFile)
+    } else {
+      utils.CreatePath(quickVoteResultsDir)
+    }
+
+    if (!voteData.users.includes(user.id)) {
+      if (voteData[val]) {
+        voteData.votes[val]++
+      } else {
+        voteData.votes[val] = 1
+      }
+      voteData.users.push(user.id)
+
+      logger.Log(`Vote from #${user.id}: ${key}: ${val}`, logger.GetColor('blue'))
+      res.json({
+        result: 'success',
+        msg: 'vote added'
+      })
+    } else {
+      logger.Log(`#${user.id} already voted for: ${key}: ${val}`, logger.GetColor('blue'))
+      res.json({
+        result: 'success',
+        msg: 'already voted'
+      })
+    }
+
+    utils.WriteFile(JSON.stringify(voteData), voteFile)
+  })
+
   app.get('/avaiblePWS', (req, res) => {
     logger.LogReq(req)
 

From bd8e46f6c726213597df1654e40ddfab535c2a06 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:51:49 +0200
Subject: [PATCH 5/5] Showing vote thanks page, restricting vote names to pre
 specified ones

---
 modules/api/api.js              | 26 ++++++++++++++++++++++----
 modules/api/views/votethank.ejs | 31 +++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100755 modules/api/views/votethank.ejs

diff --git a/modules/api/api.js b/modules/api/api.js
index 027a9a9..c4b22bf 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -40,6 +40,7 @@ const dataEditsLog = 'stats/dataEdits'
 const dailyDataCountFile = 'stats/dailyDataCount'
 const usersDbBackupPath = 'data/dbs/backup'
 const quickVoteResultsDir = 'stats/qvote'
+const quickVotes = 'stats/qvote/votes.json'
 
 // other constants
 const maxVeteranPwGetCount = 10
@@ -135,13 +136,30 @@ function GetApp () {
     const val = req.query.val
 
     if (!key || !val) {
-      res.json({
+      res.render('votethank', {
         results: 'error',
         msg: 'no key or val query param!'
       })
       return
     }
 
+    let votes = {}
+    if (utils.FileExists(quickVotes)) {
+      votes = utils.ReadJSON(quickVotes)
+    } else {
+      res.render('votethank', {
+        result: 'no such pool'
+      })
+      return
+    }
+
+    if (!votes.voteNames.includes(key)) {
+      res.render('votethank', {
+        result: 'no such pool'
+      })
+      return
+    }
+
     const voteFile = quickVoteResultsDir + '/' + key + '.json'
     const user = req.session.user
 
@@ -165,14 +183,14 @@ function GetApp () {
       voteData.users.push(user.id)
 
       logger.Log(`Vote from #${user.id}: ${key}: ${val}`, logger.GetColor('blue'))
-      res.json({
+      res.render('votethank', {
         result: 'success',
         msg: 'vote added'
       })
     } else {
       logger.Log(`#${user.id} already voted for: ${key}: ${val}`, logger.GetColor('blue'))
-      res.json({
-        result: 'success',
+      res.render('votethank', {
+        result: 'already voted',
         msg: 'already voted'
       })
     }
diff --git a/modules/api/views/votethank.ejs b/modules/api/views/votethank.ejs
new file mode 100755
index 0000000..bf1d266
--- /dev/null
+++ b/modules/api/views/votethank.ejs
@@ -0,0 +1,31 @@
+<html>
+<body bgcolor="#212127">
+  <head>
+    <title>Shit uploader</title>
+    <meta charset="UTF-8">
+    <style>
+        .main {
+            font-size: 28px;
+            color: #ffffff;
+            text-align: center;
+        }
+    </style>
+  </head>
+  <div class='main'>
+    <%
+       if (result == 'success') {
+       %> ty a szavazásért c: <% 
+       } else if (result == 'no such pool') {
+       %> Ilyen nevű szavazás nincs :c <% 
+       } else if (result == 'already voted') {
+       %> Már szavaztál, de azért ty c: <% 
+       } else if (result == 'error') {
+       %> Helytelen url paraméterek :c <%
+       } else {
+       %> bit of a fuckup here <%
+       }
+     %>
+    ty c:
+  </div>
+</body>
+</html>