diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-09-04 14:41:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-04 14:41:42 +0200 |
| commit | 006c8b604b88fdddf1a2319e44aa37dd8777efd9 (patch) | |
| tree | d1562a40f437005031405525a51a8003c2fd39d7 /internal/web/assets.go | |
| parent | [bugfix] Fix status fields `in_reply_to_id` and `in_reply_to_account_id` not ... (diff) | |
| download | gotosocial-006c8b604b88fdddf1a2319e44aa37dd8777efd9.tar.xz | |
[feature] Set default header and avatar for API accounts to GtS ones (#799)
* validate web-asset-base-dir
* move default icons into converter
* always ensure avatar + header on api accounts
* update tests
* add default header
* don't return error from web module creation anymore
* tidy a bit
* use pngs for default avatars rather than svgs
Diffstat (limited to 'internal/web/assets.go')
| -rw-r--r-- | internal/web/assets.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/internal/web/assets.go b/internal/web/assets.go index f67f38363..397870862 100644 --- a/internal/web/assets.go +++ b/internal/web/assets.go @@ -20,9 +20,12 @@ package web import ( "net/http" + "path/filepath" "strings" "github.com/gin-gonic/gin" + "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/log" ) type fileSystem struct { @@ -49,7 +52,12 @@ func (fs fileSystem) Open(path string) (http.File, error) { } func (m *Module) mountAssetsFilesystem(group *gin.RouterGroup) { - fs := fileSystem{http.Dir(m.webAssetsAbsFilePath)} + webAssetsAbsFilePath, err := filepath.Abs(config.GetWebAssetBaseDir()) + if err != nil { + log.Panicf("mountAssetsFilesystem: error getting absolute path of assets dir: %s", err) + } + + fs := fileSystem{http.Dir(webAssetsAbsFilePath)} // use the cache middleware on all handlers in this group group.Use(m.cacheControlMiddleware(fs)) |