From 1281a9fd4ab78928cbdc5ac116358ba328015bf9 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:32:57 +0100
Subject: [PATCH] [chore/frontend] remove references to unused bundle.js
 (#1128)

---
 internal/web/profile.go        | 11 ++++-------
 internal/web/settings-panel.go | 14 ++++++--------
 internal/web/thread.go         |  9 +++------
 internal/web/web.go            |  1 +
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/internal/web/profile.go b/internal/web/profile.go
index 5023fa23..8a0368a3 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -110,9 +110,9 @@ func (m *Module) profileGETHandler(c *gin.Context) {
 	}
 
 	stylesheets := []string{
-		"/assets/Fork-Awesome/css/fork-awesome.min.css",
-		"/assets/dist/status.css",
-		"/assets/dist/profile.css",
+		assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
+		distPathPrefix + "/status.css",
+		distPathPrefix + "/profile.css",
 	}
 	if config.GetAccountsAllowCustomCSS() {
 		stylesheets = append(stylesheets, "/@"+account.Username+"/custom.css")
@@ -128,10 +128,7 @@ func (m *Module) profileGETHandler(c *gin.Context) {
 		"statuses_next":    statusResp.NextLink,
 		"show_back_to_top": showBackToTop,
 		"stylesheets":      stylesheets,
-		"javascript": []string{
-			"/assets/dist/bundle.js",
-			"/assets/dist/frontend.js",
-		},
+		"javascript":       []string{distPathPrefix + "/frontend.js"},
 	})
 }
 
diff --git a/internal/web/settings-panel.go b/internal/web/settings-panel.go
index 34b4f225..f38d7522 100644
--- a/internal/web/settings-panel.go
+++ b/internal/web/settings-panel.go
@@ -39,14 +39,12 @@ func (m *Module) SettingsPanelHandler(c *gin.Context) {
 		"instance": instance,
 		"stylesheets": []string{
 			assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
-			assetsPathPrefix + "/dist/_colors.css",
-			assetsPathPrefix + "/dist/base.css",
-			assetsPathPrefix + "/dist/profile.css",
-			assetsPathPrefix + "/dist/status.css",
-			assetsPathPrefix + "/dist/settings-style.css",
-		},
-		"javascript": []string{
-			assetsPathPrefix + "/dist/settings.js",
+			distPathPrefix + "/_colors.css",
+			distPathPrefix + "/base.css",
+			distPathPrefix + "/profile.css",
+			distPathPrefix + "/status.css",
+			distPathPrefix + "/settings-style.css",
 		},
+		"javascript": []string{distPathPrefix + "/settings.js"},
 	})
 }
diff --git a/internal/web/thread.go b/internal/web/thread.go
index fb5006c3..0cb6af6a 100644
--- a/internal/web/thread.go
+++ b/internal/web/thread.go
@@ -105,8 +105,8 @@ func (m *Module) threadGETHandler(c *gin.Context) {
 	}
 
 	stylesheets := []string{
-		"/assets/Fork-Awesome/css/fork-awesome.min.css",
-		"/assets/dist/status.css",
+		assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
+		distPathPrefix + "/status.css",
 	}
 	if config.GetAccountsAllowCustomCSS() {
 		stylesheets = append(stylesheets, "/@"+username+"/custom.css")
@@ -118,10 +118,7 @@ func (m *Module) threadGETHandler(c *gin.Context) {
 		"context":     context,
 		"ogMeta":      ogBase(instance).withStatus(status),
 		"stylesheets": stylesheets,
-		"javascript": []string{
-			"/assets/dist/bundle.js",
-			"/assets/dist/frontend.js",
-		},
+		"javascript":  []string{distPathPrefix + "/frontend.js"},
 	})
 }
 
diff --git a/internal/web/web.go b/internal/web/web.go
index 16be8a71..b9e0a63f 100644
--- a/internal/web/web.go
+++ b/internal/web/web.go
@@ -38,6 +38,7 @@ const (
 	rssFeedPath      = profilePath + "/feed.rss"
 	statusPath       = profilePath + "/statuses/:" + statusIDKey
 	assetsPathPrefix = "/assets"
+	distPathPrefix   = assetsPathPrefix + "/dist"
 	userPanelPath    = "/settings/user"
 	adminPanelPath   = "/settings/admin"