Merge remote-tracking branch 'parent/main' into upstream-20231110

app/javascript/mastodon/models/account.ts

@@ -59,6 +59,7 @@ const AccountOtherSettingsFactory = ImmutableRecord<AccountOtherSettingsShape>({
   link_preview: true,
   allow_quote: true,
   emoji_reaction_policy: 'allow',
+  subscription_policy: 'allow',
 });
 
 // Account
@@ -111,6 +112,7 @@ export const accountDefaultValues: AccountShape = {
   memorial: false,
   limited: false,
   moved: null,
+  hide_collections: false,
   other_settings: AccountOtherSettingsFactory(),
   subscribable: true,
 };