mirror of
https://git.pleroma.social/sjw/pleroma-fe.git
synced 2024-12-23 11:25:27 +01:00
Remove notifications for deleted messages.
This commit is contained in:
parent
449a466ef2
commit
72de959221
@ -242,6 +242,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
||||
const uri = deletion.uri
|
||||
updateMaxId(deletion)
|
||||
|
||||
// Remove possible notification
|
||||
const status = find(allStatuses, {uri})
|
||||
remove(state.notifications, ({action: {id}}) => status.id)
|
||||
|
||||
remove(allStatuses, { uri })
|
||||
if (timeline) {
|
||||
remove(timelineObject.statuses, { uri })
|
||||
|
@ -319,6 +319,34 @@ describe('The Statuses module', () => {
|
||||
expect(state.notifications[0].type).to.eql('mention')
|
||||
})
|
||||
|
||||
it('removes a notification when the notice gets removed', () => {
|
||||
const user = { id: 1 }
|
||||
const state = cloneDeep(defaultState)
|
||||
const status = makeMockStatus({id: 1})
|
||||
const mentionedStatus = makeMockStatus({id: 2})
|
||||
mentionedStatus.attentions = [user]
|
||||
mentionedStatus.uri = 'xxx'
|
||||
|
||||
const deletion = makeMockStatus({id: 3, is_post_verb: false})
|
||||
deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
|
||||
deletion.uri = 'xxx'
|
||||
|
||||
mutations.addNewStatuses(state, { statuses: [status], user })
|
||||
|
||||
expect(state.notifications.length).to.eql(0)
|
||||
|
||||
mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
|
||||
expect(state.allStatuses.length).to.eql(2)
|
||||
expect(state.notifications.length).to.eql(1)
|
||||
expect(state.notifications[0].status).to.eql(mentionedStatus)
|
||||
expect(state.notifications[0].action).to.eql(mentionedStatus)
|
||||
expect(state.notifications[0].type).to.eql('mention')
|
||||
|
||||
mutations.addNewStatuses(state, { statuses: [deletion], user })
|
||||
expect(state.allStatuses.length).to.eql(1)
|
||||
expect(state.notifications.length).to.eql(0)
|
||||
})
|
||||
|
||||
it('adds the message to mentions when you are mentioned', () => {
|
||||
const user = { id: 1 }
|
||||
const state = cloneDeep(defaultState)
|
||||
|
Loading…
Reference in New Issue
Block a user