diff options
| -rw-r--r-- | src/modules/statuses.js | 29 | ||||
| -rw-r--r-- | test/unit/specs/modules/statuses.spec.js | 65 |
2 files changed, 89 insertions, 5 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 8238644d..86995b03 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -1,4 +1,4 @@ -import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find } from 'lodash' +import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy } from 'lodash' import moment from 'moment' import apiService from '../services/api/api.service.js' import parse from '../services/status_parser/status_parser.js' @@ -41,7 +41,7 @@ const statusType = (status) => { return !status.is_post_verb && status.uri.match(/fave/) ? 'fave' : 'status' } -const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading }) => { +const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading, maxId }) => { const statusesAndFaves = groupBy(addedStatuses, statusType) const addedFaves = statusesAndFaves['fave'] || [] const unseenFaves = differenceBy(addedFaves, faves, 'id') @@ -92,9 +92,9 @@ const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visib statuses: newStatuses, visibleStatuses: newVisibleStatuses, newStatusCount: newNewStatusCount, - maxId: newStatuses[0].id, minVisibleId: (last(newVisibleStatuses) || { id: undefined }).id, faves: unionBy(faves, addedFaves, 'id'), + maxId, loading } } @@ -109,8 +109,31 @@ const updateTimestampsInStatuses = (statuses) => { }) } + +export const findMaxId = (...args) => { + return (maxBy(flatten(args), 'id') || {}).id +} + +export const prepareStatus = (status) => { + // Parse nsfw tags + if (status.nsfw === undefined) { + const nsfwRegex = /#nsfw/i + status.nsfw = !!status.text.match(nsfwRegex) + } + + // Set created_at_parsed to initial value + status.created_at_parsed = status.created_at + + return status +} + export const mutations = { addNewStatuses (state, { statuses, showImmediately = false, timeline }) { + const timelineObject = state.timelines[timeline] + + // Set new maxId + const maxId = findMaxId(statuses, timelineObject.statuses) + timelineObject.maxId = maxId state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline]) state.allStatuses = unionBy(state.timelines[timeline].statuses, state.allStatuses, 'id') diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js index fe8ed0b8..28ecbdfb 100644 --- a/test/unit/specs/modules/statuses.spec.js +++ b/test/unit/specs/modules/statuses.spec.js @@ -1,5 +1,5 @@ import { cloneDeep } from 'lodash' -import { defaultState, mutations } from '../../../../src/modules/statuses.js' +import { defaultState, mutations, findMaxId, prepareStatus } from '../../../../src/modules/statuses.js' const makeMockStatus = ({id, text}) => { return { @@ -11,6 +11,47 @@ const makeMockStatus = ({id, text}) => { } } +describe('Statuses.prepareStatus', () => { + it('sets nsfw for statuses with the #nsfw tag', () => { + const safe = makeMockStatus({id: 1, text: 'Hello oniichan'}) + const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'}) + + expect(prepareStatus(safe).nsfw).to.eq(false) + expect(prepareStatus(nsfw).nsfw).to.eq(true) + }) + + it('leaves existing nsfw settings alone', () => { + const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'}) + nsfw.nsfw = false + + expect(prepareStatus(nsfw).nsfw).to.eq(false) + }) + + it('sets the created_at_parsed property', () => { + const status = makeMockStatus({id: 1}) + status.created_at = '' + expect(status.created_at_parsed).to.eq(undefined) + + const prepared = prepareStatus(status) + expect(prepared.created_at_parsed).to.not.eq(undefined) + }) +}) + +describe('Statuses.findMaxId', () => { + it('returns the largest id in any of the given arrays', () => { + const statusesOne = [{ id: 100 }, { id: 2 }] + const statusesTwo = [{ id: 3 }] + + const maxId = findMaxId(statusesOne, statusesTwo) + expect(maxId).to.eq(100) + }) + + it('returns undefined for empty arrays', () => { + const maxId = findMaxId([], []) + expect(maxId).to.eq(undefined) + }) +}) + describe('The Statuses module', () => { it('adds the status to allStatuses and to the given timeline', () => { const state = cloneDeep(defaultState) @@ -70,6 +111,25 @@ describe('The Statuses module', () => { expect(state.allStatuses[0]).to.equal(modStatus) }) + it('replaces existing statuses with the same id, coming from a retweet', () => { + const state = cloneDeep(defaultState) + const status = makeMockStatus({id: 1}) + const modStatus = makeMockStatus({id: 1, text: 'something else'}) + const retweet = makeMockStatus({id: 2}) + retweet.retweeted_status = modStatus + + // Add original status + mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' }) + expect(state.timelines.public.visibleStatuses).to.have.length(1) + expect(state.allStatuses).to.have.length(1) + + // Add new version of status + mutations.addNewStatuses(state, { statuses: [retweet], showImmediately: false, timeline: 'public' }) + expect(state.timelines.public.visibleStatuses).to.have.length(1) + expect(state.allStatuses).to.have.length(2) + expect(state.allStatuses[0]).to.equal(modStatus) + }) + it('handles favorite actions', () => { const state = cloneDeep(defaultState) const status = makeMockStatus({id: 1}) @@ -77,7 +137,7 @@ describe('The Statuses module', () => { const favorite = { id: 2, is_post_verb: false, - in_reply_to_status_id: 1, // The API uses strings here... + in_reply_to_status_id: '1', // The API uses strings here... uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00', text: 'a favorited something by b' } @@ -87,6 +147,7 @@ describe('The Statuses module', () => { expect(state.timelines.public.visibleStatuses.length).to.eql(1) expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1) + expect(state.timelines.public.maxId).to.eq(favorite.id) // Adding again shouldn't change anything mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' }) |