Changed api so eslint is happy

This commit is contained in:
mrfry 2020-10-01 16:00:34 +02:00
parent 9b0d343212
commit 66e4a03bdf

View file

@ -55,17 +55,17 @@ let url // eslint-disable-line
let publicdirs = [] let publicdirs = []
function GetApp() { function GetApp() {
const p = publicdirs[0] const publicDir = publicdirs[0]
if (!p) { if (!publicDir) {
throw new Error(`No public dir! ( API )`) throw new Error(`No public dir! ( API )`)
} }
// files in public dirs // files in public dirs
const recivedFiles = p + 'recivedfiles' const recivedFiles = publicDir + 'recivedfiles'
const uloadFiles = p + 'f' const uloadFiles = publicDir + 'f'
const dataFile = p + 'data.json' const dataFile = publicDir + 'data.json'
const motdFile = p + 'motd' const motdFile = publicDir + 'motd'
const versionFile = p + 'version' const versionFile = publicDir + 'version'
app.use( app.use(
bodyParser.urlencoded({ bodyParser.urlencoded({
@ -560,13 +560,13 @@ function GetApp() {
logger.Log('Uploading: ' + filename, logger.GetColor('blue')) logger.Log('Uploading: ' + filename, logger.GetColor('blue'))
utils.CreatePath(path, true) utils.CreatePath(path, true)
let d = new Date() let date = new Date()
let fn = let fn =
d.getHours() + date.getHours() +
'' + '' +
d.getMinutes() + date.getMinutes() +
'' + '' +
d.getSeconds() + date.getSeconds() +
'_' + '_' +
filename filename
@ -584,9 +584,9 @@ function GetApp() {
res.end('something bad happened :s') res.end('something bad happened :s')
}) })
}) })
} catch (e) { } catch (err) {
logger.Log(`Unable to upload file!`, logger.GetColor('redbg')) logger.Log(`Unable to upload file!`, logger.GetColor('redbg'))
console.log(e) console.log(err)
} }
} }
@ -635,8 +635,8 @@ function GetApp() {
// finding user // finding user
const pwds = JSON.parse(utils.ReadFile(passwordFile)) const pwds = JSON.parse(utils.ReadFile(passwordFile))
let user = Object.keys(pwds).find((key) => { let user = Object.keys(pwds).find((key) => {
const u = pwds[key] const user = pwds[key]
return u.password === password return user.password === password
}) })
user = pwds[user] user = pwds[user]
@ -706,10 +706,10 @@ function GetApp() {
user: user.name, user: user.name,
}) })
logger.Log('Data updating done!', logger.GetColor('bluebg')) logger.Log('Data updating done!', logger.GetColor('bluebg'))
} catch (e) { } catch (error) {
logger.Log(`Data upload error! `, logger.GetColor('redbg')) logger.Log(`Data upload error! `, logger.GetColor('redbg'))
console.error(e) console.error(error)
res.json({ status: respStatuses.error, msg: e.message }) res.json({ status: respStatuses.error, msg: error.message })
} }
}) })
@ -729,10 +729,10 @@ function GetApp() {
{ motd, version }, { motd, version },
dryRun dryRun
) )
.then((r) => { .then((result) => {
res.json({ res.json({
success: r !== -1, success: result !== -1,
newQuestions: r, newQuestions: result,
}) })
}) })
}) })
@ -753,20 +753,20 @@ function GetApp() {
let recData = {} let recData = {}
try { try {
recData = JSON.parse(req.query.data) recData = JSON.parse(req.query.data)
} catch (e) { } catch (error) {
logger.Log( logger.Log(
`Unable to parse recieved question data! '${req.query.data}'`, `Unable to parse recieved question data! '${req.query.data}'`,
logger.GetColor('redbg') logger.GetColor('redbg')
) )
} }
let r = data.Search(question, subj, recData) let result = data.Search(question, subj, recData)
res.json({ res.json({
result: r, result: result,
success: true, success: true,
}) })
logger.DebugLog(`Question result length: ${r.length}`, 'ask', 1) logger.DebugLog(`Question result length: ${result.length}`, 'ask', 1)
logger.DebugLog(r, 'ask', 2) logger.DebugLog(result, 'ask', 2)
} else { } else {
logger.DebugLog(`Invalid question`, 'ask', 1) logger.DebugLog(`Invalid question`, 'ask', 1)
res.json({ res.json({
@ -882,12 +882,12 @@ function GetApp() {
return Math.floor(msdiff / (1000 * 3600 * 24)) return Math.floor(msdiff / (1000 * 3600 * 24))
} }
users.forEach((u) => { users.forEach((user) => {
if (u.avaiblePWRequests >= maxPWCount) { if (user.avaiblePWRequests >= maxPWCount) {
return return
} }
const dayDiff = getDayDiff(u.created) const dayDiff = getDayDiff(user.created)
// if (dayDiff < daysAfterUserGetsPWs) { // if (dayDiff < daysAfterUserGetsPWs) {
// logger.Log(`User #${u.id} is not registered long enough to get password ( ${dayDiff} days, ${daysAfterUserGetsPWs} needed)`, logger.GetColor('cyan')) // logger.Log(`User #${u.id} is not registered long enough to get password ( ${dayDiff} days, ${daysAfterUserGetsPWs} needed)`, logger.GetColor('cyan'))
// return // return
@ -895,19 +895,19 @@ function GetApp() {
if (dayDiff % addPWPerDay === 0) { if (dayDiff % addPWPerDay === 0) {
logger.Log( logger.Log(
`Incrementing avaible PW-s for user #${u.id}: ${ `Incrementing avaible PW-s for user #${user.id}: ${
u.avaiblePWRequests user.avaiblePWRequests
} -> ${u.avaiblePWRequests + 1}`, } -> ${user.avaiblePWRequests + 1}`,
logger.GetColor('cyan') logger.GetColor('cyan')
) )
dbtools.Update( dbtools.Update(
userDB, userDB,
'users', 'users',
{ {
avaiblePWRequests: u.avaiblePWRequests + 1, avaiblePWRequests: user.avaiblePWRequests + 1,
}, },
{ {
id: u.id, id: user.id,
} }
) )
} }