diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/statuses.js | 177 |
1 files changed, 104 insertions, 73 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 2e921bfe..c088fa1a 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -1,7 +1,7 @@ -import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find } from 'lodash' +import { map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max } from 'lodash' import moment from 'moment' 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' export const defaultState = { allStatuses: [], @@ -37,101 +37,132 @@ export const defaultState = { } } -const statusType = (status) => { - return !status.is_post_verb && status.uri.match(/fave/) ? 'fave' : 'status' -} - -const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading }) => { - const statusesAndFaves = groupBy(addedStatuses, statusType) - const addedFaves = statusesAndFaves['fave'] || [] - const unseenFaves = differenceBy(addedFaves, faves, 'id') - - // Update fave count - each(unseenFaves, ({in_reply_to_status_id}) => { - const status = find(statuses, { id: toInteger(in_reply_to_status_id) }) - if (status) { - status.fave_num += 1 - } - }) - - addedStatuses = statusesAndFaves['status'] || [] +export const prepareStatus = (status) => { + // Parse nsfw tags + if (status.nsfw === undefined) { + const nsfwRegex = /#nsfw/i + status.nsfw = !!status.text.match(nsfwRegex) + } - // Add some html and nsfw to the statuses. - addedStatuses = map(addedStatuses, (status) => { - const statusoid = status.retweeted_status || status + // Set created_at_parsed to initial value + status.created_at_parsed = status.created_at - statusoid.created_at_parsed = statusoid.created_at - // statusoid.statusnet_html = parse(statusoid.statusnet_html) + return status +} - if (statusoid.nsfw === undefined) { - const nsfwRegex = /#nsfw/i - statusoid.nsfw = statusoid.text.match(nsfwRegex) - } +const updateTimestampsInStatuses = (statuses) => { + return map(statuses, (statusoid) => { + const status = statusoid.retweeted_status || statusoid + // Parse date + status.created_at_parsed = moment(status.created_at).fromNow() return status }) +} - const newStatuses = sortBy( - unionBy(addedStatuses, statuses, 'id'), - ({id}) => -id - ) - - let newNewStatusCount = newStatusCount + (newStatuses.length - statuses.length) - - let newVisibleStatuses = visibleStatuses - - if (showImmediately) { - newVisibleStatuses = unionBy(addedStatuses, newVisibleStatuses, 'id') - newVisibleStatuses = sortBy(newVisibleStatuses, ({id}) => -id) - newNewStatusCount = newStatusCount - }; +const statusType = (status) => { + if (status.is_post_verb) { + return 'status' + } - newVisibleStatuses = intersectionBy(newStatuses, newVisibleStatuses, 'id') + if (status.retweeted_status) { + return 'retweet' + } - return { - statuses: newStatuses, - visibleStatuses: newVisibleStatuses, - newStatusCount: newNewStatusCount, - maxId: newStatuses[0].id, - minVisibleId: (last(newVisibleStatuses) || { id: undefined }).id, - faves: unionBy(faves, addedFaves, 'id'), - loading + if (typeof status.uri === 'string' && status.uri.match(/fave/)) { + return 'favorite' } + + return 'unknown' } -const updateTimestampsInStatuses = (statuses) => { - return map(statuses, (statusoid) => { - const status = statusoid.retweeted_status || statusoid +export const findMaxId = (...args) => { + return (maxBy(flatten(args), 'id') || {}).id +} - // Parse date - status.created_at_parsed = moment(status.created_at).fromNow() - return status - }) +const mergeOrAdd = (arr, item) => { + const oldItem = find(arr, {id: item.id}) + if (oldItem) { + // We already have this, so only merge the new info. + merge(oldItem, item) + return oldItem + } else { + // This is a new item, prepare it + prepareStatus(item) + arr.push(item) + return item + } } export const mutations = { addNewStatuses (state, { statuses, showImmediately = false, timeline }) { - state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline]) - state.allStatuses = unionBy(state.timelines[timeline].statuses, state.allStatuses, 'id') + const allStatuses = state.allStatuses + const timelineObject = state.timelines[timeline] - // Set up retweets with most current status - const getRetweets = (result, status) => { - if (status.retweeted_status) { - result.push(status.retweeted_status) - } - return result + // Set the maxId to the new id if it's larger. + const updateMaxId = ({id}) => { + timelineObject.maxId = max([id, timelineObject.maxId]) } - const retweets = reduce(statuses, getRetweets, []) + const addStatus = (status, showImmediately, addToTimeline = true) => { + // Remember the current amount of statuses + // We need that to calculate new status count. + const prevLength = timelineObject.statuses.length + + updateMaxId(status) - state.allStatuses = unionBy(retweets, state.allStatuses, 'id') + status = mergeOrAdd(allStatuses, status) - each(state.allStatuses, (status) => { - if (status.retweeted_status) { - const retweetedStatus = find(state.allStatuses, { id: status.retweeted_status.id }) - status.retweeted_status = retweetedStatus + // Some statuses should only be added to the global status repository. + if (addToTimeline) { + mergeOrAdd(timelineObject.statuses, status) } + + if (showImmediately) { + // Add it directly to the visibleStatuses, don't change + // newStatusCount + mergeOrAdd(timelineObject.visibleStatuses, status) + } else { + // Just change newStatuscount + timelineObject.newStatusCount += (timelineObject.statuses.length - prevLength) + } + + return status + } + + const favoriteStatus = (favorite) => { + const status = find(allStatuses, { id: toInteger(favorite.in_reply_to_status_id) }) + if (status) { + status.fave_num += 1 + } + return status + } + + const processors = { + 'status': (status) => { + addStatus(status, showImmediately) + }, + 'retweet': (status) => { + // RetweetedStatuses are never shown immediately + const retweetedStatus = addStatus(status.retweeted_status, false, false) + const retweet = addStatus(status, showImmediately) + retweet.retweeted_status = retweetedStatus + }, + 'favorite': (status) => { + updateMaxId(status) + favoriteStatus(status) + } + } + + each(statuses, (status) => { + const type = statusType(status) + processors[type](status) }) + + // Keep the visible statuses sorted + timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id) + timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id) + timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id }, showNewStatuses (state, { timeline }) { const oldTimeline = (state.timelines[timeline]) |