Merge branch '287-websocket' into 'develop'

Resolve "Display bug in Activity"

Closes #287

See merge request funkwhale/funkwhale!250
merge-requests/251/head
Eliot Berriot 2018-06-11 20:51:15 +00:00
commit c6b79bcd75
2 zmienionych plików z 13 dodań i 0 usunięć

Wyświetl plik

@ -0,0 +1 @@
Fixed duplicated websocket connexion on timeline (#287)

Wyświetl plik

@ -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,