From 3b87f0aba695d769da16a95b53b933a8ffe26c94 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Mon, 13 Dec 2021 22:09:43 +0800 Subject: [PATCH] Remove `content_tags` and related functions No longer necessary. Also removed a few doToggleTagFollowDesktop props (unused by the View). --- ui/analytics.js | 7 ------- ui/component/claimListDiscover/index.js | 2 -- ui/component/claimListDiscover/view.jsx | 1 - ui/component/claimListHeader/index.js | 2 -- ui/component/claimTilesDiscover/index.js | 2 -- ui/component/claimTilesDiscover/view.jsx | 1 - ui/redux/actions/app.js | 12 ------------ ui/redux/actions/sync.js | 3 +-- ui/redux/actions/tags.js | 8 -------- 9 files changed, 1 insertion(+), 37 deletions(-) diff --git a/ui/analytics.js b/ui/analytics.js index b1f4be74f..e9973df13 100644 --- a/ui/analytics.js +++ b/ui/analytics.js @@ -60,7 +60,6 @@ type Analytics = { toggleInternal: (boolean, ?boolean) => void, apiLogView: (string, string, string, ?number, ?() => void) => Promise, apiLogPublish: (ChannelClaim | StreamClaim) => void, - apiSyncTags: ({}) => void, tagFollowEvent: (string, boolean, ?string) => void, playerLoadedEvent: (string, ?boolean) => void, playerVideoStartedEvent: (?boolean) => void, @@ -363,12 +362,6 @@ const analytics: Analytics = { Lbryio.call('event', 'publish', params); } }, - - apiSyncTags: (params) => { - if (internalAnalyticsEnabled && isProduction) { - Lbryio.call('content_tags', 'sync', params); - } - }, adsFetchedEvent: () => { sendGaEvent('ad_fetched'); }, diff --git a/ui/component/claimListDiscover/index.js b/ui/component/claimListDiscover/index.js index f33d5d619..ac2547388 100644 --- a/ui/component/claimListDiscover/index.js +++ b/ui/component/claimListDiscover/index.js @@ -9,7 +9,6 @@ import { doClaimSearch } from 'redux/actions/claims'; import * as SETTINGS from 'constants/settings'; import { selectFollowedTags } from 'redux/selectors/tags'; import { selectMutedChannels } from 'redux/selectors/blocked'; -import { doToggleTagFollowDesktop } from 'redux/actions/tags'; import { selectClientSetting, selectShowMatureContent, selectLanguage } from 'redux/selectors/settings'; import { selectModerationBlockList } from 'redux/selectors/comments'; import ClaimListDiscover from './view'; @@ -31,7 +30,6 @@ const select = (state, props) => ({ const perform = { doClaimSearch, - doToggleTagFollowDesktop, doFetchViewCount, }; diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx index 2f929b22c..0665c1f36 100644 --- a/ui/component/claimListDiscover/view.jsx +++ b/ui/component/claimListDiscover/view.jsx @@ -93,7 +93,6 @@ type Props = { // --- perform --- doClaimSearch: ({}) => void, - doToggleTagFollowDesktop: (string) => void, doFetchViewCount: (claimIdCsv: string) => void, }; diff --git a/ui/component/claimListHeader/index.js b/ui/component/claimListHeader/index.js index 4161961f7..57b712eaa 100644 --- a/ui/component/claimListHeader/index.js +++ b/ui/component/claimListHeader/index.js @@ -1,7 +1,6 @@ import { connect } from 'react-redux'; import { selectFetchingClaimSearch } from 'redux/selectors/claims'; import { selectFollowedTags } from 'redux/selectors/tags'; -import { doToggleTagFollowDesktop } from 'redux/actions/tags'; import { selectClientSetting, selectShowMatureContent, selectLanguage } from 'redux/selectors/settings'; import { doSetClientSetting } from 'redux/actions/settings'; import * as SETTINGS from 'constants/settings'; @@ -16,7 +15,6 @@ const select = (state) => ({ }); const perform = { - doToggleTagFollowDesktop, doSetClientSetting, }; diff --git a/ui/component/claimTilesDiscover/index.js b/ui/component/claimTilesDiscover/index.js index 1a18c5bcb..f2aa131c0 100644 --- a/ui/component/claimTilesDiscover/index.js +++ b/ui/component/claimTilesDiscover/index.js @@ -5,7 +5,6 @@ import { doClaimSearch } from 'redux/actions/claims'; import * as SETTINGS from 'constants/settings'; import { MATURE_TAGS } from 'constants/tags'; import { doFetchViewCount } from 'lbryinc'; -import { doToggleTagFollowDesktop } from 'redux/actions/tags'; import { selectClientSetting, selectShowMatureContent } from 'redux/selectors/settings'; import { selectMutedAndBlockedChannelIds } from 'redux/selectors/blocked'; import { ENABLE_NO_SOURCE_CLAIMS, SIMPLE_SITE } from 'config'; @@ -30,7 +29,6 @@ const select = (state, props) => { const perform = { doClaimSearch, - doToggleTagFollowDesktop, doFetchViewCount, }; diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx index 359800565..2bc6bac12 100644 --- a/ui/component/claimTilesDiscover/view.jsx +++ b/ui/component/claimTilesDiscover/view.jsx @@ -211,7 +211,6 @@ function areEqual(prev: Props, next: Props) { 'match', 'claimsByUri', 'doClaimSearch', - 'doToggleTagFollowDesktop', ]; const propKeys = Object.keys(next); diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js index 424090ec7..f84131700 100644 --- a/ui/redux/actions/app.js +++ b/ui/redux/actions/app.js @@ -17,7 +17,6 @@ import { doFetchFileInfos } from 'redux/actions/file_info'; import { doClearSupport, doBalanceSubscribe } from 'redux/actions/wallet'; import { doClearPublish } from 'redux/actions/publish'; import { Lbryio } from 'lbryinc'; -import { selectFollowedTagsList } from 'redux/selectors/tags'; import { doToast, doError, doNotificationList } from 'redux/actions/notifications'; import pushNotifications from '$web/src/push-notifications'; @@ -512,17 +511,6 @@ export function doAnalyticsBuffer(uri, bufferData) { }; } -export function doAnalyticsTagSync() { - return (dispatch, getState) => { - const state = getState(); - const tags = selectFollowedTagsList(state); - const stringOfTags = tags.join(','); - if (stringOfTags) { - analytics.apiSyncTags({ content_tags: stringOfTags }); - } - }; -} - export function doAnaltyicsPurchaseEvent(fileInfo) { return (dispatch) => { let purchasePrice = fileInfo.purchase_receipt && fileInfo.purchase_receipt.amount; diff --git a/ui/redux/actions/sync.js b/ui/redux/actions/sync.js index 0eb16a885..aa76f22a7 100644 --- a/ui/redux/actions/sync.js +++ b/ui/redux/actions/sync.js @@ -12,7 +12,7 @@ import { } from 'redux/selectors/sync'; import { selectClientSetting } from 'redux/selectors/settings'; import { getSavedPassword, getAuthToken } from 'util/saved-passwords'; -import { doAnalyticsTagSync, doHandleSyncComplete } from 'redux/actions/app'; +import { doHandleSyncComplete } from 'redux/actions/app'; import { selectUserVerifiedEmail } from 'redux/selectors/user'; import { X_LBRY_AUTH_TOKEN } from 'constants/token'; @@ -130,7 +130,6 @@ export function doSyncLoop(noInterval?: boolean) { const syncEnabled = selectClientSetting(state, SETTINGS.ENABLE_SYNC); if (syncEnabled) { dispatch(doGetSyncDesktop((error, hasNewData) => dispatch(doHandleSyncComplete(error, hasNewData)))); - dispatch(doAnalyticsTagSync()); } }, SYNC_INTERVAL); } diff --git a/ui/redux/actions/tags.js b/ui/redux/actions/tags.js index 413f6daed..426d90583 100644 --- a/ui/redux/actions/tags.js +++ b/ui/redux/actions/tags.js @@ -1,14 +1,11 @@ // @flow -import { selectFollowedTagsList } from 'redux/selectors/tags'; import { selectPrefsReady } from 'redux/selectors/sync'; import * as ACTIONS from 'constants/action_types'; -import analytics from 'analytics'; import { doAlertWaitingForSync } from 'redux/actions/app'; export const doToggleTagFollowDesktop = (name: string) => (dispatch: Dispatch, getState: GetState) => { const state = getState(); - const tags = selectFollowedTagsList(state); const ready = selectPrefsReady(state); if (!ready) { return dispatch(doAlertWaitingForSync()); @@ -20,11 +17,6 @@ export const doToggleTagFollowDesktop = (name: string) => (dispatch: Dispatch, g name, }, }); - - const stringOfTags = tags.join(','); - if (stringOfTags) { - analytics.apiSyncTags({ content_tags: stringOfTags }); - } }; export const doAddTag = (name: string) => ({