Make timelineless status adding possible.

This commit is contained in:
Roger Braun 2016-11-24 18:15:34 +01:00
parent 81c6f6e21f
commit a5f523922c
2 changed files with 33 additions and 11 deletions

View file

@ -1,4 +1,4 @@
import { remove, map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max } from 'lodash' import { remove, map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max, isArray } from 'lodash'
import moment from 'moment' import moment from 'moment'
import apiService from '../services/api/api.service.js' import apiService from '../services/api/api.service.js'
// import parse from '../services/status_parser/status_parser.js' // import parse from '../services/status_parser/status_parser.js'
@ -100,11 +100,17 @@ const mergeOrAdd = (arr, item) => {
} }
const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {} }) => { const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {} }) => {
// Sanity check
if (!isArray(statuses)) {
return false
}
const allStatuses = state.allStatuses const allStatuses = state.allStatuses
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.
const updateMaxId = ({id}) => { const updateMaxId = ({id}) => {
if (!timeline) { return false }
timelineObject.maxId = max([id, timelineObject.maxId]) timelineObject.maxId = max([id, timelineObject.maxId])
} }
@ -117,15 +123,15 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
} }
// Some statuses should only be added to the global status repository. // Some statuses should only be added to the global status repository.
if (addToTimeline) { if (timeline && addToTimeline) {
mergeOrAdd(timelineObject.statuses, status) mergeOrAdd(timelineObject.statuses, status)
} }
if (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, status)
} else if (addToTimeline && result.new) { } else if (timeline && addToTimeline && result.new) {
// Just change newStatuscount // Just change newStatuscount
timelineObject.newStatusCount += 1 timelineObject.newStatusCount += 1
} }
@ -159,7 +165,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
let retweet let retweet
// If the retweeted status is already there, don't add the retweet // If the retweeted status is already there, don't add the retweet
// to the timeline. // to the timeline.
if (find(timelineObject.visibleStatuses, {id: retweetedStatus.id})) { if (timeline && find(timelineObject.visibleStatuses, {id: retweetedStatus.id})) {
// Already have it visible, don't add to timeline, don't show. // Already have it visible, don't add to timeline, don't show.
retweet = addStatus(status, false, false) retweet = addStatus(status, false, false)
} else { } else {
@ -177,8 +183,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
updateMaxId(deletion) updateMaxId(deletion)
remove(allStatuses, { uri }) remove(allStatuses, { uri })
if (timeline) {
remove(timelineObject.statuses, { uri }) remove(timelineObject.statuses, { uri })
remove(timelineObject.visibleStatuses, { uri }) remove(timelineObject.visibleStatuses, { uri })
}
}, },
'default': (unknown) => { 'default': (unknown) => {
console.log(unknown) console.log(unknown)
@ -192,9 +200,11 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
}) })
// Keep the visible statuses sorted // Keep the visible statuses sorted
if (timeline) {
timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id) timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id)
timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id) timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id)
timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id
}
} }
export const mutations = { export const mutations = {
@ -228,7 +238,7 @@ export const mutations = {
const statuses = { const statuses = {
state: defaultState, state: defaultState,
actions: { actions: {
addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline }) { addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false }) {
commit('addNewStatuses', { statuses, showImmediately, timeline, user: rootState.users.currentUser }) commit('addNewStatuses', { statuses, showImmediately, timeline, user: rootState.users.currentUser })
}, },
favorite ({ rootState, commit }, status) { favorite ({ rootState, commit }, status) {

View file

@ -67,6 +67,18 @@ describe('The Statuses module', () => {
expect(state.timelines.public.newStatusCount).to.equal(1) expect(state.timelines.public.newStatusCount).to.equal(1)
}) })
it('add the statuses to allStatuses if no timeline is given', () => {
const state = cloneDeep(defaultState)
const status = makeMockStatus({id: 1})
mutations.addNewStatuses(state, { statuses: [status] })
expect(state.allStatuses).to.eql([status])
expect(state.timelines.public.statuses).to.eql([])
expect(state.timelines.public.visibleStatuses).to.eql([])
expect(state.timelines.public.newStatusCount).to.equal(0)
})
it('adds the status to allStatuses and to the given timeline, directly visible', () => { it('adds the status to allStatuses and to the given timeline, directly visible', () => {
const state = cloneDeep(defaultState) const state = cloneDeep(defaultState)
const status = makeMockStatus({id: 1}) const status = makeMockStatus({id: 1})