Merge branch 'broken-websocket' into 'develop'

Ensure we use absolute URL to connect to websocket

See merge request funkwhale/funkwhale!270

api/funkwhale_api/music/factories.py

@@ -89,7 +89,7 @@ class ImportJobFactory(factory.django.DjangoModelFactory):
     batch = factory.SubFactory(ImportBatchFactory)
     source = factory.Faker("url")
     mbid = factory.Faker("uuid4")
-    replace_if_duplicate = factory.Faker("boolean")
+    replace_if_duplicate = False
 
     class Meta:
         model = "music.ImportJob"

front/src/store/instance.js

@@ -54,19 +54,16 @@ export default {
       state.events = value
     },
     instanceUrl: (state, value) => {
+      if (value && !value.endsWith('/')) {
+        value = value + '/'
+      }
       state.instanceUrl = value
       if (!value) {
         axios.defaults.baseURL = null
         return
       }
-      let apiUrl
       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: {

front/src/views/instance/Timeline.vue

@@ -78,8 +78,11 @@ export default {
       // let token = 'test'
       const bridge = new WebSocketBridge()
       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(
-        `/api/v1/instance/activity?token=${token}`,
+        url,
         null,
         {reconnectInterval: 5000})
       bridge.listen(function (event) {