Fix nsfw parameter in search page

This commit is contained in:
Franco Montenegro 2021-01-08 19:02:40 -03:00 committed by Sean Yesmunt
parent 93834fb281
commit d9b8f0310a
4 changed files with 5 additions and 8 deletions

View file

@ -8,7 +8,7 @@ import SearchOptions from './view';
const select = state => ({ const select = state => ({
options: selectSearchOptions(state), options: selectSearchOptions(state),
expanded: selectSearchOptionsExpanded(state), expanded: selectSearchOptionsExpanded(state),
query: makeSelectQueryWithOptions()(state), query: makeSelectQueryWithOptions(undefined, {})(state),
}); });
const perform = (dispatch, ownProps) => { const perform = (dispatch, ownProps) => {

View file

@ -46,9 +46,8 @@ export default function SearchPage(props: Props) {
const urlParams = new URLSearchParams(location.search); const urlParams = new URLSearchParams(location.search);
const urlQuery = urlParams.get('q') || ''; const urlQuery = urlParams.get('q') || '';
const additionalOptions: AdditionalOptions = { isBackgroundSearch: false }; const additionalOptions: AdditionalOptions = { isBackgroundSearch: false };
if (!showNsfw) {
additionalOptions['nsfw'] = false; additionalOptions['nsfw'] = showNsfw;
}
const modifiedUrlQuery = urlQuery const modifiedUrlQuery = urlQuery
.trim() .trim()

View file

@ -77,9 +77,7 @@ export const makeSelectRecommendedContentForUri = (uri: string) =>
isBackgroundSearch?: boolean, isBackgroundSearch?: boolean,
} = { related_to: claim.claim_id, isBackgroundSearch: true }; } = { related_to: claim.claim_id, isBackgroundSearch: true };
if (!isMature) { options['nsfw'] = isMature;
options['nsfw'] = false;
}
const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options); const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options);
let searchUris = searchUrisByQuery[searchQuery]; let searchUris = searchUrisByQuery[searchQuery];

View file

@ -66,7 +66,7 @@ export const getSearchQueryString = (query: string, options: any = {}) => {
const { related_to } = options; const { related_to } = options;
const { nsfw } = options; const { nsfw } = options;
if (related_to) additionalOptions['related_to'] = related_to; if (related_to) additionalOptions['related_to'] = related_to;
if (nsfw !== true) additionalOptions['nsfw'] = false; if (nsfw === false) additionalOptions['nsfw'] = false;
if (additionalOptions) { if (additionalOptions) {
Object.keys(additionalOptions).forEach(key => { Object.keys(additionalOptions).forEach(key => {