From c50be22cb47027d44ecf4ccbe552948f363c40e7 Mon Sep 17 00:00:00 2001 From: Zeng1998 <1129142694@qq.com> Date: Sat, 4 Feb 2023 19:10:22 +0800 Subject: [PATCH] Revert "temp" This reverts commit d2d14b4c5710d499b9fd0314b9571d44d062f52a. --- web/src/pages/Explore.tsx | 64 ++------------------------------------- 1 file changed, 3 insertions(+), 61 deletions(-) diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index ac3f4128..167949d9 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -8,8 +8,6 @@ import useLoading from "../hooks/useLoading"; import toastHelper from "../components/Toast"; import MemoContent from "../components/MemoContent"; import MemoResources from "../components/MemoResources"; -import MemoFilter from "../components/MemoFilter"; -import { TAG_REG } from "../labs/marked/parser"; import "../less/explore.less"; interface State { @@ -22,7 +20,6 @@ const Explore = () => { const locationStore = useLocationStore(); const userStore = useUserStore(); const memoStore = useMemoStore(); - const query = locationStore.state.query; const [state, setState] = useState({ memos: [], }); @@ -33,7 +30,7 @@ const Explore = () => { const location = locationStore.state; useEffect(() => { - memoStore.fetchAllMemos(DEFAULT_MEMO_LIMIT, 0).then((memos) => { + memoStore.fetchAllMemos(DEFAULT_MEMO_LIMIT, state.memos.length).then((memos) => { if (memos.length < DEFAULT_MEMO_LIMIT) { setIsComplete(true); } @@ -44,46 +41,6 @@ const Explore = () => { }); }, [location]); - const { tag: tagQuery, text: textQuery } = query ?? {}; - const showMemoFilter = Boolean(tagQuery || textQuery); - - const shownMemos = showMemoFilter - ? state.memos.filter((memo) => { - let shouldShow = true; - - if (tagQuery) { - const tagsSet = new Set(); - for (const t of Array.from(memo.content.match(new RegExp(TAG_REG, "g")) ?? [])) { - const tag = t.replace(TAG_REG, "$1").trim(); - const items = tag.split("/"); - let temp = ""; - for (const i of items) { - temp += i; - tagsSet.add(temp); - temp += "/"; - } - } - if (!tagsSet.has(tagQuery)) { - shouldShow = false; - } - } - - if (textQuery && !memo.content.toLowerCase().includes(textQuery.toLowerCase())) { - shouldShow = false; - } - return shouldShow; - }) - : state.memos; - - const pinnedMemos = shownMemos.filter((m) => m.pinned); - const unpinnedMemos = shownMemos.filter((m) => !m.pinned); - const memoSort = (mi: Memo, mj: Memo) => { - return mj.displayTs - mi.displayTs; - }; - pinnedMemos.sort(memoSort); - unpinnedMemos.sort(memoSort); - const sortedMemos = pinnedMemos.concat(unpinnedMemos).filter((m) => m.rowStatus === "NORMAL"); - const handleFetchMoreClick = async () => { try { const fetchedMemos = await memoStore.fetchAllMemos(DEFAULT_MEMO_LIMIT, state.memos.length); @@ -101,20 +58,6 @@ const Explore = () => { } }; - const handleMemoContentClick = async (e: React.MouseEvent) => { - const targetEl = e.target as HTMLElement; - - if (targetEl.className === "tag-span") { - const tagName = targetEl.innerText.slice(1); - const currTagQuery = locationStore.getState().query?.tag; - if (currTagQuery === tagName) { - locationStore.setTagQuery(undefined); - } else { - locationStore.setTagQuery(tagName); - } - } - }; - return (
@@ -137,8 +80,7 @@ const Explore = () => {
{!loadingState.isLoading && (
- - {sortedMemos.map((memo) => { + {state.memos.map((memo) => { const createdAtStr = dayjs(memo.displayTs).locale(i18n.language).format("YYYY/MM/DD HH:mm:ss"); return (
@@ -148,7 +90,7 @@ const Explore = () => { @{memo.creator.nickname || memo.creator.username}
- + undefined} /> );