From 5c874e921769093428966fa7ecdf723719cb9067 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 21 Feb 2020 17:12:45 +0100 Subject: [PATCH 1/4] fix selector for resolved related content --- dist/bundle.es.js | 16 +++++++--------- src/redux/selectors/claims.js | 6 +----- src/util/query-params.js | 34 ++++++++++++++++++---------------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 4f63f2d..81c0c99 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1120,11 +1120,13 @@ const getSearchQueryString = (query, options = {}) => { if (includeUserOptions) { const claimType = options[SEARCH_OPTIONS.CLAIM_TYPE]; - queryParams.push(`claimType=${claimType}`); + if (claimType) { + queryParams.push(`claimType=${claimType}`); - // If they are only searching for channels, strip out the media info - if (!claimType.includes(SEARCH_OPTIONS.INCLUDE_CHANNELS)) { - queryParams.push(`mediaType=${[SEARCH_OPTIONS.MEDIA_FILE, SEARCH_OPTIONS.MEDIA_AUDIO, SEARCH_OPTIONS.MEDIA_VIDEO, SEARCH_OPTIONS.MEDIA_TEXT, SEARCH_OPTIONS.MEDIA_IMAGE, SEARCH_OPTIONS.MEDIA_APPLICATION].reduce((acc, currentOption) => options[currentOption] ? `${acc}${currentOption},` : acc, '')}`); + // If they are only searching for channels, strip out the media info + if (!claimType.includes(SEARCH_OPTIONS.INCLUDE_CHANNELS)) { + queryParams.push(`mediaType=${[SEARCH_OPTIONS.MEDIA_FILE, SEARCH_OPTIONS.MEDIA_AUDIO, SEARCH_OPTIONS.MEDIA_VIDEO, SEARCH_OPTIONS.MEDIA_TEXT, SEARCH_OPTIONS.MEDIA_IMAGE, SEARCH_OPTIONS.MEDIA_APPLICATION].reduce((acc, currentOption) => options[currentOption] ? `${acc}${currentOption},` : acc, '')}`); + } } } @@ -2395,13 +2397,9 @@ const makeSelectResolvedRecommendedContentForUri = (uri, size) => reselect.creat return; } - const options = { related_to: claim.claim_id, isBackgroundSearch: true }; - if (!isMature) { - options['nsfw'] = false; - } + const options = { related_to: claim.claim_id, size, isBackgroundSearch: false }; const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options); - let results = resolvedResultsByQuery[searchQuery]; if (results) { results = results.filter(result => buildURI({ streamClaimId: result.claimId, streamName: result.name }) !== currentUri); diff --git a/src/redux/selectors/claims.js b/src/redux/selectors/claims.js index 6f67721..4db130a 100644 --- a/src/redux/selectors/claims.js +++ b/src/redux/selectors/claims.js @@ -701,13 +701,9 @@ export const makeSelectResolvedRecommendedContentForUri = (uri: string, size: nu related_to?: string, nsfw?: boolean, isBackgroundSearch?: boolean, - } = { related_to: claim.claim_id, isBackgroundSearch: true }; - if (!isMature) { - options['nsfw'] = false; - } + } = { related_to: claim.claim_id, size, isBackgroundSearch: false }; const searchQuery = getSearchQueryString(title.replace(/\//, ' '), options); - let results = resolvedResultsByQuery[searchQuery]; if (results) { results = results.filter( diff --git a/src/util/query-params.js b/src/util/query-params.js index 80a1d54..bb1d5ec 100644 --- a/src/util/query-params.js +++ b/src/util/query-params.js @@ -48,23 +48,25 @@ export const getSearchQueryString = ( if (includeUserOptions) { const claimType = options[SEARCH_OPTIONS.CLAIM_TYPE]; - queryParams.push(`claimType=${claimType}`); + if (claimType) { + queryParams.push(`claimType=${claimType}`); - // If they are only searching for channels, strip out the media info - if (!claimType.includes(SEARCH_OPTIONS.INCLUDE_CHANNELS)) { - queryParams.push( - `mediaType=${[ - SEARCH_OPTIONS.MEDIA_FILE, - SEARCH_OPTIONS.MEDIA_AUDIO, - SEARCH_OPTIONS.MEDIA_VIDEO, - SEARCH_OPTIONS.MEDIA_TEXT, - SEARCH_OPTIONS.MEDIA_IMAGE, - SEARCH_OPTIONS.MEDIA_APPLICATION, - ].reduce( - (acc, currentOption) => (options[currentOption] ? `${acc}${currentOption},` : acc), - '' - )}` - ); + // If they are only searching for channels, strip out the media info + if (!claimType.includes(SEARCH_OPTIONS.INCLUDE_CHANNELS)) { + queryParams.push( + `mediaType=${[ + SEARCH_OPTIONS.MEDIA_FILE, + SEARCH_OPTIONS.MEDIA_AUDIO, + SEARCH_OPTIONS.MEDIA_VIDEO, + SEARCH_OPTIONS.MEDIA_TEXT, + SEARCH_OPTIONS.MEDIA_IMAGE, + SEARCH_OPTIONS.MEDIA_APPLICATION, + ].reduce( + (acc, currentOption) => (options[currentOption] ? `${acc}${currentOption},` : acc), + '' + )}` + ); + } } } -- 2.45.2 From 0bbebb186ed3d65edffba306869ba511d961bf95 Mon Sep 17 00:00:00 2001 From: jessop Date: Fri, 21 Feb 2020 12:05:49 -0500 Subject: [PATCH 2/4] fix bug in sync --- dist/bundle.es.js | 2 +- src/redux/actions/sync.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 4f63f2d..451bd49 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1627,7 +1627,7 @@ function doPopulateSharedUserState(sharedSettings) { const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P } }); }; } diff --git a/src/redux/actions/sync.js b/src/redux/actions/sync.js index 9a1854e..704e0dd 100644 --- a/src/redux/actions/sync.js +++ b/src/redux/actions/sync.js @@ -38,7 +38,7 @@ export function doPopulateSharedUserState(sharedSettings: any) { const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: ACTIONS.USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P }, + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P }, }); }; } -- 2.45.2 From b4fbc212ca6008ec05c31116182bf6dfa7a1cbcb Mon Sep 17 00:00:00 2001 From: jessop Date: Fri, 21 Feb 2020 12:20:18 -0500 Subject: [PATCH 3/4] remove tvWelcome --- dist/bundle.es.js | 10 +++++----- src/redux/actions/sync.js | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 451bd49..dd87ebe 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -1614,9 +1614,9 @@ var _extends$2 = Object.assign || function (target) { for (var i = 1; i < argume function extractUserState(rawObj) { if (rawObj && rawObj.version === '0.1' && rawObj.value) { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value; + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = rawObj.value; - return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, tv_welcome_version ? { tv_welcome_version } : {}, sharing_3P ? { sharing_3P } : {}); + return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blocked ? { blocked } : {}, settings ? { settings } : {}, app_welcome_version ? { app_welcome_version } : {}, sharing_3P ? { sharing_3P } : {}); } return {}; @@ -1624,10 +1624,10 @@ function extractUserState(rawObj) { function doPopulateSharedUserState(sharedSettings) { return dispatch => { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P } + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, allowAnalytics: sharing_3P } }); }; } @@ -1687,7 +1687,7 @@ const buildSharedStateMiddleware = (actions, sharedStateFilters, sharedStateCb) } const actionResult = next(action); - // Call `getState` after calling `next` to ensure the state has updated in response to the action + // Call `getState` after calling `next` tqo ensure the state has updated in response to the action const nextState = getState(); const shared = {}; diff --git a/src/redux/actions/sync.js b/src/redux/actions/sync.js index 704e0dd..28b8d7a 100644 --- a/src/redux/actions/sync.js +++ b/src/redux/actions/sync.js @@ -10,14 +10,13 @@ type SharedData = { blocked?: Array, settings?: any, app_welcome_version?: number, - tv_welcome_version?: number, sharing_3P?: boolean, }, }; function extractUserState(rawObj: SharedData) { if (rawObj && rawObj.version === '0.1' && rawObj.value) { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = rawObj.value; + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = rawObj.value; return { ...(subscriptions ? { subscriptions } : {}), @@ -25,7 +24,6 @@ function extractUserState(rawObj: SharedData) { ...(blocked ? { blocked } : {}), ...(settings ? { settings } : {}), ...(app_welcome_version ? { app_welcome_version } : {}), - ...(tv_welcome_version ? { tv_welcome_version } : {}), ...(sharing_3P ? { sharing_3P} : {}), }; } @@ -35,10 +33,10 @@ function extractUserState(rawObj: SharedData) { export function doPopulateSharedUserState(sharedSettings: any) { return (dispatch: Dispatch) => { - const { subscriptions, tags, blocked, settings, app_welcome_version, tv_welcome_version, sharing_3P } = extractUserState(sharedSettings); + const { subscriptions, tags, blocked, settings, app_welcome_version, sharing_3P } = extractUserState(sharedSettings); dispatch({ type: ACTIONS.USER_STATE_POPULATE, - data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, tvWelcomeVersion: tv_welcome_version, allowAnalytics: sharing_3P }, + data: { subscriptions, tags, blocked, settings, welcomeVersion: app_welcome_version, allowAnalytics: sharing_3P }, }); }; } -- 2.45.2 From 929c5de0e29e0e8fc0e11765cb20a90c0f984242 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sun, 23 Feb 2020 20:19:01 -0500 Subject: [PATCH 4/4] return repost claim in doRepost --- dist/bundle.es.js | 2 +- src/redux/actions/claims.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index 4f63f2d..f25e82b 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -3255,7 +3255,7 @@ function doRepost(options) { }); dispatch(doFetchClaimListMine(1, 10)); - resolve(); + resolve(repostClaim); } function failure(error) { diff --git a/src/redux/actions/claims.js b/src/redux/actions/claims.js index 4e12c8d..752e081 100644 --- a/src/redux/actions/claims.js +++ b/src/redux/actions/claims.js @@ -485,7 +485,7 @@ export function doRepost(options: StreamRepostOptions) { }); dispatch(doFetchClaimListMine(1, 10)); - resolve(); + resolve(repostClaim); } function failure(error) { -- 2.45.2