AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 82 Pull requests 20 Projects Releases 1 Wiki Activity

don't dismiss a rejected follow request on server

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-05-02 11:51:39 +03:00
parent 20b53d58b7
commit b095d2e17e
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/follow_request_card/follow_request_card.js
View file

@ -27,11 +27,12 @@ const FollowRequestCard = {
})
},
denyUser () {
this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
this.$store.dispatch('removeFollowRequest', this.user)
const notifId = this.findFollowRequestNotificationId()
this.$store.dispatch('dismissNotification', { id: notifId })
this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
.then(() => {
this.$store.dispatch('dismissNotificationLocal', { id: notifId })
this.$store.dispatch('removeFollowRequest', this.user)
})
}
}
}

6
src/components/notification/notification.js
View file

@ -47,8 +47,10 @@ const Notification = {
},
denyUser () {
this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
this.$store.dispatch('removeFollowRequest', this.user)
this.$store.dispatch('dismissNotification', { id: this.notification.id })
.then(() => {
this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
this.$store.dispatch('removeFollowRequest', this.user)
})
}
},
computed: {

5
src/modules/statuses.js
View file

@ -703,9 +703,12 @@ const statuses = {
credentials: rootState.users.currentUser.credentials
})
},
dismissNotificationLocal ({ rootState, commit }, { id }) {
commit('dismissNotification', { id })
},
dismissNotification ({ rootState, commit }, { id }) {
commit('dismissNotification', { id })
rootState.api.backendInteractor.dismissNotification({ id })
.then(() => commit('dismissNotification', { id }))
},
updateNotification ({ rootState, commit }, { id, updater }) {
commit('updateNotification', { id, updater })