Not really sure what is going on, have not done a commit in a while.

I assume this is all the metric tracking changes.
Looks like some script changes as well.
This commit is contained in:
Max committed 2023-02-12 18:41:55 +00:00
1 parent 48c1fa8e69
commit 39e153b8e1
15 files changed
+303 -1480

No files matched your search

+35 -4
View File
@@ -9,7 +9,7 @@ const speakeasy = require('speakeasy')
let User = module.exports = {}
const version = '3.6.2'
const version = '3.6.3'
//Login a user, if that user does not exist create them
//Issues login token
@@ -193,13 +193,13 @@ User.register = (username, password) => {
}
//Counts notes, pinned notes, archived notes, shared notes, unread notes, total files and types
User.getCounts = (userId) => {
User.getCounts = (userId, extendedOptions) => {
return new Promise((resolve, reject) => {
let countTotals = {
tags: {}
}
const userHash = cs.hash(String(userId)).toString('base64')
// const userHash = cs.hash(String(userId)).toString('base64')
db.promise().query(
`SELECT
@@ -279,7 +279,38 @@ User.getCounts = (userId) => {
countTotals['currentVersion'] = version
resolve(countTotals)
// Allow for extended options set on page load
if(extendedOptions){
db.promise().query(
`SELECT updated FROM note
JOIN note_raw_text ON note_raw_text.id = note.note_raw_text_id
WHERE note.quick_note = 2
AND user_id = ?`, [userId])
.then( (rows, fields) => {
if(rows[0][0] && rows[0][0].updated){
const lastOpened = rows[0][0].updated
const timeDiff = Math.round(((+new Date) - (lastOpened))/1000)
const hoursInSeconds = (12 * 60 * 60) //12 hours
// Show metric tracking button if its been 12 hours since last entry
if(lastOpened && timeDiff > hoursInSeconds){
countTotals['showTrackMetricsButton'] = true
}
}
resolve(countTotals)
})
} else {
resolve(countTotals)
}
})
})