From 8b3820fb288b3eff3a6255814d294e9785de2503 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Sat, 2 Oct 2021 08:15:27 +0800 Subject: [PATCH] --- tmp revert --- This reverts commit de6c6f9bfd0383e9087a38f1f54e13bb54754945. --- flow-typed/Comment.js | 4 +- static/app-strings.json | 4 - ui/component/claimPreview/view.jsx | 7 - ui/component/comment/view.jsx | 28 ++-- ui/component/commentsList/index.js | 2 +- ui/component/commentsList/view.jsx | 7 +- ui/component/router/view.jsx | 2 - ui/component/settingAccount/index.js | 3 +- ui/component/settingAccount/view.jsx | 14 +- ui/constants/comment.js | 1 - ui/constants/pageTitles.js | 1 - ui/constants/pages.js | 1 - ui/page/ownComments/index.js | 33 ----- ui/page/ownComments/view.jsx | 210 --------------------------- ui/redux/actions/comments.js | 131 +++-------------- ui/redux/reducers/comments.js | 6 +- ui/scss/component/_comments.scss | 57 -------- 17 files changed, 39 insertions(+), 472 deletions(-) delete mode 100644 ui/page/ownComments/index.js delete mode 100644 ui/page/ownComments/view.jsx diff --git a/flow-typed/Comment.js b/flow-typed/Comment.js index 57a666683..8b2ad570c 100644 --- a/flow-typed/Comment.js +++ b/flow-typed/Comment.js @@ -111,14 +111,14 @@ declare type ReactionListResponse = { declare type CommentListParams = { page: number, // pagination: which page of results page_size: number, // pagination: nr of comments to show in a page (max 200) - claim_id?: string, // claim id of claim being commented on + claim_id: string, // claim id of claim being commented on channel_name?: string, // signing channel name of claim (enables 'commentsEnabled' check) channel_id?: string, // signing channel claim id of claim (enables 'commentsEnabled' check) author_claim_id?: string, // filters comments to just this author parent_id?: string, // filters comments to those under this thread top_level?: boolean, // filters to only top level comments hidden?: boolean, // if true, will show hidden comments as well - sort_by?: number, // @see: ui/constants/comments.js::SORT_BY + sort_by?: number, // NEWEST=0, OLDEST=1, CONTROVERSY=2, POPULARITY=3, }; declare type CommentListResponse = { diff --git a/static/app-strings.json b/static/app-strings.json index 5baa9217f..36a82cd1a 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -209,9 +209,6 @@ "Failed to copy.": "Failed to copy.", "The publisher has chosen to charge %lbc% to view this content. Your balance is currently too low to view it. Check out %reward_link% for free %lbc% or send more %lbc% to your wallet. You can also %buy_link% more %lbc%.": "The publisher has chosen to charge %lbc% to view this content. Your balance is currently too low to view it. Check out %reward_link% for free %lbc% or send more %lbc% to your wallet. You can also %buy_link% more %lbc%.", "Connecting...": "Connecting...", - "Your comments": "Your comments", - "View your past comments.": "View your past comments.", - "Content or channel was deleted.": "Content or channel was deleted.", "Comments": "Comments", "Comment": "Comment", "Comment --[button to submit something]--": "Comment", @@ -1463,7 +1460,6 @@ "Staked LBRY Credits": "Staked LBRY Credits", "1 comment": "1 comment", "%total_comments% comments": "%total_comments% comments", - "No comments": "No comments", "Upvote": "Upvote", "Downvote": "Downvote", "You loved this": "You loved this", diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx index 34e7dc188..343424d5f 100644 --- a/ui/component/claimPreview/view.jsx +++ b/ui/component/claimPreview/view.jsx @@ -70,7 +70,6 @@ type Props = { streamingUrl: ?string, getFile: (string) => void, customShouldHide?: (Claim) => boolean, - searchParams?: { [string]: string }, showUnresolvedClaim?: boolean, showNullPlaceholder?: boolean, includeSupportAction?: boolean, @@ -126,7 +125,6 @@ const ClaimPreview = forwardRef((props: Props, ref: any) => { // modifiers active, customShouldHide, - searchParams, showNullPlaceholder, // value from show mature content user setting // true if the user doesn't wanna see nsfw content @@ -223,11 +221,6 @@ const ClaimPreview = forwardRef((props: Props, ref: any) => { if (listId) { navigateSearch.set(COLLECTIONS_CONSTS.COLLECTION_ID, listId); } - if (searchParams) { - Object.keys(searchParams).forEach((key) => { - navigateSearch.set(key, searchParams[key]); - }); - } const handleNavLinkClick = (e) => { if (onClick) { diff --git a/ui/component/comment/view.jsx b/ui/component/comment/view.jsx index b4816303a..b52003bcf 100644 --- a/ui/component/comment/view.jsx +++ b/ui/component/comment/view.jsx @@ -52,7 +52,6 @@ type Props = { doToast: ({ message: string }) => void, isTopLevel?: boolean, threadDepth: number, - hideActions?: boolean, isPinned: boolean, othersReacts: ?{ like: number, @@ -96,7 +95,6 @@ function Comment(props: Props) { doToast, isTopLevel, threadDepth, - hideActions, isPinned, othersReacts, playingUri, @@ -350,20 +348,18 @@ function Comment(props: Props) { )} - {!hideActions && ( -
- {threadDepth !== 0 && ( -
- )} +
+ {threadDepth !== 0 && ( +
{numDirectReplies > 0 && !showReplies && (
diff --git a/ui/component/commentsList/index.js b/ui/component/commentsList/index.js index c83dae73b..8d15ab707 100644 --- a/ui/component/commentsList/index.js +++ b/ui/component/commentsList/index.js @@ -48,7 +48,7 @@ const perform = (dispatch) => ({ fetchTopLevelComments: (uri, page, pageSize, sortBy) => dispatch(doCommentList(uri, '', page, pageSize, sortBy)), fetchComment: (commentId) => dispatch(doCommentById(commentId)), fetchReacts: (commentIds) => dispatch(doCommentReactList(commentIds)), - resetComments: (claimId) => dispatch(doCommentReset(claimId)), + resetComments: (uri) => dispatch(doCommentReset(uri)), }); export default connect(select, perform)(CommentsList); diff --git a/ui/component/commentsList/view.jsx b/ui/component/commentsList/view.jsx index 35525d19a..6a51fd42c 100644 --- a/ui/component/commentsList/view.jsx +++ b/ui/component/commentsList/view.jsx @@ -151,13 +151,10 @@ function CommentList(props: Props) { // Reset comments useEffect(() => { if (page === 0) { - if (claim) { - resetComments(claim.claim_id); - } + resetComments(uri); setPage(1); } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [page, uri, resetComments]); // 'claim' is derived from 'uri' + }, [page, uri, resetComments]); // Fetch top-level comments useEffect(() => { diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx index ad5234265..03db2b538 100644 --- a/ui/component/router/view.jsx +++ b/ui/component/router/view.jsx @@ -59,7 +59,6 @@ const ListBlockedPage = lazyImport(() => import('page/listBlocked' /* webpackChu const ListsPage = lazyImport(() => import('page/lists' /* webpackChunkName: "secondary" */)); const LiveStreamSetupPage = lazyImport(() => import('page/livestreamSetup' /* webpackChunkName: "secondary" */)); const LivestreamCurrentPage = lazyImport(() => import('page/livestreamCurrent' /* webpackChunkName: "secondary" */)); -const OwnComments = lazyImport(() => import('page/ownComments' /* webpackChunkName: "ownComments" */)); const PasswordResetPage = lazyImport(() => import('page/passwordReset' /* webpackChunkName: "secondary" */)); const PasswordSetPage = lazyImport(() => import('page/passwordSet' /* webpackChunkName: "secondary" */)); const PublishPage = lazyImport(() => import('page/publish' /* webpackChunkName: "secondary" */)); @@ -330,7 +329,6 @@ function AppRouter(props: Props) { - diff --git a/ui/component/settingAccount/index.js b/ui/component/settingAccount/index.js index 0644ceaf6..83d77af76 100644 --- a/ui/component/settingAccount/index.js +++ b/ui/component/settingAccount/index.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import { doWalletStatus, selectMyChannelClaims, selectWalletIsEncrypted } from 'lbry-redux'; +import { doWalletStatus, selectWalletIsEncrypted } from 'lbry-redux'; import { selectUser, selectUserVerifiedEmail } from 'redux/selectors/user'; import { selectLanguage } from 'redux/selectors/settings'; @@ -9,7 +9,6 @@ const select = (state) => ({ isAuthenticated: selectUserVerifiedEmail(state), walletEncrypted: selectWalletIsEncrypted(state), user: selectUser(state), - myChannels: selectMyChannelClaims(state), language: selectLanguage(state), }); diff --git a/ui/component/settingAccount/view.jsx b/ui/component/settingAccount/view.jsx index 812e3818c..f39262379 100644 --- a/ui/component/settingAccount/view.jsx +++ b/ui/component/settingAccount/view.jsx @@ -15,13 +15,12 @@ type Props = { isAuthenticated: boolean, walletEncrypted: boolean, user: User, - myChannels: ?Array, // --- perform --- doWalletStatus: () => void, }; export default function SettingAccount(props: Props) { - const { isAuthenticated, walletEncrypted, user, myChannels, doWalletStatus } = props; + const { isAuthenticated, walletEncrypted, user, doWalletStatus } = props; const [storedPassword, setStoredPassword] = React.useState(false); // Determine if password is stored. @@ -93,17 +92,6 @@ export default function SettingAccount(props: Props) { )} {/* @endif */} - - {myChannels && ( - -