Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3478 from omnivore-app/fix/reduce-reading-progress

Browse Source 
Use the DB stored reading progress when calculating maxes
This commit is contained in:
Jackson Harper
2024-02-01 16:52:46 +08:00
committed by GitHub
parent f03b7182b3 3feef7ca66
commit fe5d986e91
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/api/src/resolvers/function_resolvers.ts
View File

@ -171,7 +171,10 @@ const readingProgressHandlers = {
article.id
)
if (readingProgress) {
return readingProgress.readingProgressPercent
return Math.max(
article.readingProgressPercent ?? 0,
readingProgress.readingProgressPercent
)
}
}
return article.readingProgressPercent
@ -187,8 +190,11 @@ const readingProgressHandlers = {
ctx.claims?.uid,
article.id
)
if (readingProgress) {
return readingProgress.readingProgressAnchorIndex
if (readingProgress && readingProgress.readingProgressAnchorIndex) {
return Math.max(
article.readingProgressAnchorIndex ?? 0,
readingProgress.readingProgressAnchorIndex
)
}
}
return article.readingProgressAnchorIndex
@ -204,8 +210,11 @@ const readingProgressHandlers = {
ctx.claims?.uid,
article.id
)
if (readingProgress) {
return readingProgress.readingProgressTopPercent
if (readingProgress && readingProgress.readingProgressTopPercent) {
return Math.max(
article.readingProgressTopPercent ?? 0,
readingProgress.readingProgressTopPercent
)
}
}
return article.readingProgressTopPercent