Merge branch 'remove-fragments-of-bookmark-folders' into 'main'

Remove fragments of bookmark folders

See merge request soapbox-pub/soapbox!3288

src/components/status-action-bar.tsx

@@ -146,7 +146,6 @@ interface IStatusActionBar {
   expandable?: boolean;
   space?: 'sm' | 'md' | 'lg';
   statusActionButtonTheme?: 'default' | 'inverse';
-  fromBookmarks?: boolean;
 }
 
 const StatusActionBar: React.FC<IStatusActionBar> = ({
@@ -154,7 +153,6 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
   expandable = true,
   space = 'sm',
   statusActionButtonTheme = 'default',
-  fromBookmarks = false,
 }) => {
   const intl = useIntl();
   const history = useHistory();

src/components/status-list.tsx

@@ -129,7 +129,6 @@ const StatusList: React.FC<IStatusList> = ({
         contextType={timelineId}
         showGroup={showGroup}
         variant={divideType === 'border' ? 'slim' : 'rounded'}
-        fromBookmarks={other.scrollKey === 'bookmarked_statuses'}
       />
     );
   };

src/components/status.tsx

@@ -58,7 +58,6 @@ export interface IStatus {
   variant?: 'default' | 'rounded' | 'slim';
   showGroup?: boolean;
   accountAction?: React.ReactElement;
-  fromBookmarks?: boolean;
 }
 
 const Status: React.FC<IStatus> = (props) => {
@@ -78,7 +77,6 @@ const Status: React.FC<IStatus> = (props) => {
     hideActionBar,
     variant = 'rounded',
     showGroup = true,
-    fromBookmarks = false,
   } = props;
 
   const intl = useIntl();
@@ -479,7 +477,7 @@ const Status: React.FC<IStatus> = (props) => {
 
             {(!hideActionBar && !isUnderReview) && (
               <div className='pt-4'>
-                <StatusActionBar status={actualStatus} fromBookmarks={fromBookmarks} />
+                <StatusActionBar status={actualStatus} />
               </div>
             )}
           </div>

src/reducers/status-lists.ts

@@ -120,7 +120,7 @@ const appendToList = (state: State, listType: string, statuses: APIEntity[], nex
 const prependOneToList = (state: State, listType: string, status: APIEntity) => {
   const statusId = getStatusId(status);
   return state.update(listType, StatusListRecord(), listMap => listMap.update('items', items => {
-    return ImmutableOrderedSet([statusId]).union(items as ImmutableOrderedSet<string>);
+    return ImmutableOrderedSet([statusId]).union(items);
   }));
 };
 

src/schemas/status.ts

@@ -33,7 +33,6 @@ const baseStatusSchema = z.object({
     name: z.string(),
     website: z.string().url().nullable().catch(null),
   }).nullable().catch(null),
-  bookmark_folder: z.string().nullable().catch(null),
   bookmarked: z.coerce.boolean(),
   card: cardSchema.nullable().catch(null),
   content: contentSchema,