From 006c8b604b88fdddf1a2319e44aa37dd8777efd9 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 4 Sep 2022 14:41:42 +0200
Subject: [PATCH] [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
---
cmd/gotosocial/action/server/server.go | 5 +-
cmd/gotosocial/action/testrig/testrig.go | 5 +-
internal/api/client/followrequest/get_test.go | 2 +-
.../api/client/instance/instancepatch_test.go | 8 +-
internal/config/validate.go | 5 +
internal/config/validate_test.go | 9 +
.../processing/streaming/notification_test.go | 2 +-
internal/typeutils/converter.go | 10 +-
internal/typeutils/defaulticons.go | 138 +++++++++++++++
internal/typeutils/internaltofrontend.go | 3 +
internal/typeutils/internaltofrontend_test.go | 4 +-
internal/web/assets.go | 10 +-
internal/web/assetscache.go | 2 +-
internal/web/panels.go | 28 +--
internal/web/profile.go | 16 --
internal/web/thread.go | 26 ---
internal/web/web.go | 73 +-------
.../default_avatars/GoToSocial_icon1.png | Bin 0 -> 19837 bytes
.../default_avatars/GoToSocial_icon1.svg | 160 ------------------
.../default_avatars/GoToSocial_icon2.png | Bin 0 -> 21157 bytes
.../default_avatars/GoToSocial_icon2.svg | 137 ---------------
.../default_avatars/GoToSocial_icon3.png | Bin 0 -> 22775 bytes
.../default_avatars/GoToSocial_icon3.svg | 137 ---------------
.../default_avatars/GoToSocial_icon4.png | Bin 0 -> 23960 bytes
.../default_avatars/GoToSocial_icon4.svg | 152 -----------------
.../default_avatars/GoToSocial_icon5.png | Bin 0 -> 23453 bytes
.../default_avatars/GoToSocial_icon5.svg | 152 -----------------
.../default_avatars/GoToSocial_icon6.png | Bin 0 -> 20371 bytes
.../default_avatars/GoToSocial_icon6.svg | 160 ------------------
web/assets/default_header.png | Bin 0 -> 70 bytes
30 files changed, 205 insertions(+), 1039 deletions(-)
create mode 100644 internal/typeutils/defaulticons.go
create mode 100644 web/assets/default_avatars/GoToSocial_icon1.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon1.svg
create mode 100644 web/assets/default_avatars/GoToSocial_icon2.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon2.svg
create mode 100644 web/assets/default_avatars/GoToSocial_icon3.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon3.svg
create mode 100644 web/assets/default_avatars/GoToSocial_icon4.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon4.svg
create mode 100644 web/assets/default_avatars/GoToSocial_icon5.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon5.svg
create mode 100644 web/assets/default_avatars/GoToSocial_icon6.png
delete mode 100644 web/assets/default_avatars/GoToSocial_icon6.svg
create mode 100644 web/assets/default_header.png
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index ee327c0c5..e695e0789 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -150,10 +150,7 @@
}
// build web module
- webModule, err := web.New(processor)
- if err != nil {
- return fmt.Errorf("error creating web module: %s", err)
- }
+ webModule := web.New(processor)
// build client api modules
authModule := auth.New(dbService, idp, processor)
diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go
index 739358f99..02eb96063 100644
--- a/cmd/gotosocial/action/testrig/testrig.go
+++ b/cmd/gotosocial/action/testrig/testrig.go
@@ -108,10 +108,7 @@
}
// build web module
- webModule, err := web.New(processor)
- if err != nil {
- return fmt.Errorf("error creating web module: %s", err)
- }
+ webModule := web.New(processor)
// build client api modules
authModule := auth.New(dbService, idp, processor)
diff --git a/internal/api/client/followrequest/get_test.go b/internal/api/client/followrequest/get_test.go
index 2af9c7744..adf55c8b6 100644
--- a/internal/api/client/followrequest/get_test.go
+++ b/internal/api/client/followrequest/get_test.go
@@ -70,7 +70,7 @@ func (suite *GetTestSuite) TestGet() {
b, err := ioutil.ReadAll(result.Body)
assert.NoError(suite.T(), err)
- suite.Equal(`[{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.000Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]}]`, string(b))
+ suite.Equal(`[{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.000Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]}]`, string(b))
}
func TestGetTestSuite(t *testing.T) {
diff --git a/internal/api/client/instance/instancepatch_test.go b/internal/api/client/instance/instancepatch_test.go
index c44f8d093..4ecf0d62c 100644
--- a/internal/api/client/instance/instancepatch_test.go
+++ b/internal/api/client/instance/instancepatch_test.go
@@ -63,7 +63,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
b, err := io.ReadAll(result.Body)
suite.NoError(err)
- suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"Example Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"someone@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
+ suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"Example Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"someone@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
}
func (suite *InstancePatchTestSuite) TestInstancePatch2() {
@@ -93,7 +93,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() {
b, err := io.ReadAll(result.Body)
suite.NoError(err)
- suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"Geoff's Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"admin@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
+ suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"Geoff's Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"admin@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
}
func (suite *InstancePatchTestSuite) TestInstancePatch3() {
@@ -123,7 +123,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() {
b, err := io.ReadAll(result.Body)
suite.NoError(err)
- suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"GoToSocial Testrig Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is some html, which is \u003cem\u003eallowed\u003c/em\u003e in short descriptions.\u003c/p\u003e","email":"admin@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
+ suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"GoToSocial Testrig Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is some html, which is \u003cem\u003eallowed\u003c/em\u003e in short descriptions.\u003c/p\u003e","email":"admin@example.org","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
}
func (suite *InstancePatchTestSuite) TestInstancePatch4() {
@@ -214,7 +214,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() {
b, err := io.ReadAll(result.Body)
suite.NoError(err)
- suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"GoToSocial Testrig Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
+ suite.Equal(`{"uri":"http://localhost:8080","account_domain":"localhost:8080","title":"GoToSocial Testrig Instance","description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","short_description":"\u003cp\u003eThis is the GoToSocial testrig. It doesn't federate or anything.\u003c/p\u003e\u003cp\u003eWhen the testrig is shut down, all data on it will be deleted.\u003c/p\u003e\u003cp\u003eDon't use this in production!\u003c/p\u003e","email":"","version":"0.0.0-testrig","registrations":true,"approval_required":true,"invites_enabled":false,"configuration":{"statuses":{"max_characters":5000,"max_media_attachments":6,"characters_reserved_per_url":999},"media_attachments":{"supported_mime_types":["image/jpeg","image/gif","image/png"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":16777216},"polls":{"max_options":6,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":2,"status_count":16,"user_count":4},"thumbnail":"http://localhost:8080/assets/logo.png","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
}
func (suite *InstancePatchTestSuite) TestInstancePatch7() {
diff --git a/internal/config/validate.go b/internal/config/validate.go
index b68cb2c62..064eae07a 100644
--- a/internal/config/validate.go
+++ b/internal/config/validate.go
@@ -62,6 +62,11 @@ func Validate() error {
errs = append(errs, fmt.Errorf("%s must be set to either http or https, provided value was %s", ProtocolFlag(), proto))
}
+ webAssetsBaseDir := GetWebAssetBaseDir()
+ if webAssetsBaseDir == "" {
+ errs = append(errs, fmt.Errorf("%s must be set", WebAssetBaseDirFlag()))
+ }
+
if len(errs) > 0 {
errStrings := []string{}
for _, err := range errs {
diff --git a/internal/config/validate_test.go b/internal/config/validate_test.go
index 6b832de36..c3a998a4a 100644
--- a/internal/config/validate_test.go
+++ b/internal/config/validate_test.go
@@ -103,6 +103,15 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocol() {
suite.EqualError(err, "protocol must be set")
}
+func (suite *ConfigValidateTestSuite) TestValidateConfigNoWebAssetBaseDir() {
+ testrig.InitTestConfig()
+
+ config.SetWebAssetBaseDir("")
+
+ err := config.Validate()
+ suite.EqualError(err, "web-asset-base-dir must be set")
+}
+
func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocolOrHost() {
testrig.InitTestConfig()
diff --git a/internal/processing/streaming/notification_test.go b/internal/processing/streaming/notification_test.go
index 960d9408d..0017dac04 100644
--- a/internal/processing/streaming/notification_test.go
+++ b/internal/processing/streaming/notification_test.go
@@ -52,7 +52,7 @@ func (suite *NotificationTestSuite) TestStreamNotification() {
suite.NoError(err)
msg := <-openStream.Messages
- suite.Equal(`{"id":"01FH57SJCMDWQGEAJ0X08CE3WV","type":"follow","created_at":"2021-10-04T08:52:36.000Z","account":{"id":"01F8MH5ZK5VRH73AKHQM6Y9VNX","username":"foss_satan","acct":"foss_satan@fossbros-anonymous.io","display_name":"big gerald","locked":false,"bot":false,"created_at":"2021-09-26T10:52:36.000Z","note":"i post about like, i dunno, stuff, or whatever!!!!","url":"http://fossbros-anonymous.io/@foss_satan","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":1,"last_status_at":"2021-09-20T10:40:37.000Z","emojis":[],"fields":[]}}`, msg.Payload)
+ suite.Equal(`{"id":"01FH57SJCMDWQGEAJ0X08CE3WV","type":"follow","created_at":"2021-10-04T08:52:36.000Z","account":{"id":"01F8MH5ZK5VRH73AKHQM6Y9VNX","username":"foss_satan","acct":"foss_satan@fossbros-anonymous.io","display_name":"big gerald","locked":false,"bot":false,"created_at":"2021-09-26T10:52:36.000Z","note":"i post about like, i dunno, stuff, or whatever!!!!","url":"http://fossbros-anonymous.io/@foss_satan","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":0,"following_count":0,"statuses_count":1,"last_status_at":"2021-09-20T10:40:37.000Z","emojis":[],"fields":[]}}`, msg.Payload)
}
func TestNotificationTestSuite(t *testing.T) {
diff --git a/internal/typeutils/converter.go b/internal/typeutils/converter.go
index 6996599ae..3effb9388 100644
--- a/internal/typeutils/converter.go
+++ b/internal/typeutils/converter.go
@@ -21,6 +21,7 @@
import (
"context"
"net/url"
+ "sync"
"github.com/superseriousbusiness/activity/streams/vocab"
"github.com/superseriousbusiness/gotosocial/internal/ap"
@@ -195,10 +196,15 @@ type TypeConverter interface {
}
type converter struct {
- db db.DB
+ db db.DB
+ defaultAvatars []string
+ randAvatars sync.Map
}
// NewConverter returns a new Converter
func NewConverter(db db.DB) TypeConverter {
- return &converter{db: db}
+ return &converter{
+ db: db,
+ defaultAvatars: populateDefaultAvatars(),
+ }
}
diff --git a/internal/typeutils/defaulticons.go b/internal/typeutils/defaulticons.go
new file mode 100644
index 000000000..b2a9858af
--- /dev/null
+++ b/internal/typeutils/defaulticons.go
@@ -0,0 +1,138 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+*/
+
+package typeutils
+
+import (
+ "io/ioutil"
+ "math/rand"
+ "path/filepath"
+ "strings"
+
+ apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
+)
+
+const defaultHeaderPath = "/assets/default_header.png"
+
+// populateDefaultAvatars returns a slice of standard avatars found
+// in the path [web-assets-base-dir]/default_avatars. The slice
+// entries correspond to the relative url via which they can be
+// retrieved from the server.
+//
+// So for example, an avatar called default.jpeg would be returned
+// in the slice as "/assets/default_avatars/default.jpeg".
+func populateDefaultAvatars() (defaultAvatars []string) {
+ webAssetsAbsFilePath, err := filepath.Abs(config.GetWebAssetBaseDir())
+ if err != nil {
+ log.Panicf("populateDefaultAvatars: error getting abs path for web assets: %s", err)
+ }
+
+ defaultAvatarsAbsFilePath := filepath.Join(webAssetsAbsFilePath, "default_avatars")
+ defaultAvatarFiles, err := ioutil.ReadDir(defaultAvatarsAbsFilePath)
+ if err != nil {
+ log.Warnf("populateDefaultAvatars: error reading default avatars at %s: %s", defaultAvatarsAbsFilePath, err)
+ return
+ }
+
+ for _, f := range defaultAvatarFiles {
+ // ignore directories
+ if f.IsDir() {
+ continue
+ }
+
+ // ignore files bigger than 50kb
+ if f.Size() > 50000 {
+ continue
+ }
+
+ // get the name of the file, eg avatar.jpeg
+ fileName := f.Name()
+
+ // get just the .jpeg, for example, from avatar.jpeg
+ extensionWithDot := filepath.Ext(fileName)
+
+ // remove the leading . to just get, eg, jpeg
+ extension := strings.TrimPrefix(extensionWithDot, ".")
+
+ // take only files with simple extensions
+ // that we know will work OK as avatars
+ switch strings.ToLower(extension) {
+ case "jpeg", "jpg", "gif", "png":
+ avatarURL := config.GetProtocol() + "://" + config.GetHost() + "/assets/default_avatars/" + fileName
+ defaultAvatars = append(defaultAvatars, avatarURL)
+ default:
+ continue
+ }
+ }
+
+ return
+}
+
+// ensureAvatar ensures that the given account has a value set
+// for the avatar URL.
+//
+// If no value is set, an avatar will be selected at random from
+// the available default avatars. This selection is 'sticky', so
+// the same account will get the same result on subsequent calls.
+//
+// If a value for the avatar URL is already set, this function is
+// a no-op.
+//
+// If there are no default avatars available, this function is a
+// no-op.
+func (c *converter) ensureAvatar(account *apimodel.Account) {
+ if (account.Avatar != "" && account.AvatarStatic != "") || len(c.defaultAvatars) == 0 {
+ return
+ }
+
+ var avatar string
+ if avatarI, ok := c.randAvatars.Load(account.ID); ok {
+ // we already have a default avatar stored for this account
+ avatar, ok = avatarI.(string)
+ if !ok {
+ panic("avatarI was not a string")
+ }
+ } else {
+ // select + store a default avatar for this account at random
+ randomIndex := rand.Intn(len(c.defaultAvatars)) //nolint:gosec
+ avatar = c.defaultAvatars[randomIndex]
+ c.randAvatars.Store(account.ID, avatar)
+ }
+
+ account.Avatar = avatar
+ account.AvatarStatic = avatar
+}
+
+// EnsureAvatar ensures that the given account has a value set
+// for the header URL.
+//
+// If no value is set, the default header will be set.
+//
+// If a value for the header URL is already set, this function is
+// a no-op.
+func (c *converter) ensureHeader(account *apimodel.Account) {
+ if account.Header != "" && account.HeaderStatic != "" {
+ return
+ }
+
+ h := config.GetProtocol() + "://" + config.GetHost() + defaultHeaderPath
+ account.Header = h
+ account.HeaderStatic = h
+}
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index 6ccbed340..0243e4732 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -190,6 +190,9 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
Suspended: suspended,
}
+ c.ensureAvatar(accountFrontend)
+ c.ensureHeader(accountFrontend)
+
return accountFrontend, nil
}
diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go
index 648c90fba..dc92260e1 100644
--- a/internal/typeutils/internaltofrontend_test.go
+++ b/internal/typeutils/internaltofrontend_test.go
@@ -63,7 +63,7 @@ func (suite *InternalToFrontendTestSuite) TestStatusToFrontend() {
b, err := json.Marshal(apiStatus)
suite.NoError(err)
- suite.Equal(`{"id":"01F8MH75CBF9JFX4ZAD54N0W0R","created_at":"2021-10-20T11:36:45.000Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:8080/users/admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","url":"http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","replies_count":0,"reblogs_count":0,"favourites_count":1,"favourited":true,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"hello world! #welcome ! first post on the instance :rainbow: !","reblog":null,"application":{"name":"superseriousbusiness","website":"https://superserious.business"},"account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"media_attachments":[{"id":"01F8MH6NEM8D7527KZAECTCR76","type":"image","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","text_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","preview_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.jpeg","remote_url":null,"preview_remote_url":null,"meta":{"original":{"width":1200,"height":630,"size":"1200x630","aspect":1.9047619},"small":{"width":256,"height":134,"size":"256x134","aspect":1.9104477},"focus":{"x":0,"y":0}},"description":"Black and white image of some 50's style text saying: Welcome On Board","blurhash":"LNJRdVM{00Rj%Mayt7j[4nWBofRj"}],"mentions":[],"tags":[{"name":"welcome","url":"http://localhost:8080/tags/welcome"}],"emojis":[{"shortcode":"rainbow","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","static_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","visible_in_picker":true}],"card":null,"poll":null}`, string(b))
+ suite.Equal(`{"id":"01F8MH75CBF9JFX4ZAD54N0W0R","created_at":"2021-10-20T11:36:45.000Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:8080/users/admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","url":"http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","replies_count":0,"reblogs_count":0,"favourites_count":1,"favourited":true,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"hello world! #welcome ! first post on the instance :rainbow: !","reblog":null,"application":{"name":"superseriousbusiness","website":"https://superserious.business"},"account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.000Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.000Z","emojis":[],"fields":[]},"media_attachments":[{"id":"01F8MH6NEM8D7527KZAECTCR76","type":"image","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","text_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","preview_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.jpeg","remote_url":null,"preview_remote_url":null,"meta":{"original":{"width":1200,"height":630,"size":"1200x630","aspect":1.9047619},"small":{"width":256,"height":134,"size":"256x134","aspect":1.9104477},"focus":{"x":0,"y":0}},"description":"Black and white image of some 50's style text saying: Welcome On Board","blurhash":"LNJRdVM{00Rj%Mayt7j[4nWBofRj"}],"mentions":[],"tags":[{"name":"welcome","url":"http://localhost:8080/tags/welcome"}],"emojis":[{"shortcode":"rainbow","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","static_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","visible_in_picker":true}],"card":null,"poll":null}`, string(b))
}
func (suite *InternalToFrontendTestSuite) TestInstanceToFrontend() {
@@ -108,7 +108,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceToFrontendWithAdminAccount
b, err := json.Marshal(apiInstance)
suite.NoError(err)
- suite.Equal(`{"uri":"https://example.org","title":"example instance","description":"a much longer description","short_description":"a little description","email":"someone@example.org","version":"software-from-hell 0.666","registrations":false,"approval_required":false,"invites_enabled":false,"thumbnail":"","contact_account":{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.000Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]},"max_toot_chars":0}`, string(b))
+ suite.Equal(`{"uri":"https://example.org","title":"example instance","description":"a much longer description","short_description":"a little description","email":"someone@example.org","version":"software-from-hell 0.666","registrations":false,"approval_required":false,"invites_enabled":false,"thumbnail":"","contact_account":{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.000Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"http://localhost:8080/assets/default_header.png","header_static":"http://localhost:8080/assets/default_header.png","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]},"max_toot_chars":0}`, string(b))
}
func TestInternalToFrontendTestSuite(t *testing.T) {
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 @@
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))
diff --git a/internal/web/assetscache.go b/internal/web/assetscache.go
index 57a0ade0b..fccc95993 100644
--- a/internal/web/assetscache.go
+++ b/internal/web/assetscache.go
@@ -114,7 +114,7 @@ func (m *Module) cacheControlMiddleware(fs http.FileSystem) gin.HandlerFunc {
if !strings.HasPrefix(upath, "/") {
upath = "/" + upath
}
- assetFilePath := strings.TrimPrefix(path.Clean(upath), assetsPath)
+ assetFilePath := strings.TrimPrefix(path.Clean(upath), assetsPathPrefix)
// either fetch etag from ttlcache or generate it
eTag, err := m.getAssetETag(assetFilePath, fs)
diff --git a/internal/web/panels.go b/internal/web/panels.go
index dafd0abc7..fdec87a33 100644
--- a/internal/web/panels.go
+++ b/internal/web/panels.go
@@ -38,15 +38,15 @@ func (m *Module) UserPanelHandler(c *gin.Context) {
c.HTML(http.StatusOK, "frontend.tmpl", gin.H{
"instance": instance,
"stylesheets": []string{
- assetsPath + "/Fork-Awesome/css/fork-awesome.min.css",
- assetsPath + "/dist/_colors.css",
- assetsPath + "/dist/base.css",
- assetsPath + "/dist/panels-base.css",
- assetsPath + "/dist/panels-user-style.css",
+ assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
+ assetsPathPrefix + "/dist/_colors.css",
+ assetsPathPrefix + "/dist/base.css",
+ assetsPathPrefix + "/dist/panels-base.css",
+ assetsPathPrefix + "/dist/panels-user-style.css",
},
"javascript": []string{
- assetsPath + "/dist/bundle.js",
- assetsPath + "/dist/user-panel.js",
+ assetsPathPrefix + "/dist/bundle.js",
+ assetsPathPrefix + "/dist/user-panel.js",
},
})
}
@@ -63,15 +63,15 @@ func (m *Module) AdminPanelHandler(c *gin.Context) {
c.HTML(http.StatusOK, "frontend.tmpl", gin.H{
"instance": instance,
"stylesheets": []string{
- assetsPath + "/Fork-Awesome/css/fork-awesome.min.css",
- assetsPath + "/dist/_colors.css",
- assetsPath + "/dist/base.css",
- assetsPath + "/dist/panels-base.css",
- assetsPath + "/dist/panels-admin-style.css",
+ assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
+ assetsPathPrefix + "/dist/_colors.css",
+ assetsPathPrefix + "/dist/base.css",
+ assetsPathPrefix + "/dist/panels-base.css",
+ assetsPathPrefix + "/dist/panels-admin-style.css",
},
"javascript": []string{
- assetsPath + "/dist/bundle.js",
- assetsPath + "/dist/admin-panel.js",
+ assetsPathPrefix + "/dist/bundle.js",
+ assetsPathPrefix + "/dist/admin-panel.js",
},
})
}
diff --git a/internal/web/profile.go b/internal/web/profile.go
index 542c015f1..61f7c57e7 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -23,7 +23,6 @@
"encoding/json"
"errors"
"fmt"
- "math/rand"
"net/http"
"strings"
@@ -100,21 +99,6 @@ func (m *Module) profileGETHandler(c *gin.Context) {
return
}
- // pick a random dummy avatar if this account avatar isn't set yet
- if account.Avatar == "" && len(m.defaultAvatars) > 0 {
- //nolint:gosec
- randomIndex := rand.Intn(len(m.defaultAvatars))
- dummyAvatar := m.defaultAvatars[randomIndex]
- account.Avatar = dummyAvatar
- for _, i := range statusResp.Items {
- s, ok := i.(*apimodel.Status)
- if !ok {
- panic("timelineable was not *apimodel.Status")
- }
- s.Account.Avatar = dummyAvatar
- }
- }
-
c.HTML(http.StatusOK, "profile.tmpl", gin.H{
"instance": instance,
"account": account,
diff --git a/internal/web/thread.go b/internal/web/thread.go
index d3b92bde3..3db4952c7 100644
--- a/internal/web/thread.go
+++ b/internal/web/thread.go
@@ -23,7 +23,6 @@
"encoding/json"
"errors"
"fmt"
- "math/rand"
"net/http"
"strings"
@@ -36,21 +35,6 @@
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
-var randAvatars = make(map[string]string)
-
-func (m *Module) ensureAvatar(status apimodel.Status) {
- if status.Account.Avatar == "" && len(m.defaultAvatars) > 0 {
- avatar, ok := randAvatars[status.Account.ID]
- if !ok {
- //nolint:gosec
- randomIndex := rand.Intn(len(m.defaultAvatars))
- avatar = m.defaultAvatars[randomIndex]
- randAvatars[status.Account.ID] = avatar
- }
- status.Account.Avatar = avatar
- }
-}
-
func (m *Module) threadGETHandler(c *gin.Context) {
ctx := c.Request.Context()
@@ -120,16 +104,6 @@ func (m *Module) threadGETHandler(c *gin.Context) {
return
}
- m.ensureAvatar(*status)
-
- for _, status := range context.Descendants {
- m.ensureAvatar(status)
- }
-
- for _, status := range context.Ancestors {
- m.ensureAvatar(status)
- }
-
c.HTML(http.StatusOK, "thread.tmpl", gin.H{
"instance": instance,
"status": status,
diff --git a/internal/web/web.go b/internal/web/web.go
index fe270ac6c..336525938 100644
--- a/internal/web/web.go
+++ b/internal/web/web.go
@@ -20,17 +20,12 @@
import (
"errors"
- "fmt"
- "io/ioutil"
"net/http"
- "path/filepath"
- "strings"
"time"
"codeberg.org/gruf/go-cache/v2"
"github.com/gin-gonic/gin"
"github.com/superseriousbusiness/gotosocial/internal/api"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/processing"
"github.com/superseriousbusiness/gotosocial/internal/router"
@@ -43,7 +38,7 @@
statusPath = profilePath + "/statuses/:" + statusIDKey
adminPanelPath = "/admin"
userPanelpath = "/user"
- assetsPath = "/assets"
+ assetsPathPrefix = "/assets"
tokenParam = "token"
usernameKey = "username"
@@ -52,78 +47,26 @@
// Module implements the api.ClientModule interface for web pages.
type Module struct {
- processor processing.Processor
- webAssetsAbsFilePath string
- assetsETagCache cache.Cache[string, eTagCacheEntry]
- defaultAvatars []string
+ processor processing.Processor
+ assetsETagCache cache.Cache[string, eTagCacheEntry]
}
// New returns a new api.ClientModule for web pages.
-func New(processor processing.Processor) (api.ClientModule, error) {
- webAssetsBaseDir := config.GetWebAssetBaseDir()
- if webAssetsBaseDir == "" {
- return nil, fmt.Errorf("%s cannot be empty and must be a relative or absolute path", config.WebAssetBaseDirFlag())
- }
-
- webAssetsAbsFilePath, err := filepath.Abs(webAssetsBaseDir)
- if err != nil {
- return nil, fmt.Errorf("error getting absolute path of %s: %s", webAssetsBaseDir, err)
- }
-
- defaultAvatarsAbsFilePath := filepath.Join(webAssetsAbsFilePath, "default_avatars")
- defaultAvatarFiles, err := ioutil.ReadDir(defaultAvatarsAbsFilePath)
- if err != nil {
- return nil, fmt.Errorf("error reading default avatars at %s: %s", defaultAvatarsAbsFilePath, err)
- }
-
- defaultAvatars := []string{}
- for _, f := range defaultAvatarFiles {
- // ignore directories
- if f.IsDir() {
- continue
- }
-
- // ignore files bigger than 50kb
- if f.Size() > 50000 {
- continue
- }
-
- // get the name of the file, eg avatar.jpeg
- fileName := f.Name()
-
- // get just the .jpeg, for example, from avatar.jpeg
- extensionWithDot := filepath.Ext(fileName)
-
- // remove the leading . to just get, eg, jpeg
- extension := strings.TrimPrefix(extensionWithDot, ".")
-
- // take only files with simple extensions
- // that we know will work OK as avatars
- switch strings.ToLower(extension) {
- case "svg", "jpeg", "jpg", "gif", "png":
- avatar := fmt.Sprintf("%s/default_avatars/%s", assetsPath, f.Name())
- defaultAvatars = append(defaultAvatars, avatar)
- default:
- continue
- }
- }
-
+func New(processor processing.Processor) api.ClientModule {
assetsETagCache := cache.New[string, eTagCacheEntry]()
assetsETagCache.SetTTL(time.Hour, false)
assetsETagCache.Start(time.Minute)
return &Module{
- processor: processor,
- webAssetsAbsFilePath: webAssetsAbsFilePath,
- assetsETagCache: assetsETagCache,
- defaultAvatars: defaultAvatars,
- }, nil
+ processor: processor,
+ assetsETagCache: assetsETagCache,
+ }
}
// Route satisfies the RESTAPIModule interface
func (m *Module) Route(s router.Router) error {
// serve static files from assets dir at /assets
- assetsGroup := s.AttachGroup(assetsPath)
+ assetsGroup := s.AttachGroup(assetsPathPrefix)
m.mountAssetsFilesystem(assetsGroup)
s.AttachHandler(http.MethodGet, adminPanelPath, m.AdminPanelHandler)
diff --git a/web/assets/default_avatars/GoToSocial_icon1.png b/web/assets/default_avatars/GoToSocial_icon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8248a10c2eef17ccdd9ba6cd1f26b929688abd6
GIT binary patch
literal 19837
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
-
-
-
diff --git a/web/assets/default_avatars/GoToSocial_icon2.png b/web/assets/default_avatars/GoToSocial_icon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..718647f9ab27a3e72e3e686f3f88bd8a4f48bea4
GIT binary patch
literal 21157
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%0D`xQbr-^$R&UumgHZlTcb9nSf5yB1J
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
-
-
-
diff --git a/web/assets/default_avatars/GoToSocial_icon3.png b/web/assets/default_avatars/GoToSocial_icon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9411ea3f5cb5d3bcf05bb92ce6f33b2aaad664ed
GIT binary patch
literal 22775
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