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

chore: return username in user response

Browse Source
This commit is contained in:
Steven
2023-12-23 19:23:39 +08:00
parent b8eaf1d57e
commit 8e325f9986
18 changed files with 333 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
web/src/components/MemoView.tsx
View File

@ -33,11 +33,10 @@ interface Props {
showParent?: boolean;
showVisibility?: boolean;
showPinnedStyle?: boolean;
lazyRendering?: boolean;
}
const MemoView: React.FC<Props> = (props: Props) => {
const { memo, lazyRendering } = props;
const { memo } = props;
const t = useTranslate();
const navigateTo = useNavigateTo();
const { i18n } = useTranslation();
@ -45,7 +44,6 @@ const MemoView: React.FC<Props> = (props: Props) => {
const memoStore = useMemoStore();
const userStore = useUserStore();
const user = useCurrentUser();
const [shouldRender, setShouldRender] = useState<boolean>(lazyRendering ? false : true);
const [displayTime, setDisplayTime] = useState<string>(getRelativeTimeString(getTimeStampByDate(memo.displayTime)));
const [creator, setCreator] = useState(userStore.getUserByUsername(extractUsernameFromName(memo.creator)));
const [parentMemo, setParentMemo] = useState<Memo | undefined>(undefined);
@ -53,15 +51,21 @@ const MemoView: React.FC<Props> = (props: Props) => {
const referenceRelations = memo.relations.filter((relation) => relation.type === MemoRelation_Type.REFERENCE);
const readonly = memo.creator !== user?.name;
// Prepare memo creator.
useEffect(() => {
if (creator) return;
(async () => {
const user = await userStore.getOrFetchUserByUsername(extractUsernameFromName(memo.creator));
setCreator(user);
})();
}, [memo.creator]);
const parentMemoId = memo.relations.find(
(relation) => relation.memoId === memo.id && relation.type === MemoRelation_Type.COMMENT
)?.relatedMemoId;
if (parentMemoId) {
memoStore.getOrFetchMemoById(parentMemoId, { skipStore: true }).then((memo: Memo) => {
setParentMemo(memo);
});
}
}, []);
// Update display time string.
useEffect(() => {
@ -77,42 +81,6 @@ const MemoView: React.FC<Props> = (props: Props) => {
};
}, [i18n.language]);
// Lazy rendering.
useEffect(() => {
if (shouldRender) return;
if (!memoContainerRef.current) return;
const observer = new IntersectionObserver(([entry]) => {
if (!entry.isIntersecting) return;
observer.disconnect();
setShouldRender(true);
});
observer.observe(memoContainerRef.current);
return () => observer.disconnect();
}, [lazyRendering, filterStore.state]);
useEffect(() => {
if (!shouldRender) {
return;
}
const parentMemoId = memo.relations.find(
(relation) => relation.memoId === memo.id && relation.type === MemoRelation_Type.COMMENT
)?.relatedMemoId;
if (parentMemoId) {
memoStore.getOrFetchMemoById(parentMemoId, { skipStore: true }).then((memo: Memo) => {
setParentMemo(memo);
});
}
}, [shouldRender]);
if (!shouldRender) {
// Render a placeholder to occupy the space.
return <div className={`w-full h-32 !bg-transparent ${"memos-" + memo.id}`} ref={memoContainerRef} />;
}
const handleGotoMemoDetailPage = (event: React.MouseEvent<HTMLDivElement>) => {
if (event.altKey) {
showChangeMemoCreatedTsDialog(memo.id);
@ -223,7 +191,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
<span className="flex flex-row justify-start items-center">
<UserAvatar className="!w-5 !h-5 mr-1" avatarUrl={creator.avatarUrl} />
<span className="text-sm text-gray-600 max-w-[8em] truncate dark:text-gray-400">
{creator.nickname || extractUsernameFromName(creator.name)}
{creator.nickname || creator.username}
</span>
</span>
</Tooltip>