Merge branch '287-websocket' into 'develop'
Resolve "Display bug in Activity" Closes #287 See merge request funkwhale/funkwhale!250
This commit is contained in:
commit
c6b79bcd75
|
@ -0,0 +1 @@
|
|||
Fixed duplicated websocket connexion on timeline (#287)
|
|
@ -34,6 +34,7 @@ export default {
|
|||
data () {
|
||||
return {
|
||||
isLoading: false,
|
||||
bridge: null,
|
||||
components: {
|
||||
'Like': Like,
|
||||
'Listen': Listen
|
||||
|
@ -44,6 +45,9 @@ export default {
|
|||
this.openWebsocket()
|
||||
this.fetchEvents()
|
||||
},
|
||||
destroyed () {
|
||||
this.disconnect()
|
||||
},
|
||||
computed: {
|
||||
...mapState({
|
||||
events: state => state.instance.events
|
||||
|
@ -58,14 +62,22 @@ export default {
|
|||
self.$store.commit('instance/events', response.data.results)
|
||||
})
|
||||
},
|
||||
disconnect () {
|
||||
if (!this.bridge) {
|
||||
return
|
||||
}
|
||||
this.bridge.socket.close(1000, 'goodbye', {keepClosed: true})
|
||||
},
|
||||
openWebsocket () {
|
||||
if (!this.$store.state.auth.authenticated) {
|
||||
return
|
||||
}
|
||||
this.disconnect()
|
||||
let self = this
|
||||
let token = this.$store.state.auth.token
|
||||
// let token = 'test'
|
||||
const bridge = new WebSocketBridge()
|
||||
this.bridge = bridge
|
||||
bridge.connect(
|
||||
`/api/v1/instance/activity?token=${token}`,
|
||||
null,
|
||||
|
|
Loading…
Reference in New Issue