gtsocial-umbx

commit 38912f5d07d1ceaf912d8335fa18c1276ae72f29
parent f9bc305acaaf26bf3c5ef4ae49f7b5a20c9c1dfe
Author: tsmethurst <tobi.smethurst@protonmail.com>
Date:   Mon, 21 Jun 2021 20:40:56 +0200

add web handler to testrig

Diffstat:
M
go.mod
 | 
2
+-
M
internal/cliactions/testrig/testrig.go
 | 
3
+++
M
internal/config/default.go
 | 
1
+

3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/dsoprea/go-utility v0.0.0-20200717064901-2fccff4aa15e // indirect
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-contrib/sessions v0.0.3
-	github.com/gin-contrib/static v0.0.1 // indirect
+	github.com/gin-contrib/static v0.0.1
 	github.com/gin-gonic/gin v1.7.2
 	github.com/go-errors/errors v1.4.0 // indirect
 	github.com/go-fed/activity v1.0.1-0.20210426194615-e0de0863dcc1
diff --git a/internal/cliactions/testrig/testrig.go b/internal/cliactions/testrig/testrig.go
@@ -34,6 +34,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
+	"github.com/superseriousbusiness/gotosocial/internal/web"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -69,6 +70,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
 	appsModule := app.New(c, processor, log)
 	followRequestsModule := followrequest.New(c, processor, log)
 	webfingerModule := webfinger.New(c, processor, log)
+	webBaseModule := web.New(c, processor, log)
 	usersModule := user.New(c, processor, log)
 	timelineModule := timeline.New(c, processor, log)
 	notificationModule := notification.New(c, processor, log)
@@ -89,6 +91,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
 		authModule,
 
 		// now everything else
+		webBaseModule,
 		accountModule,
 		instanceModule,
 		appsModule,
diff --git a/internal/config/default.go b/internal/config/default.go
@@ -172,6 +172,7 @@ func GetTestDefaults() Defaults {
 		DbDatabase: "postgres",
 
 		TemplateBaseDir: "./web/template/",
+		AssetBaseDir:    "./web/assets/",
 
 		AccountsOpenRegistration: true,
 		AccountsRequireApproval:  true,