Fix bookmarks and favourites not being filtered (#34260)
This commit is contained in:
		@@ -99,6 +99,7 @@ class Bookmarks extends ImmutablePureComponent {
 | 
			
		||||
          onLoadMore={this.handleLoadMore}
 | 
			
		||||
          emptyMessage={emptyMessage}
 | 
			
		||||
          bindToDocument={!multiColumn}
 | 
			
		||||
          timelineId='bookmarks'
 | 
			
		||||
        />
 | 
			
		||||
 | 
			
		||||
        <Helmet>
 | 
			
		||||
 
 | 
			
		||||
@@ -99,6 +99,7 @@ class Favourites extends ImmutablePureComponent {
 | 
			
		||||
          onLoadMore={this.handleLoadMore}
 | 
			
		||||
          emptyMessage={emptyMessage}
 | 
			
		||||
          bindToDocument={!multiColumn}
 | 
			
		||||
          timelineId='favourites'
 | 
			
		||||
        />
 | 
			
		||||
 | 
			
		||||
        <Helmet>
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ export const makeGetStatus = () => {
 | 
			
		||||
      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
 | 
			
		||||
      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
 | 
			
		||||
      getFilters,
 | 
			
		||||
      (_, { contextType }) => contextType === 'detailed',
 | 
			
		||||
      (_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
 | 
			
		||||
    ],
 | 
			
		||||
 | 
			
		||||
    (statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,9 @@ export const toServerSideType = (columnType: string) => {
 | 
			
		||||
      return columnType;
 | 
			
		||||
    case 'detailed':
 | 
			
		||||
      return 'thread';
 | 
			
		||||
    case 'bookmarks':
 | 
			
		||||
    case 'favourites':
 | 
			
		||||
      return 'home';
 | 
			
		||||
    default:
 | 
			
		||||
      if (columnType.includes('list:')) {
 | 
			
		||||
        return 'home';
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user