cybrespace
/
pinafore
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix offline order of status threads

This commit is contained in:
Nolan Lawson 2018-02-11 09:36:01 -08:00
parent f436ca6d2e
commit 9411490780
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
routes/_database/timelines.js
View File

@ -14,13 +14,21 @@ const ACCOUNT_ID = '__pinafore_acct_id'
const STATUS_ID = '__pinafore_status_id' const STATUS_ID = '__pinafore_status_id'
const REBLOG_ID = '__pinafore_reblog_id' const REBLOG_ID = '__pinafore_reblog_id'
function createKeyRange (timeline, maxId) { function createTimelineKeyRange (timeline, maxId) {
let negBigInt = maxId && toReversePaddedBigInt(maxId) let negBigInt = maxId && toReversePaddedBigInt(maxId)
let start = negBigInt ? (timeline + '\u0000' + negBigInt) : (timeline + '\u0000') let start = negBigInt ? (timeline + '\u0000' + negBigInt) : (timeline + '\u0000')
let end = timeline + '\u0000\uffff' let end = timeline + '\u0000\uffff'
return IDBKeyRange.bound(start, end, true, true) return IDBKeyRange.bound(start, end, true, true)
} }
// special case for threads – these are in chronological order rather than reverse
// chronological order, and we fetch everything all at once rather than paginating
function createKeyRangeForStatusThread (timeline) {
let start = timeline + '\u0000'
let end = timeline + '\u0000\uffff'
return IDBKeyRange.bound(start, end, true, true)
}
function cloneForStorage(obj) { function cloneForStorage(obj) {
let res = {} let res = {}
let keys = Object.keys(obj) let keys = Object.keys(obj)
@ -58,7 +66,7 @@ async function getNotificationTimeline (instanceName, timeline, maxId, limit) {
const db = await getDatabase(instanceName) const db = await getDatabase(instanceName)
return dbPromise(db, storeNames, 'readonly', (stores, callback) => { return dbPromise(db, storeNames, 'readonly', (stores, callback) => {
let [ timelineStore, notificationsStore, statusesStore, accountsStore ] = stores let [ timelineStore, notificationsStore, statusesStore, accountsStore ] = stores
let keyRange = createKeyRange(timeline, maxId) let keyRange = createTimelineKeyRange(timeline, maxId)
timelineStore.getAll(keyRange, limit).onsuccess = e => { timelineStore.getAll(keyRange, limit).onsuccess = e => {
let timelineResults = e.target.result let timelineResults = e.target.result
@ -78,10 +86,18 @@ async function getStatusTimeline (instanceName, timeline, maxId, limit) {
const db = await getDatabase(instanceName) const db = await getDatabase(instanceName)
return dbPromise(db, storeNames, 'readonly', (stores, callback) => { return dbPromise(db, storeNames, 'readonly', (stores, callback) => {
let [ timelineStore, statusesStore, accountsStore ] = stores let [ timelineStore, statusesStore, accountsStore ] = stores
let keyRange = createKeyRange(timeline, maxId) // Status threads are a special case - these are in forward chronological order
// and we fetch them all at once instead of paginating.
let isStatusThread = timeline.startsWith('status/')
let getReq = isStatusThread ?
timelineStore.getAll(createKeyRangeForStatusThread(timeline)) :
timelineStore.getAll(createTimelineKeyRange(timeline, maxId), limit)
timelineStore.getAll(keyRange, limit).onsuccess = e => { getReq.onsuccess = e => {
let timelineResults = e.target.result let timelineResults = e.target.result
if (isStatusThread) {
timelineResults = timelineResults.reverse()
}
let res = new Array(timelineResults.length) let res = new Array(timelineResults.length)
timelineResults.forEach((timelineResult, i) => { timelineResults.forEach((timelineResult, i) => {
fetchStatus(statusesStore, accountsStore, timelineResult.statusId, status => { fetchStatus(statusesStore, accountsStore, timelineResult.statusId, status => {