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

2024-04-03 12:12:09 +09:00 · 2024-04-03 12:12:09 +09:00 · 479c4fecc1
commit 479c4fecc1
parent 8c399cefce 4233ee1f59
63 changed files with 831 additions and 391 deletions
--- a/app/javascript/mastodon/models/status.ts
+++ b/app/javascript/mastodon/models/status.ts
@ -1,15 +1,4 @@
-export type StatusVisibility =
-  | 'public'
-  | 'unlisted'
-  | 'private'
-  | 'direct'
-  | 'public_unlisted'
-  | 'login'
-  | 'mutual'
-  | 'circle'
-  | 'personal'
-  | 'reply'
-  | 'limited';
+export type { StatusVisibility } from 'mastodon/api_types/statuses';

 // Temporary until we type it correctly
 export type Status = Immutable.Map<string, unknown>;