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