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

app/javascript/mastodon/models/account.ts

@@ -129,6 +129,9 @@ export const accountDefaultValues: AccountShape = {
   hide_collections: false,
   other_settings: AccountOtherSettingsFactory(),
   subscribable: true,
+  // This comes from `ApiMutedAccountJSON`, but we should eventually
+  // store that in a different object.
+  mute_expires_at: null,
 };
 
 const AccountFactory = ImmutableRecord<AccountShape>(accountDefaultValues);