Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: fix current user store
Steven472afce98f61
diff --git a/web/src/pages/AuthCallback.tsx b/web/src/pages/AuthCallback.tsxindex 2d340b1e1..77f5982a9 100644--- a/web/src/pages/AuthCallback.tsx+++ b/web/src/pages/AuthCallback.tsx@@ -7,6 +7,7 @@ import * as api from "@/helpers/api";import { absolutifyLink } from "@/helpers/utils";import useNavigateTo from "@/hooks/useNavigateTo";import { useUserStore } from "@/store/module";+import { useUserV1Store } from "@/store/v1";import { useTranslate } from "@/utils/i18n";interface State {@@ -19,6 +20,7 @@ const AuthCallback = () => {const navigateTo = useNavigateTo();const [searchParams] = useSearchParams();const userStore = useUserStore();+ const userV1Store = useUserV1Store();const [state, setState] = useState<State>({loading: true,errorMessage: "",@@ -42,6 +44,7 @@ const AuthCallback = () => {if (user) {userStore.setCurrentUser(user);await userStore.fetchCurrentUser();+ await userV1Store.getOrFetchUserByUsername(user.username);navigateTo("/");} else {toast.error(t("message.login-failed"));diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsxindex 39eedf7cf..5ac459e21 100644--- a/web/src/pages/SignIn.tsx+++ b/web/src/pages/SignIn.tsx@@ -9,6 +9,7 @@ import { absolutifyLink } from "@/helpers/utils";import useLoading from "@/hooks/useLoading";import useNavigateTo from "@/hooks/useNavigateTo";import { useGlobalStore, useUserStore } from "@/store/module";+import { useUserV1Store } from "@/store/v1";import { useTranslate } from "@/utils/i18n";const SignIn = () => {@@ -16,6 +17,7 @@ const SignIn = () => {const navigateTo = useNavigateTo();const globalStore = useGlobalStore();const userStore = useUserStore();+ const userV1Store = useUserV1Store();const actionBtnLoadingState = useLoading(false);const { appearance, locale, systemStatus } = globalStore.state;const mode = systemStatus.profile.mode;@@ -78,6 +80,7 @@ const SignIn = () => {if (user) {userStore.setCurrentUser(user);await userStore.fetchCurrentUser();+ await userV1Store.getOrFetchUserByUsername(user.username);navigateTo("/");} else {toast.error(t("message.login-failed"));diff --git a/web/src/pages/SignUp.tsx b/web/src/pages/SignUp.tsxindex 9b560d413..3dc12a00e 100644--- a/web/src/pages/SignUp.tsx+++ b/web/src/pages/SignUp.tsx@@ -8,6 +8,7 @@ import * as api from "@/helpers/api";import useLoading from "@/hooks/useLoading";import useNavigateTo from "@/hooks/useNavigateTo";import { useGlobalStore, useUserStore } from "@/store/module";+import { useUserV1Store } from "@/store/v1";import { useTranslate } from "@/utils/i18n";const SignUp = () => {@@ -15,6 +16,7 @@ const SignUp = () => {const navigateTo = useNavigateTo();const globalStore = useGlobalStore();const userStore = useUserStore();+ const userV1Store = useUserV1Store();const actionBtnLoadingState = useLoading(false);const { appearance, locale, systemStatus } = globalStore.state;const [username, setUsername] = useState("");@@ -58,6 +60,7 @@ const SignUp = () => {if (user) {userStore.setCurrentUser(user);await userStore.fetchCurrentUser();+ await userV1Store.getOrFetchUserByUsername(user.username);navigateTo("/");} else {toast.error(t("message.signup-failed"));