Changed auth exceptions, saving question from /ask if its matches are less than 90%

This commit is contained in:
mrfry 2021-04-30 16:08:34 +02:00
parent d5f6f22262
commit 742f8866c7
3 changed files with 24 additions and 28 deletions

View file

@ -19,7 +19,8 @@
"nextdir": "nextStatic/qminingPagePublic", "nextdir": "nextStatic/qminingPagePublic",
"name": "qmining", "name": "qmining",
"urls": [ "urls": [
"qmining.frylabs.net" "qmining.frylabs.net",
"localhost"
], ],
"isNextJs": true "isNextJs": true
}, },
@ -30,9 +31,7 @@
], ],
"name": "api", "name": "api",
"urls": [ "urls": [
"api.frylabs.net", "api.frylabs.net"
"localhost",
"superhedghog.frylabs.net"
] ]
}, },
"main": { "main": {

View file

@ -437,7 +437,7 @@ function setup(data: SubmoduleData): any {
) )
}) })
app.get('/allqr.txt', function(req: Request, res: any) { app.get('/allqr.txt', function (req: Request, res: any) {
logger.LogReq(req) logger.LogReq(req)
const db: any = req.query.db const db: any = req.query.db
let stringifiedData = '' let stringifiedData = ''
@ -475,7 +475,7 @@ function setup(data: SubmoduleData): any {
res.end(stringifiedData) res.end(stringifiedData)
}) })
app.post('/isAdding', function(req: Request, res: any) { app.post('/isAdding', function (req: Request, res: any) {
logger.LogReq(req) logger.LogReq(req)
const user: User = req.session.user const user: User = req.session.user
const dryRun = testUsers.includes(user.id) const dryRun = testUsers.includes(user.id)
@ -563,7 +563,7 @@ function setup(data: SubmoduleData): any {
} }
}) })
app.post('/ask', function(req: Request, res) { app.post('/ask', function (req: Request, res) {
const user: User = req.session.user const user: User = req.session.user
if (!req.body.questions) { if (!req.body.questions) {
@ -604,7 +604,11 @@ function setup(data: SubmoduleData): any {
res.json(response) res.json(response)
const saveableQuestions = response.reduce((acc, res) => { const saveableQuestions = response.reduce((acc, res) => {
if (res.answers.length === 0) { const save = res.answers.every((answer) => {
return answer.match < 90
})
if (save) {
acc.push(res.question) acc.push(res.question)
} }
return acc return acc
@ -621,7 +625,8 @@ function setup(data: SubmoduleData): any {
} }
}) })
}) })
app.get('/ask', function(req: Request, res) {
app.get('/ask', function (req: Request, res) {
if (Object.keys(req.query).length === 0) { if (Object.keys(req.query).length === 0) {
logger.DebugLog(`No query params /ask GET`, 'ask', 1) logger.DebugLog(`No query params /ask GET`, 'ask', 1)
res.json({ res.json({
@ -657,7 +662,7 @@ function setup(data: SubmoduleData): any {
}) })
} }
}) })
app.get('/datacount', function(req: Request, res: any) { app.get('/datacount', function (req: Request, res: any) {
logger.LogReq(req) logger.LogReq(req)
if (req.query.detailed === 'all') { if (req.query.detailed === 'all') {
res.json({ res.json({
@ -670,7 +675,7 @@ function setup(data: SubmoduleData): any {
res.json(getSimplreRes(questionDbs)) res.json(getSimplreRes(questionDbs))
} }
}) })
app.get('/infos', function(req: Request, res) { app.get('/infos', function (req: Request, res) {
const user: User = req.session.user const user: User = req.session.user
const result: any = { const result: any = {
@ -715,7 +720,7 @@ function setup(data: SubmoduleData): any {
res.json({ msg: 'done' }) res.json({ msg: 'done' })
}) })
app.post('/registerscript', function(req: Request, res) { app.post('/registerscript', function (req: Request, res) {
logger.LogReq(req) logger.LogReq(req)
if (!utils.FileExists(registeredScriptsFile)) { if (!utils.FileExists(registeredScriptsFile)) {
@ -777,7 +782,7 @@ function setup(data: SubmoduleData): any {
logger.LogReq(req) logger.LogReq(req)
const files = utils.ReadDir(savedQuestionsDir) const files = utils.ReadDir(savedQuestionsDir)
files.sort(function(a, b) { files.sort(function (a, b) {
return ( return (
fs.statSync(savedQuestionsDir + '/' + b).mtime.getTime() - fs.statSync(savedQuestionsDir + '/' + b).mtime.getTime() -
fs.statSync(savedQuestionsDir + '/' + a).mtime.getTime() fs.statSync(savedQuestionsDir + '/' + a).mtime.getTime()

View file

@ -54,15 +54,7 @@ function GetApp(): ModuleType {
auth({ auth({
userDB: userDB, userDB: userDB,
jsonResponse: false, jsonResponse: false,
exceptions: [ exceptions: ['/favicon.ico', '/img/'],
'/thanks',
'/thanks.html',
'/img/thanks.gif',
'/favicon.ico',
'/moodle-test-userscript/stable.user.js',
'/irc',
'/donate',
],
}) })
) )
app.use((req: Request, res, next) => { app.use((req: Request, res, next) => {
@ -112,7 +104,7 @@ function GetApp(): ModuleType {
// -------------------------------------------------------------- // --------------------------------------------------------------
// to be backwards compatible // to be backwards compatible
app.get('/ask', function(req: Request, res) { app.get('/ask', function (req: Request, res) {
logger.DebugLog(`Qmining module ask redirect`, 'ask', 1) logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
res.redirect( res.redirect(
`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}` `http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`
@ -192,7 +184,7 @@ function GetApp(): ModuleType {
] ]
simpleRedirects.forEach((redirect) => { simpleRedirects.forEach((redirect) => {
app.get(redirect.from, function(req: Request, res) { app.get(redirect.from, function (req: Request, res) {
if (!redirect.nolog) { if (!redirect.nolog) {
logger.LogReq(req) logger.LogReq(req)
} }
@ -220,7 +212,7 @@ function GetApp(): ModuleType {
routes.forEach((route) => { routes.forEach((route) => {
logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1) logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
app.get(`/${route}`, function(req: Request, res) { app.get(`/${route}`, function (req: Request, res) {
res.redirect( res.redirect(
utils.formatUrl({ utils.formatUrl({
pathname: `${route}.html`, pathname: `${route}.html`,
@ -234,16 +226,16 @@ function GetApp(): ModuleType {
// -------------------------------------------------------------- // --------------------------------------------------------------
app.get('/', function(req: Request, res) { app.get('/', function (req: Request, res) {
res.end('hai') res.end('hai')
logger.LogReq(req) logger.LogReq(req)
}) })
app.get('*', function(req: Request, res) { app.get('*', function (req: Request, res) {
res.status(404).render('404') res.status(404).render('404')
}) })
app.post('*', function(req: Request, res) { app.post('*', function (req: Request, res) {
res.status(404).render('404') res.status(404).render('404')
}) })