Oneric/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Pull requests Activity

Merge branch 'fix-follow-requests' into 'develop'

Browse source 
Fix follower request fetching

Closes pleroma#1523 and #757

See merge request pleroma/pleroma-fe!1046
This commit is contained in:
Shpuld Shpludson 2020-01-21 16:31:41 +00:00
commit ad8eb88323
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/nav_panel/nav_panel.js
View file

@ -3,7 +3,7 @@ import { mapState } from 'vuex'
const NavPanel = { const NavPanel = {
created () { created () {
if (this.currentUser && this.currentUser.locked) { if (this.currentUser && this.currentUser.locked) {
this.$store.dispatch('startFetchingFollowRequest') this.$store.dispatch('startFetchingFollowRequests')
} }
}, },
computed: mapState({ computed: mapState({

2
src/components/side_drawer/side_drawer.js
View file

@ -12,7 +12,7 @@ const SideDrawer = {
this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, this.toggleDrawer) this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, this.toggleDrawer)
if (this.currentUser && this.currentUser.locked) { if (this.currentUser && this.currentUser.locked) {
this.$store.dispatch('startFetchingFollowRequest') this.$store.dispatch('startFetchingFollowRequests')
} }
}, },
components: { UserCard }, components: { UserCard },

1
src/modules/api.js
View file

@ -146,6 +146,7 @@ const api = {
startFetchingFollowRequests (store) { startFetchingFollowRequests (store) {
if (store.state.fetchers['followRequests']) return if (store.state.fetchers['followRequests']) return
const fetcher = store.state.backendInteractor.startFetchingFollowRequests({ store }) const fetcher = store.state.backendInteractor.startFetchingFollowRequests({ store })
store.commit('addFetcher', { fetcherName: 'followRequests', fetcher }) store.commit('addFetcher', { fetcherName: 'followRequests', fetcher })
}, },
stopFetchingFollowRequests (store) { stopFetchingFollowRequests (store) {

2
src/services/backend_interactor_service/backend_interactor_service.js
View file

@ -16,7 +16,7 @@ const backendInteractorService = credentials => ({
return notificationsFetcher.fetchAndUpdate({ store, credentials }) return notificationsFetcher.fetchAndUpdate({ store, credentials })
}, },
startFetchingFollowRequest ({ store }) { startFetchingFollowRequests ({ store }) {
return followRequestFetcher.startFetching({ store, credentials }) return followRequestFetcher.startFetching({ store, credentials })
}, },