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

2025-03-28 08:44:30 +09:00 · 2025-03-28 08:44:30 +09:00 · 12ed20b6d5
commit 12ed20b6d5
parent a24031b527 0479efdbb6
257 changed files with 3505 additions and 2010 deletions
--- a/app/javascript/mastodon/utils/filters.ts
+++ b/app/javascript/mastodon/utils/filters.ts
@ -7,6 +7,11 @@ export const toServerSideType = (columnType: string) => {
    case 'account':
    case 'explore':
      return columnType;
+    case 'detailed':
+      return 'thread';
+    case 'bookmarks':
+    case 'favourites':
+      return 'home';
    default:
      if (columnType.includes('list:') || columnType.includes('antenna:')) {
        return 'home';