Merge branch 'main' into marketplace

This commit is contained in:
Expand-sys 2021-05-03 21:37:26 +10:00 committed by GitHub
commit 6bab27e224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -178,16 +178,17 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){
console.log(logrec.timings)
console.log("query finished "+Date.now())
logsent = logsent.body.value
if(logsent == 1 || logsent == -1 || logsent == null){
logsent = undefined
}else{
logsent = logsent.filter(({ from }) => from === req.session.user)
logsent = await logsent.filter(({ from }) => from === req.session.user)
}
logrec = logrec.body.value
if(logrec == 1 || logrec == -1 || logrec == null){
if(logrec === 1 || logrec === -1 || logrec === null){
logrec = undefined
} else{
logrec = logrec.filter(({ to }) => to === req.session.user)
logrec = await logrec.filter(({ to }) => to === req.session.user)
}
for( i in logrec){
logrec[i].time = Date(logrec[i].time)
@ -264,7 +265,7 @@ app.post('/sendfunds', async function(req, res){
logsent = logsent.body.value
console.log(logsent)
if(logsent == 1|| logrec == -1 || logrec == null){
if(logsent == 1|| logsent == -1 || logsent == null){
logsent = undefined
}else{
logsent = await logsent.filter(({ from }) => from === req.session.user)