YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: invalid username checks

Browse Source
This commit is contained in:
Steven
2023-09-18 22:34:31 +08:00
parent 2375001453
commit bff41a8957
22 changed files with 106 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
web/src/components/MemoList.tsx
View File

@ -1,9 +1,11 @@
import { useEffect, useRef, useState } from "react";
import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { useParams } from "react-router-dom";
import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";
import { getTimeStampByDate } from "@/helpers/datetime";
import useCurrentUser from "@/hooks/useCurrentUser";
import { TAG_REG } from "@/labs/marked/parser";
import { useFilterStore, useMemoStore, useUserStore } from "@/store/module";
import { useFilterStore, useMemoStore } from "@/store/module";
import { useTranslate } from "@/utils/i18n";
import Empty from "./Empty";
import Memo from "./Memo";
@ -11,17 +13,17 @@ import "@/less/memo-list.less";
const MemoList: React.FC = () => {
const t = useTranslate();
const params = useParams();
const memoStore = useMemoStore();
const userStore = useUserStore();
const filterStore = useFilterStore();
const filter = filterStore.state;
const { memos } = memoStore.state;
const [isFetching, setIsFetching] = useState<boolean>(true);
const [isComplete, setIsComplete] = useState<boolean>(false);
const currentUsername = userStore.getCurrentUsername();
const user = useCurrentUser();
const { tag: tagQuery, duration, text: textQuery, visibility } = filter;
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || textQuery || visibility);
const username = params.username || user?.username || "";
const shownMemos = (
showMemoFilter
@ -61,7 +63,7 @@ const MemoList: React.FC = () => {
return shouldShow;
})
: memos
).filter((memo) => memo.creatorUsername === currentUsername && memo.rowStatus === "NORMAL");
).filter((memo) => memo.creatorUsername === username && memo.rowStatus === "NORMAL");
const pinnedMemos = shownMemos.filter((m) => m.pinned);
const unpinnedMemos = shownMemos.filter((m) => !m.pinned);
@ -72,11 +74,9 @@ const MemoList: React.FC = () => {
unpinnedMemos.sort(memoSort);
const sortedMemos = pinnedMemos.concat(unpinnedMemos).filter((m) => m.rowStatus === "NORMAL");
const statusRef = useRef<HTMLDivElement>(null);
useEffect(() => {
memoStore
.fetchMemos()
.fetchMemos(username)
.then((fetchedMemos) => {
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
setIsComplete(true);
@ -89,7 +89,7 @@ const MemoList: React.FC = () => {
console.error(error);
toast.error(error.response.data.message);
});
}, [currentUsername]);
}, [user?.username]);
useEffect(() => {
const pageWrapper = document.body.querySelector(".page-wrapper");
@ -112,20 +112,12 @@ const MemoList: React.FC = () => {
observer.unobserve(entry.target);
}
});
if (statusRef?.current) {
observer.observe(statusRef.current);
}
return () => {
if (statusRef?.current) {
observer.unobserve(statusRef.current);
}
};
}, [isFetching, isComplete, filter, sortedMemos.length, statusRef]);
}, [isFetching, isComplete, filter, sortedMemos.length]);
const handleFetchMoreClick = async () => {
try {
setIsFetching(true);
const fetchedMemos = await memoStore.fetchMemos(DEFAULT_MEMO_LIMIT, memos.length);
const fetchedMemos = await memoStore.fetchMemos(username, DEFAULT_MEMO_LIMIT, memos.length);
if (fetchedMemos.length < DEFAULT_MEMO_LIMIT) {
setIsComplete(true);
} else {
@ -148,8 +140,8 @@ const MemoList: React.FC = () => {
<p className="status-text">{t("memo.fetching-data")}</p>
</div>
) : (
<div ref={statusRef} className="status-text-container">
<p className="status-text">
<div className="status-text-container">
<div className="status-text">
{isComplete ? (
sortedMemos.length === 0 && (
<div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">
@ -164,7 +156,7 @@ const MemoList: React.FC = () => {
</span>
</>
)}
</p>
</div>
</div>
)}
</div>