Add caching system to statuses.

This commit is contained in:
Roger Braun 2017-03-08 21:04:48 +01:00
parent 5699872bb5
commit 0d39ed809b
1 changed files with 24 additions and 10 deletions

View File

@ -4,14 +4,17 @@ import apiService from '../services/api/api.service.js'
export const defaultState = { export const defaultState = {
allStatuses: [], allStatuses: [],
allStatusesObject: {},
maxId: 0, maxId: 0,
notifications: [], notifications: [],
favorites: new Set(), favorites: new Set(),
timelines: { timelines: {
mentions: { mentions: {
statuses: [], statuses: [],
statusesObject: {},
faves: [], faves: [],
visibleStatuses: [], visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0, newStatusCount: 0,
maxId: 0, maxId: 0,
minVisibleId: 0, minVisibleId: 0,
@ -20,8 +23,10 @@ export const defaultState = {
}, },
public: { public: {
statuses: [], statuses: [],
statusesObject: {},
faves: [], faves: [],
visibleStatuses: [], visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0, newStatusCount: 0,
maxId: 0, maxId: 0,
minVisibleId: 0, minVisibleId: 0,
@ -30,8 +35,10 @@ export const defaultState = {
}, },
publicAndExternal: { publicAndExternal: {
statuses: [], statuses: [],
statusesObject: {},
faves: [], faves: [],
visibleStatuses: [], visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0, newStatusCount: 0,
maxId: 0, maxId: 0,
minVisibleId: 0, minVisibleId: 0,
@ -40,8 +47,10 @@ export const defaultState = {
}, },
friends: { friends: {
statuses: [], statuses: [],
statusesObject: {},
faves: [], faves: [],
visibleStatuses: [], visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0, newStatusCount: 0,
maxId: 0, maxId: 0,
minVisibleId: 0, minVisibleId: 0,
@ -91,8 +100,9 @@ export const findMaxId = (...args) => {
return (maxBy(flatten(args), 'id') || {}).id return (maxBy(flatten(args), 'id') || {}).id
} }
const mergeOrAdd = (arr, item) => { const mergeOrAdd = (arr, obj, item) => {
const oldItem = find(arr, {id: item.id}) const oldItem = obj[item.id]
if (oldItem) { if (oldItem) {
// We already have this, so only merge the new info. // We already have this, so only merge the new info.
merge(oldItem, item) merge(oldItem, item)
@ -103,6 +113,7 @@ const mergeOrAdd = (arr, item) => {
// This is a new item, prepare it // This is a new item, prepare it
prepareStatus(item) prepareStatus(item)
arr.push(item) arr.push(item)
obj[item.id] = item
return {item, new: true} return {item, new: true}
} }
} }
@ -122,6 +133,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
} }
const allStatuses = state.allStatuses const allStatuses = state.allStatuses
const allStatusesObject = state.allStatusesObject
const timelineObject = state.timelines[timeline] const timelineObject = state.timelines[timeline]
// Set the maxId to the new id if it's larger. // Set the maxId to the new id if it's larger.
@ -131,7 +143,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
} }
const addStatus = (status, showImmediately, addToTimeline = true) => { const addStatus = (status, showImmediately, addToTimeline = true) => {
const result = mergeOrAdd(allStatuses, status) const result = mergeOrAdd(allStatuses, allStatusesObject, status)
status = result.item status = result.item
if (result.new) { if (result.new) {
@ -147,7 +159,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
// Add the mention to the mentions timeline // Add the mention to the mentions timeline
if (timelineObject !== mentions) { if (timelineObject !== mentions) {
mergeOrAdd(mentions.statuses, status) mergeOrAdd(mentions.statuses, mentions.statusesObject, status)
mentions.newStatusCount += 1 mentions.newStatusCount += 1
sortTimeline(mentions) sortTimeline(mentions)
@ -161,13 +173,13 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
let resultForCurrentTimeline let resultForCurrentTimeline
// Some statuses should only be added to the global status repository. // Some statuses should only be added to the global status repository.
if (timeline && addToTimeline) { if (timeline && addToTimeline) {
resultForCurrentTimeline = mergeOrAdd(timelineObject.statuses, status) resultForCurrentTimeline = mergeOrAdd(timelineObject.statuses, timelineObject.statusesObject, status)
} }
if (timeline && showImmediately) { if (timeline && showImmediately) {
// Add it directly to the visibleStatuses, don't change // Add it directly to the visibleStatuses, don't change
// newStatusCount // newStatusCount
mergeOrAdd(timelineObject.visibleStatuses, status) mergeOrAdd(timelineObject.visibleStatuses, timelineObject.visibleStatusesObject, status)
} else if (timeline && addToTimeline && resultForCurrentTimeline.new) { } else if (timeline && addToTimeline && resultForCurrentTimeline.new) {
// Just change newStatuscount // Just change newStatuscount
timelineObject.newStatusCount += 1 timelineObject.newStatusCount += 1
@ -264,24 +276,26 @@ export const mutations = {
oldTimeline.newStatusCount = 0 oldTimeline.newStatusCount = 0
oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50) oldTimeline.visibleStatuses = slice(oldTimeline.statuses, 0, 50)
oldTimeline.visibleStatusesObject = {}
each(oldTimeline.visibleStatuses, (status) => { oldTimeline.visibleStatusesObject[status.id] = status })
}, },
setFavorited (state, { status, value }) { setFavorited (state, { status, value }) {
const newStatus = find(state.allStatuses, status) const newStatus = state.allStatusesObject[status.id]
newStatus.favorited = value newStatus.favorited = value
}, },
setRetweeted (state, { status, value }) { setRetweeted (state, { status, value }) {
const newStatus = find(state.allStatuses, status) const newStatus = state.allStatusesObject[status.id]
newStatus.repeated = value newStatus.repeated = value
}, },
setDeleted (state, { status }) { setDeleted (state, { status }) {
const newStatus = find(state.allStatuses, status) const newStatus = state.allStatusesObject[status.id]
newStatus.deleted = true newStatus.deleted = true
}, },
setLoading (state, { timeline, value }) { setLoading (state, { timeline, value }) {
state.timelines[timeline].loading = value state.timelines[timeline].loading = value
}, },
setNsfw (state, { id, nsfw }) { setNsfw (state, { id, nsfw }) {
const newStatus = find(state.allStatuses, { id }) const newStatus = state.allStatusesObject[id]
newStatus.nsfw = nsfw newStatus.nsfw = nsfw
}, },
setError (state, { timeline, value }) { setError (state, { timeline, value }) {