[feature] Use `hidesToPublicFromUnauthedWeb` and `hidesCcPublicFromUnauthedWeb` properties for web visibility of statuses (#4315)

This pull request implements two new properties on ActivityPub actors: `hidesToPublicFromUnauthedWeb` and `hidesCcPublicFromUnauthedWeb`.

As documented, these properties allow actors to signal their preference for whether or not their posts should be hidden from unauthenticated web views (ie., web pages like the GtS frontend, web apps like the Mastodon frontend, web APIs like the Mastodon public timeline API, etc). This allows remote accounts to *opt in* to having their unlisted visibility posts shown in (for example) the replies section of the web view of a GtS thread. In future, we can also use these properties to determine whether we should show boosts of a remote actor's post on a GtS profile, and that sort of thing.

In keeping with our stance around privacy by default, GtS assumes `true` for `hidesCcPublicFromUnauthedWeb` if the property is not set on a remote actor, ie., hide unlisted/unlocked posts by default. `hidesToPublicFromUnauthedWeb` is assumed to be `false` if the property is not set on a remote actor, ie., show public posts by default.

~~WIP as I still want to work on the documentation for this a bit.~~

New props are already in the namespace document: https://gotosocial.org/ns

Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4315
Reviewed-by: kim <gruf@noreply.codeberg.org>
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Co-committed-by: tobi <tobi.smethurst@protonmail.com>

1 files changed, 217 insertions, 202 deletions

diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index d8cfb9b82..9bbebcc4e 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -292,88 +292,96 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 
 	accounts := map[string]*gtsmodel.Account{
 		"instance_account": {
-			ID:                    "01AY6P665V14JJR0AFVRT7311Y",
-			Username:              "localhost:8080",
-			CreatedAt:             TimeMustParse("2020-05-17T13:10:59Z"),
-			UpdatedAt:             TimeMustParse("2020-05-17T13:10:59Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(true),
-			URI:                   "http://localhost:8080/users/localhost:8080",
-			URL:                   "http://localhost:8080/@localhost:8080",
-			PublicKeyURI:          "http://localhost:8080/users/localhost:8080#main-key",
-			InboxURI:              "http://localhost:8080/users/localhost:8080/inbox",
-			OutboxURI:             "http://localhost:8080/users/localhost:8080/outbox",
-			FollowersURI:          "http://localhost:8080/users/localhost:8080/followers",
-			FollowingURI:          "http://localhost:8080/users/localhost:8080/following",
-			FeaturedCollectionURI: "http://localhost:8080/users/localhost:8080/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypeService,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
+			ID:                           "01AY6P665V14JJR0AFVRT7311Y",
+			Username:                     "localhost:8080",
+			CreatedAt:                    TimeMustParse("2020-05-17T13:10:59Z"),
+			UpdatedAt:                    TimeMustParse("2020-05-17T13:10:59Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://localhost:8080/users/localhost:8080",
+			URL:                          "http://localhost:8080/@localhost:8080",
+			PublicKeyURI:                 "http://localhost:8080/users/localhost:8080#main-key",
+			InboxURI:                     "http://localhost:8080/users/localhost:8080/inbox",
+			OutboxURI:                    "http://localhost:8080/users/localhost:8080/outbox",
+			FollowersURI:                 "http://localhost:8080/users/localhost:8080/followers",
+			FollowingURI:                 "http://localhost:8080/users/localhost:8080/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/localhost:8080/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypeService,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"unconfirmed_account": {
-			ID:                    "01F8MH0BBE4FHXPH513MBVFHB0",
-			Username:              "weed_lord420",
-			CreatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			UpdatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(false),
-			URI:                   "http://localhost:8080/users/weed_lord420",
-			URL:                   "http://localhost:8080/@weed_lord420",
-			InboxURI:              "http://localhost:8080/users/weed_lord420/inbox",
-			OutboxURI:             "http://localhost:8080/users/weed_lord420/outbox",
-			FollowersURI:          "http://localhost:8080/users/weed_lord420/followers",
-			FollowingURI:          "http://localhost:8080/users/weed_lord420/following",
-			FeaturedCollectionURI: "http://localhost:8080/users/weed_lord420/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "http://localhost:8080/users/weed_lord420#main-key",
-			Settings:              settings["unconfirmed_account"],
+			ID:                           "01F8MH0BBE4FHXPH513MBVFHB0",
+			Username:                     "weed_lord420",
+			CreatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(false),
+			URI:                          "http://localhost:8080/users/weed_lord420",
+			URL:                          "http://localhost:8080/@weed_lord420",
+			InboxURI:                     "http://localhost:8080/users/weed_lord420/inbox",
+			OutboxURI:                    "http://localhost:8080/users/weed_lord420/outbox",
+			FollowersURI:                 "http://localhost:8080/users/weed_lord420/followers",
+			FollowingURI:                 "http://localhost:8080/users/weed_lord420/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/weed_lord420/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://localhost:8080/users/weed_lord420#main-key",
+			Settings:                     settings["unconfirmed_account"],
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"admin_account": {
-			ID:                    "01F8MH17FWEB39HZJ76B6VXSKF",
-			Username:              "admin",
-			CreatedAt:             TimeMustParse("2022-05-17T13:10:59Z"),
-			UpdatedAt:             TimeMustParse("2022-05-17T13:10:59Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(true),
-			URI:                   "http://localhost:8080/users/admin",
-			URL:                   "http://localhost:8080/@admin",
-			PublicKeyURI:          "http://localhost:8080/users/admin#main-key",
-			InboxURI:              "http://localhost:8080/users/admin/inbox",
-			OutboxURI:             "http://localhost:8080/users/admin/outbox",
-			FollowersURI:          "http://localhost:8080/users/admin/followers",
-			FollowingURI:          "http://localhost:8080/users/admin/following",
-			FeaturedCollectionURI: "http://localhost:8080/users/admin/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			Settings:              settings["admin_account"],
+			ID:                           "01F8MH17FWEB39HZJ76B6VXSKF",
+			Username:                     "admin",
+			CreatedAt:                    TimeMustParse("2022-05-17T13:10:59Z"),
+			UpdatedAt:                    TimeMustParse("2022-05-17T13:10:59Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://localhost:8080/users/admin",
+			URL:                          "http://localhost:8080/@admin",
+			PublicKeyURI:                 "http://localhost:8080/users/admin#main-key",
+			InboxURI:                     "http://localhost:8080/users/admin/inbox",
+			OutboxURI:                    "http://localhost:8080/users/admin/outbox",
+			FollowersURI:                 "http://localhost:8080/users/admin/followers",
+			FollowingURI:                 "http://localhost:8080/users/admin/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/admin/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			Settings:                     settings["admin_account"],
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"local_account_1": {
-			ID:                      "01F8MH1H7YV1Z7D2C8K2730QBF",
-			Username:                "the_mighty_zork",
-			AvatarMediaAttachmentID: "01F8MH58A357CV5K7R7TJMSH6S",
-			HeaderMediaAttachmentID: "01PFPMWK2FF0D9WMHEJHR07C3Q",
-			DisplayName:             "original zork (he/they)",
-			Note:                    "<p>hey yo this is my profile!</p>",
-			NoteRaw:                 "hey yo this is my profile!",
-			CreatedAt:               TimeMustParse("2022-05-20T11:09:18Z"),
-			UpdatedAt:               TimeMustParse("2022-05-20T11:09:18Z"),
-			Locked:                  util.Ptr(false),
-			Discoverable:            util.Ptr(true),
-			URI:                     "http://localhost:8080/users/the_mighty_zork",
-			URL:                     "http://localhost:8080/@the_mighty_zork",
-			InboxURI:                "http://localhost:8080/users/the_mighty_zork/inbox",
-			OutboxURI:               "http://localhost:8080/users/the_mighty_zork/outbox",
-			FollowersURI:            "http://localhost:8080/users/the_mighty_zork/followers",
-			FollowingURI:            "http://localhost:8080/users/the_mighty_zork/following",
-			FeaturedCollectionURI:   "http://localhost:8080/users/the_mighty_zork/collections/featured",
-			ActorType:               gtsmodel.AccountActorTypePerson,
-			PrivateKey:              &rsa.PrivateKey{},
-			PublicKey:               &rsa.PublicKey{},
-			PublicKeyURI:            "http://localhost:8080/users/the_mighty_zork/main-key",
-			Settings:                settings["local_account_1"],
+			ID:                           "01F8MH1H7YV1Z7D2C8K2730QBF",
+			Username:                     "the_mighty_zork",
+			AvatarMediaAttachmentID:      "01F8MH58A357CV5K7R7TJMSH6S",
+			HeaderMediaAttachmentID:      "01PFPMWK2FF0D9WMHEJHR07C3Q",
+			DisplayName:                  "original zork (he/they)",
+			Note:                         "<p>hey yo this is my profile!</p>",
+			NoteRaw:                      "hey yo this is my profile!",
+			CreatedAt:                    TimeMustParse("2022-05-20T11:09:18Z"),
+			UpdatedAt:                    TimeMustParse("2022-05-20T11:09:18Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://localhost:8080/users/the_mighty_zork",
+			URL:                          "http://localhost:8080/@the_mighty_zork",
+			InboxURI:                     "http://localhost:8080/users/the_mighty_zork/inbox",
+			OutboxURI:                    "http://localhost:8080/users/the_mighty_zork/outbox",
+			FollowersURI:                 "http://localhost:8080/users/the_mighty_zork/followers",
+			FollowingURI:                 "http://localhost:8080/users/the_mighty_zork/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/the_mighty_zork/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://localhost:8080/users/the_mighty_zork/main-key",
+			Settings:                     settings["local_account_1"],
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(false),
 		},
 		"local_account_2": {
 			ID:          "01F8MH5NBDF2MV7CTC4Q5128HF",
@@ -399,24 +407,26 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 					Value: "120",
 				},
 			},
-			Note:                  "<p>i post about things that concern me</p>",
-			NoteRaw:               "i post about things that concern me",
-			CreatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			UpdatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                util.Ptr(true),
-			Discoverable:          util.Ptr(false),
-			URI:                   "http://localhost:8080/users/1happyturtle",
-			URL:                   "http://localhost:8080/@1happyturtle",
-			InboxURI:              "http://localhost:8080/users/1happyturtle/inbox",
-			OutboxURI:             "http://localhost:8080/users/1happyturtle/outbox",
-			FollowersURI:          "http://localhost:8080/users/1happyturtle/followers",
-			FollowingURI:          "http://localhost:8080/users/1happyturtle/following",
-			FeaturedCollectionURI: "http://localhost:8080/users/1happyturtle/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "http://localhost:8080/users/1happyturtle#main-key",
-			Settings:              settings["local_account_2"],
+			Note:                         "<p>i post about things that concern me</p>",
+			NoteRaw:                      "i post about things that concern me",
+			CreatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(true),
+			Discoverable:                 util.Ptr(false),
+			URI:                          "http://localhost:8080/users/1happyturtle",
+			URL:                          "http://localhost:8080/@1happyturtle",
+			InboxURI:                     "http://localhost:8080/users/1happyturtle/inbox",
+			OutboxURI:                    "http://localhost:8080/users/1happyturtle/outbox",
+			FollowersURI:                 "http://localhost:8080/users/1happyturtle/followers",
+			FollowingURI:                 "http://localhost:8080/users/1happyturtle/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/1happyturtle/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://localhost:8080/users/1happyturtle#main-key",
+			Settings:                     settings["local_account_2"],
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"local_account_3": {
 			ID:                      "01JPCMD83Y4WR901094YES3QC5",
@@ -443,116 +453,126 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 					Value: "you can do about it",
 				},
 			},
-			Note:                  "<p>I'm a test account that posts a shitload of media and I have my account rendered in \"gallery\" mode</p>",
-			NoteRaw:               "I'm a test account that posts a shitload of media and I have my account rendered in \"gallery\" mode",
-			CreatedAt:             TimeMustParse("2025-03-15T11:08:00Z"),
-			UpdatedAt:             TimeMustParse("2025-03-15T11:08:00Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(false),
-			URI:                   "http://localhost:8080/users/media_mogul",
-			URL:                   "http://localhost:8080/@media_mogul",
-			InboxURI:              "http://localhost:8080/users/media_mogul/inbox",
-			OutboxURI:             "http://localhost:8080/users/media_mogul/outbox",
-			FollowersURI:          "http://localhost:8080/users/media_mogul/followers",
-			FollowingURI:          "http://localhost:8080/users/media_mogul/following",
-			FeaturedCollectionURI: "http://localhost:8080/users/media_mogul/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "http://localhost:8080/users/media_mogul#main-key",
-			Settings:              settings["local_account_3"],
+			Note:                         "<p>I'm a test account that posts a shitload of media and I have my account rendered in \"gallery\" mode</p>",
+			NoteRaw:                      "I'm a test account that posts a shitload of media and I have my account rendered in \"gallery\" mode",
+			CreatedAt:                    TimeMustParse("2025-03-15T11:08:00Z"),
+			UpdatedAt:                    TimeMustParse("2025-03-15T11:08:00Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(false),
+			URI:                          "http://localhost:8080/users/media_mogul",
+			URL:                          "http://localhost:8080/@media_mogul",
+			InboxURI:                     "http://localhost:8080/users/media_mogul/inbox",
+			OutboxURI:                    "http://localhost:8080/users/media_mogul/outbox",
+			FollowersURI:                 "http://localhost:8080/users/media_mogul/followers",
+			FollowingURI:                 "http://localhost:8080/users/media_mogul/following",
+			FeaturedCollectionURI:        "http://localhost:8080/users/media_mogul/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://localhost:8080/users/media_mogul#main-key",
+			Settings:                     settings["local_account_3"],
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(false),
 		},
 		"remote_account_1": {
-			ID:                    "01F8MH5ZK5VRH73AKHQM6Y9VNX",
-			Username:              "foss_satan",
-			Domain:                "fossbros-anonymous.io",
-			DisplayName:           "big gerald",
-			Note:                  "i post about like, i dunno, stuff, or whatever!!!!",
-			CreatedAt:             TimeMustParse("2021-09-26T12:52:36+02:00"),
-			UpdatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(true),
-			URI:                   "http://fossbros-anonymous.io/users/foss_satan",
-			URL:                   "http://fossbros-anonymous.io/@foss_satan",
-			InboxURI:              "http://fossbros-anonymous.io/users/foss_satan/inbox",
-			SharedInboxURI:        util.Ptr("http://fossbros-anonymous.io/inbox"),
-			OutboxURI:             "http://fossbros-anonymous.io/users/foss_satan/outbox",
-			FollowersURI:          "http://fossbros-anonymous.io/users/foss_satan/followers",
-			FollowingURI:          "http://fossbros-anonymous.io/users/foss_satan/following",
-			FeaturedCollectionURI: "http://fossbros-anonymous.io/users/foss_satan/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "http://fossbros-anonymous.io/users/foss_satan/main-key",
+			ID:                           "01F8MH5ZK5VRH73AKHQM6Y9VNX",
+			Username:                     "foss_satan",
+			Domain:                       "fossbros-anonymous.io",
+			DisplayName:                  "big gerald",
+			Note:                         "i post about like, i dunno, stuff, or whatever!!!!",
+			CreatedAt:                    TimeMustParse("2021-09-26T12:52:36+02:00"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://fossbros-anonymous.io/users/foss_satan",
+			URL:                          "http://fossbros-anonymous.io/@foss_satan",
+			InboxURI:                     "http://fossbros-anonymous.io/users/foss_satan/inbox",
+			SharedInboxURI:               util.Ptr("http://fossbros-anonymous.io/inbox"),
+			OutboxURI:                    "http://fossbros-anonymous.io/users/foss_satan/outbox",
+			FollowersURI:                 "http://fossbros-anonymous.io/users/foss_satan/followers",
+			FollowingURI:                 "http://fossbros-anonymous.io/users/foss_satan/following",
+			FeaturedCollectionURI:        "http://fossbros-anonymous.io/users/foss_satan/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://fossbros-anonymous.io/users/foss_satan/main-key",
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"remote_account_2": {
-			ID:                    "01FHMQX3GAABWSM0S2VZEC2SWC",
-			Username:              "Some_User",
-			Domain:                "example.org",
-			DisplayName:           "some user",
-			Note:                  "i'm a real son of a gun",
-			CreatedAt:             TimeMustParse("2020-08-10T14:13:28+02:00"),
-			UpdatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                util.Ptr(true),
-			Discoverable:          util.Ptr(true),
-			URI:                   "http://example.org/users/Some_User",
-			URL:                   "http://example.org/@Some_User",
-			InboxURI:              "http://example.org/users/Some_User/inbox",
-			SharedInboxURI:        util.Ptr(""),
-			OutboxURI:             "http://example.org/users/Some_User/outbox",
-			FollowersURI:          "http://example.org/users/Some_User/followers",
-			FollowingURI:          "http://example.org/users/Some_User/following",
-			FeaturedCollectionURI: "http://example.org/users/Some_User/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "http://example.org/users/Some_User#main-key",
+			ID:                           "01FHMQX3GAABWSM0S2VZEC2SWC",
+			Username:                     "Some_User",
+			Domain:                       "example.org",
+			DisplayName:                  "some user",
+			Note:                         "i'm a real son of a gun",
+			CreatedAt:                    TimeMustParse("2020-08-10T14:13:28+02:00"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(true),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://example.org/users/Some_User",
+			URL:                          "http://example.org/@Some_User",
+			InboxURI:                     "http://example.org/users/Some_User/inbox",
+			SharedInboxURI:               util.Ptr(""),
+			OutboxURI:                    "http://example.org/users/Some_User/outbox",
+			FollowersURI:                 "http://example.org/users/Some_User/followers",
+			FollowingURI:                 "http://example.org/users/Some_User/following",
+			FeaturedCollectionURI:        "http://example.org/users/Some_User/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://example.org/users/Some_User#main-key",
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(false),
 		},
 		"remote_account_3": {
-			ID:                      "062G5WYKY35KKD12EMSM3F8PJ8",
-			Username:                "her_fuckin_maj",
-			Domain:                  "thequeenisstillalive.technology",
-			DisplayName:             "lizzzieeeeeeeeeeee",
-			Note:                    "if i die blame charles don't let that fuck become king",
-			CreatedAt:               TimeMustParse("2020-08-10T14:13:28+02:00"),
-			UpdatedAt:               TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                  util.Ptr(true),
-			Discoverable:            util.Ptr(true),
-			URI:                     "http://thequeenisstillalive.technology/users/her_fuckin_maj",
-			URL:                     "http://thequeenisstillalive.technology/@her_fuckin_maj",
-			InboxURI:                "http://thequeenisstillalive.technology/users/her_fuckin_maj/inbox",
-			SharedInboxURI:          util.Ptr(""),
-			OutboxURI:               "http://thequeenisstillalive.technology/users/her_fuckin_maj/outbox",
-			FollowersURI:            "http://thequeenisstillalive.technology/users/her_fuckin_maj/followers",
-			FollowingURI:            "http://thequeenisstillalive.technology/users/her_fuckin_maj/following",
-			FeaturedCollectionURI:   "http://thequeenisstillalive.technology/users/her_fuckin_maj/collections/featured",
-			ActorType:               gtsmodel.AccountActorTypePerson,
-			PrivateKey:              &rsa.PrivateKey{},
-			PublicKey:               &rsa.PublicKey{},
-			PublicKeyURI:            "http://thequeenisstillalive.technology/users/her_fuckin_maj#main-key",
-			HeaderMediaAttachmentID: "01PFPMWK2FF0D9WMHEJHR07C3R",
+			ID:                           "062G5WYKY35KKD12EMSM3F8PJ8",
+			Username:                     "her_fuckin_maj",
+			Domain:                       "thequeenisstillalive.technology",
+			DisplayName:                  "lizzzieeeeeeeeeeee",
+			Note:                         "if i die blame charles don't let that fuck become king",
+			CreatedAt:                    TimeMustParse("2020-08-10T14:13:28+02:00"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(true),
+			Discoverable:                 util.Ptr(true),
+			URI:                          "http://thequeenisstillalive.technology/users/her_fuckin_maj",
+			URL:                          "http://thequeenisstillalive.technology/@her_fuckin_maj",
+			InboxURI:                     "http://thequeenisstillalive.technology/users/her_fuckin_maj/inbox",
+			SharedInboxURI:               util.Ptr(""),
+			OutboxURI:                    "http://thequeenisstillalive.technology/users/her_fuckin_maj/outbox",
+			FollowersURI:                 "http://thequeenisstillalive.technology/users/her_fuckin_maj/followers",
+			FollowingURI:                 "http://thequeenisstillalive.technology/users/her_fuckin_maj/following",
+			FeaturedCollectionURI:        "http://thequeenisstillalive.technology/users/her_fuckin_maj/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "http://thequeenisstillalive.technology/users/her_fuckin_maj#main-key",
+			HeaderMediaAttachmentID:      "01PFPMWK2FF0D9WMHEJHR07C3R",
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 		"remote_account_4": {
-			ID:                    "07GZRBAEMBNKGZ8Z9VSKSXKR98",
-			Username:              "üser",
-			Domain:                "xn--xample-ova.org",
-			CreatedAt:             TimeMustParse("2020-08-10T14:13:28+02:00"),
-			UpdatedAt:             TimeMustParse("2022-06-04T13:12:00Z"),
-			Locked:                util.Ptr(false),
-			Discoverable:          util.Ptr(false),
-			URI:                   "https://xn--xample-ova.org/users/%C3%BCser",
-			URL:                   "https://xn--xample-ova.org/users/@%C3%BCser",
-			FetchedAt:             time.Time{},
-			InboxURI:              "https://xn--xample-ova.org/users/%C3%BCser/inbox",
-			SharedInboxURI:        util.Ptr(""),
-			OutboxURI:             "https://xn--xample-ova.org/users/%C3%BCser/outbox",
-			FollowersURI:          "https://xn--xample-ova.org/users/%C3%BCser/followers",
-			FollowingURI:          "https://xn--xample-ova.org/users/%C3%BCser/following",
-			FeaturedCollectionURI: "https://xn--xample-ova.org/users/%C3%BCser/collections/featured",
-			ActorType:             gtsmodel.AccountActorTypePerson,
-			PrivateKey:            &rsa.PrivateKey{},
-			PublicKey:             &rsa.PublicKey{},
-			PublicKeyURI:          "https://xn--xample-ova.org/users/%C3%BCser#main-key",
+			ID:                           "07GZRBAEMBNKGZ8Z9VSKSXKR98",
+			Username:                     "üser",
+			Domain:                       "xn--xample-ova.org",
+			CreatedAt:                    TimeMustParse("2020-08-10T14:13:28+02:00"),
+			UpdatedAt:                    TimeMustParse("2022-06-04T13:12:00Z"),
+			Locked:                       util.Ptr(false),
+			Discoverable:                 util.Ptr(false),
+			URI:                          "https://xn--xample-ova.org/users/%C3%BCser",
+			URL:                          "https://xn--xample-ova.org/users/@%C3%BCser",
+			FetchedAt:                    time.Time{},
+			InboxURI:                     "https://xn--xample-ova.org/users/%C3%BCser/inbox",
+			SharedInboxURI:               util.Ptr(""),
+			OutboxURI:                    "https://xn--xample-ova.org/users/%C3%BCser/outbox",
+			FollowersURI:                 "https://xn--xample-ova.org/users/%C3%BCser/followers",
+			FollowingURI:                 "https://xn--xample-ova.org/users/%C3%BCser/following",
+			FeaturedCollectionURI:        "https://xn--xample-ova.org/users/%C3%BCser/collections/featured",
+			ActorType:                    gtsmodel.AccountActorTypePerson,
+			PrivateKey:                   &rsa.PrivateKey{},
+			PublicKey:                    &rsa.PublicKey{},
+			PublicKeyURI:                 "https://xn--xample-ova.org/users/%C3%BCser#main-key",
+			HidesToPublicFromUnauthedWeb: util.Ptr(false),
+			HidesCcPublicFromUnauthedWeb: util.Ptr(true),
 		},
 	}
 
@@ -619,7 +639,6 @@ func NewTestAccountSettings() map[string]*gtsmodel.AccountSettings {
 			Language:        "en",
 			EnableRSS:       util.Ptr(false),
 			HideCollections: util.Ptr(false),
-			WebVisibility:   gtsmodel.VisibilityPublic,
 			WebLayout:       gtsmodel.WebLayoutMicroblog,
 		},
 		"admin_account": {
@@ -631,7 +650,6 @@ func NewTestAccountSettings() map[string]*gtsmodel.AccountSettings {
 			Language:        "en",
 			EnableRSS:       util.Ptr(true),
 			HideCollections: util.Ptr(false),
-			WebVisibility:   gtsmodel.VisibilityPublic,
 			WebLayout:       gtsmodel.WebLayoutMicroblog,
 		},
 		"local_account_1": {
@@ -643,7 +661,6 @@ func NewTestAccountSettings() map[string]*gtsmodel.AccountSettings {
 			Language:        "en",
 			EnableRSS:       util.Ptr(true),
 			HideCollections: util.Ptr(false),
-			WebVisibility:   gtsmodel.VisibilityUnlocked,
 			WebLayout:       gtsmodel.WebLayoutMicroblog,
 		},
 		"local_account_2": {
@@ -655,7 +672,6 @@ func NewTestAccountSettings() map[string]*gtsmodel.AccountSettings {
 			Language:        "fr",
 			EnableRSS:       util.Ptr(false),
 			HideCollections: util.Ptr(true),
-			WebVisibility:   gtsmodel.VisibilityPublic,
 			WebLayout:       gtsmodel.WebLayoutMicroblog,
 		},
 		"local_account_3": {
@@ -667,7 +683,6 @@ func NewTestAccountSettings() map[string]*gtsmodel.AccountSettings {
 			Language:        "en",
 			EnableRSS:       util.Ptr(true),
 			HideCollections: util.Ptr(false),
-			WebVisibility:   gtsmodel.VisibilityUnlocked,
 			WebLayout:       gtsmodel.WebLayoutGallery,
 		},
 	}
@@ -2761,7 +2776,7 @@ func NewTestStatuses() map[string]*gtsmodel.Status {
 			InReplyToAccountID:  "01F8MH17FWEB39HZJ76B6VXSKF",
 			InReplyToURI:        "http://localhost:8080/users/admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R",
 			ContentWarning:      "some unknown media included",
-			Visibility:          gtsmodel.VisibilityPublic,
+			Visibility:          gtsmodel.VisibilityUnlocked,
 			Sensitive:           util.Ptr(true),
 			Language:            "en",
 			Federated:           util.Ptr(true),