albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server

Browse source
This commit is contained in:
MrFry 2020-04-20 22:17:10 +02:00
commit 80a695c627
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/api/api.js
View file

@ -134,6 +134,7 @@ function GetApp () {
app.get('/quickvote', (req, res) => { app.get('/quickvote', (req, res) => {
const key = req.query.key const key = req.query.key
const val = req.query.val const val = req.query.val
const user = req.session.user
if (!key || !val) { if (!key || !val) {
res.render('votethank', { res.render('votethank', {
@ -147,6 +148,7 @@ function GetApp () {
if (utils.FileExists(quickVotes)) { if (utils.FileExists(quickVotes)) {
votes = utils.ReadJSON(quickVotes) votes = utils.ReadJSON(quickVotes)
} else { } else {
logger.Log(`No such vote "${key}", and quickVotes.json is missing ( #${user.id}: ${key}-${val} )`, logger.GetColor('blue'))
res.render('votethank', { res.render('votethank', {
result: 'no such pool' result: 'no such pool'
}) })
@ -154,6 +156,7 @@ function GetApp () {
} }
if (!votes.voteNames.includes(key)) { if (!votes.voteNames.includes(key)) {
logger.Log(`No such vote "${key}" ( #${user.id}: ${key}-${val} )`, logger.GetColor('blue'))
res.render('votethank', { res.render('votethank', {
result: 'no such pool' result: 'no such pool'
}) })
@ -161,7 +164,6 @@ function GetApp () {
} }
const voteFile = quickVoteResultsDir + '/' + key + '.json' const voteFile = quickVoteResultsDir + '/' + key + '.json'
const user = req.session.user
let voteData = { let voteData = {
votes: {}, votes: {},

2
utils/actions.js
View file

@ -22,7 +22,7 @@ module.exports = {
LoadJSON: LoadJSON LoadJSON: LoadJSON
} }
const dataFile = './public/data.json' const dataFile = './qminingPublic/data.json'
const recDataFile = './stats/recdata' const recDataFile = './stats/recdata'
const logger = require('../utils/logger.js') const logger = require('../utils/logger.js')

2
utils/utils.js
View file

@ -18,7 +18,7 @@ var fs = require('fs')
var logger = require('../utils/logger.js') var logger = require('../utils/logger.js')
const dataFile = './public/data.json' const dataFile = './qminingPublic/data.json'
function GetDateString () { function GetDateString () {
const m = new Date() const m = new Date()