@ -5,9 +5,10 @@ import { createSelector } from 'reselect';
import { debounce } from 'lodash' ;
import { debounce } from 'lodash' ;
import { dequeueTimeline } from 'soapbox/actions/timelines' ;
import { dequeueTimeline } from 'soapbox/actions/timelines' ;
import { scrollTopTimeline } from '../../../actions/timelines' ;
import { scrollTopTimeline } from '../../../actions/timelines' ;
import { getSettings } from 'soapbox/actions/settings' ;
const makeGetStatusIds = ( ) => createSelector ( [
const makeGetStatusIds = ( ) => createSelector ( [
( state , { type } ) => state .get In ( [ 'settings' , type ] , ImmutableMap ( ) ) ,
( state , { type } ) => getSettings( state) .get ( type , ImmutableMap ( ) ) ,
( state , { type } ) => state . getIn ( [ 'timelines' , type , 'items' ] , ImmutableList ( ) ) ,
( state , { type } ) => state . getIn ( [ 'timelines' , type , 'items' ] , ImmutableList ( ) ) ,
( state ) => state . get ( 'statuses' ) ,
( state ) => state . get ( 'statuses' ) ,
( state ) => state . get ( 'me' ) ,
( state ) => state . get ( 'me' ) ,
@ -26,6 +27,10 @@ const makeGetStatusIds = () => createSelector([
showStatus = showStatus && ( statusForId . get ( 'in_reply_to_id' ) === null ) ;
showStatus = showStatus && ( statusForId . get ( 'in_reply_to_id' ) === null ) ;
}
}
if ( columnSettings . getIn ( [ 'shows' , 'direct' ] ) === false ) {
showStatus = showStatus && ( statusForId . get ( 'visibility' ) !== 'direct' ) ;
}
return showStatus ;
return showStatus ;
} ) ;
} ) ;
} ) ;
} ) ;