MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we use proper URL to connect to websocket

This commit is contained in:
Eliot Berriot 2018-06-23 19:41:58 +02:00
parent 7d60155b0f
commit 63dd5b2f06
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
front/src/store/instance.js
View File

@ -54,19 +54,16 @@ export default {
state.events = value state.events = value
}, },
instanceUrl: (state, value) => { instanceUrl: (state, value) => {
if (value && !value.endsWith('/')) {
value = value + '/'
}
state.instanceUrl = value state.instanceUrl = value
if (!value) { if (!value) {
axios.defaults.baseURL = null axios.defaults.baseURL = null
return return
} }
let apiUrl
let suffix = 'api/v1/' let suffix = 'api/v1/'
if (state.instanceUrl.endsWith('/')) { axios.defaults.baseURL = state.instanceUrl + suffix
apiUrl = state.instanceUrl + suffix
} else {
apiUrl = state.instanceUrl + '/' + suffix
}
axios.defaults.baseURL = apiUrl
} }
}, },
getters: { getters: {

5
front/src/views/instance/Timeline.vue
View File

@ -78,8 +78,11 @@ export default {
// let token = 'test' // let token = 'test'
const bridge = new WebSocketBridge() const bridge = new WebSocketBridge()
this.bridge = bridge this.bridge = bridge
let url = this.$store.getters['instance/absoluteUrl'](`api/v1/instance/activity?token=${token}`)
url = url.replace('http://', 'ws://')
url = url.replace('https://', 'wss://')
bridge.connect( bridge.connect(
`/api/v1/instance/activity?token=${token}`, url,
null, null,
{reconnectInterval: 5000}) {reconnectInterval: 5000})
bridge.listen(function (event) { bridge.listen(function (event) {