diff --git a/ui/component/searchOptions/index.js b/ui/component/searchOptions/index.js index 012cbf3c6..125535276 100644 --- a/ui/component/searchOptions/index.js +++ b/ui/component/searchOptions/index.js @@ -8,7 +8,7 @@ import SearchOptions from './view'; const select = state => ({ options: selectSearchOptions(state), expanded: selectSearchOptionsExpanded(state), - query: makeSelectQueryWithOptions()(state), + query: makeSelectQueryWithOptions(undefined, {})(state), }); const perform = (dispatch, ownProps) => { diff --git a/ui/page/search/view.jsx b/ui/page/search/view.jsx index b833eb8af..c34280899 100644 --- a/ui/page/search/view.jsx +++ b/ui/page/search/view.jsx @@ -46,9 +46,8 @@ export default function SearchPage(props: Props) { const urlParams = new URLSearchParams(location.search); const urlQuery = urlParams.get('q') || ''; const additionalOptions: AdditionalOptions = { isBackgroundSearch: false }; - if (!showNsfw) { - additionalOptions['nsfw'] = false; - } + + additionalOptions['nsfw'] = showNsfw; const modifiedUrlQuery = urlQuery .trim() diff --git a/ui/redux/selectors/search.js b/ui/redux/selectors/search.js index d749944d4..ce60b4405 100644 --- a/ui/redux/selectors/search.js +++ b/ui/redux/selectors/search.js @@ -77,9 +77,7 @@ export const makeSelectRecommendedContentForUri = (uri: string) => isBackgroundSearch?: boolean, } = { related_to: claim.claim_id, isBackgroundSearch: true }; - if (!isMature) { - options['nsfw'] = false; - } + options['nsfw'] = isMature; const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options); let searchUris = searchUrisByQuery[searchQuery]; diff --git a/ui/util/query-params.js b/ui/util/query-params.js index a459fd23a..c0236b070 100644 --- a/ui/util/query-params.js +++ b/ui/util/query-params.js @@ -66,7 +66,7 @@ export const getSearchQueryString = (query: string, options: any = {}) => { const { related_to } = options; const { nsfw } = options; if (related_to) additionalOptions['related_to'] = related_to; - if (nsfw !== true) additionalOptions['nsfw'] = false; + if (nsfw === false) additionalOptions['nsfw'] = false; if (additionalOptions) { Object.keys(additionalOptions).forEach(key => {