From d4b8c8b2e2d03fa539d08bd81da90b398524a7f0 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 18 May 2021 18:17:13 +0200
Subject: [PATCH] Using getBaseStaticRoute for index.html urls.

---
 conversejs/index.html         | 8 ++++----
 server/lib/routers/webchat.ts | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/conversejs/index.html b/conversejs/index.html
index 68d024bb..5f1084b5 100644
--- a/conversejs/index.html
+++ b/conversejs/index.html
@@ -5,9 +5,9 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="description" content="Converse XMPP/Jabber Chat"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="{{BASE_STATIC_URL}}/conversejs/converse.min.css" />
-    <script type="text/javaScript" src="{{BASE_STATIC_URL}}/conversejs/converse.min.js"></script>
-    <script type="text/javascript" src="{{BASE_STATIC_URL}}/static/builtin.js"></script>
+    <link type="text/css" rel="stylesheet" media="screen" href="{{BASE_STATIC_URL}}conversejs/converse.min.css" />
+    <script type="text/javaScript" src="{{BASE_STATIC_URL}}conversejs/converse.min.js"></script>
+    <script type="text/javascript" src="{{BASE_STATIC_URL}}static/builtin.js"></script>
     <style type="text/css">
         body.livechat-iframe #conversejs .chat-head {
                 display: none;
@@ -20,7 +20,7 @@
 <script type="text/javascript">
   initConverse({
     jid: '{{JID}}',
-    assetsPath : '{{BASE_STATIC_URL}}/conversejs/',
+    assetsPath : '{{BASE_STATIC_URL}}conversejs/',
     room: '{{ROOM}}',
     boshServiceUrl: '{{BOSH_SERVICE_URL}}',
     websocketServiceUrl: '{{WS_SERVICE_URL}}',
diff --git a/server/lib/routers/webchat.ts b/server/lib/routers/webchat.ts
index 494c6103..ebb5b5c5 100644
--- a/server/lib/routers/webchat.ts
+++ b/server/lib/routers/webchat.ts
@@ -1,6 +1,6 @@
 import type { Router, RequestHandler, Request, Response, NextFunction } from 'express'
 import type { ProxyOptions } from 'express-http-proxy'
-import { getBaseRouterRoute } from '../helpers'
+import { getBaseRouterRoute, getBaseStaticRoute } from '../helpers'
 import { asyncMiddleware } from '../middlewares/async'
 import { getProsodyDomain } from '../prosody/config/domain'
 import * as path from 'path'
@@ -72,9 +72,8 @@ async function initWebchatRouter (options: RegisterServerOptions): Promise<Route
       }
 
       let page = '' + (converseJSIndex as string)
-      // FIXME: Peertube should provide the static folder path. For now:
-      const staticRelative = '../../../static'
-      page = page.replace(/{{BASE_STATIC_URL}}/g, staticRelative)
+      const baseStaticUrl = getBaseStaticRoute(options)
+      page = page.replace(/{{BASE_STATIC_URL}}/g, baseStaticUrl)
       page = page.replace(/{{JID}}/g, server)
       room = room.replace(/{{VIDEO_UUID}}/g, video.uuid)
       page = page.replace(/{{ROOM}}/g, room)