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: update function name
Steven39a0e69b0445
diff --git a/api/v2/inbox_service .go b/api/v2/inbox_service .goindex 75df3a759..faaf625c9 100644--- a/api/v2/inbox_service .go+++ b/api/v2/inbox_service .go@@ -46,7 +46,7 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateIreturn nil, status.Errorf(codes.InvalidArgument, "update mask is required")}- inboxID, err := GetInboxID(request.Inbox.Name)+ inboxID, err := ExtractInboxIDFromName(request.Inbox.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "invalid inbox name: %v", err)}@@ -77,7 +77,7 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateI}func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteInboxRequest) (*apiv2pb.DeleteInboxResponse, error) {- inboxID, err := GetInboxID(request.Name)+ inboxID, err := ExtractInboxIDFromName(request.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "invalid inbox name: %v", err)}diff --git a/api/v2/resource_name.go b/api/v2/resource_name.goindex a9f285229..fea44cfff 100644--- a/api/v2/resource_name.go+++ b/api/v2/resource_name.go@@ -34,8 +34,8 @@ func GetNameParentTokens(name string, tokenPrefixes ...string) ([]string, error)return tokens, nil}-// GetUsername returns the username from a resource name.-func GetUsername(name string) (string, error) {+// ExtractUsernameFromName returns the username from a resource name.+func ExtractUsernameFromName(name string) (string, error) {tokens, err := GetNameParentTokens(name, UserNamePrefix)if err != nil {return "", err@@ -43,8 +43,8 @@ func GetUsername(name string) (string, error) {return tokens[0], nil}-// GetInboxID returns the inbox ID from a resource name.-func GetInboxID(name string) (int32, error) {+// ExtractInboxIDFromName returns the inbox ID from a resource name.+func ExtractInboxIDFromName(name string) (int32, error) {tokens, err := GetNameParentTokens(name, InboxNamePrefix)if err != nil {return 0, errdiff --git a/api/v2/user_service.go b/api/v2/user_service.goindex a393aab88..161ca5ad1 100644--- a/api/v2/user_service.go+++ b/api/v2/user_service.go@@ -28,7 +28,7 @@ var ()func (s *APIV2Service) GetUser(ctx context.Context, request *apiv2pb.GetUserRequest) (*apiv2pb.GetUserResponse, error) {- username, err := GetUsername(request.Name)+ username, err := ExtractUsernameFromName(request.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "name is required")}@@ -58,7 +58,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv2pb.CreateUsreturn nil, status.Errorf(codes.PermissionDenied, "permission denied")}- username, err := GetUsername(request.User.Name)+ username, err := ExtractUsernameFromName(request.User.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "name is required")}@@ -88,7 +88,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv2pb.CreateUs}func (s *APIV2Service) UpdateUser(ctx context.Context, request *apiv2pb.UpdateUserRequest) (*apiv2pb.UpdateUserResponse, error) {- username, err := GetUsername(request.User.Name)+ username, err := ExtractUsernameFromName(request.User.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "name is required")}@@ -159,7 +159,7 @@ func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv2p}userID := user.ID- username, err := GetUsername(request.Name)+ username, err := ExtractUsernameFromName(request.Name)if err != nil {return nil, status.Errorf(codes.InvalidArgument, "name is required")}diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsxindex a9477790e..3eb98166a 100644--- a/web/src/components/ChangeMemberPasswordDialog.tsx+++ b/web/src/components/ChangeMemberPasswordDialog.tsx@@ -1,6 +1,6 @@import { useEffect, useState } from "react";import { toast } from "react-hot-toast";-import { useUserStore } from "@/store/module";+import { useUserV1Store, UserNamePrefix } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import { generateDialog } from "./Dialog";import Icon from "./Icon";@@ -10,9 +10,9 @@ interface Props extends DialogProps {}const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {- const { user: propsUser, destroy } = props;+ const { user, destroy } = props;const t = useTranslate();- const userStore = useUserStore();+ const userStore = useUserV1Store();const [newPassword, setNewPassword] = useState("");const [newPasswordAgain, setNewPasswordAgain] = useState("");@@ -47,10 +47,13 @@ const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {}try {- await userStore.patchUser({- id: propsUser.id,- password: newPassword,- });+ await userStore.updateUser(+ {+ name: `${UserNamePrefix}${user.username}`,+ password: newPassword,+ },+ ["password"]+ );toast(t("message.password-changed"));handleCloseBtnClick();} catch (error: any) {@@ -63,7 +66,7 @@ const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {<><div className="dialog-header-container !w-64"><p className="title-text">- {t("setting.account-section.change-password")} ({propsUser.username})+ {t("setting.account-section.change-password")} ({user.username})</p><button className="btn close-btn" onClick={handleCloseBtnClick}><Icon.X />diff --git a/web/src/components/ChangePasswordDialog.tsx b/web/src/components/ChangePasswordDialog.tsxindex 4bb4a8f32..556fcf278 100644--- a/web/src/components/ChangePasswordDialog.tsx+++ b/web/src/components/ChangePasswordDialog.tsx@@ -1,8 +1,7 @@import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { useGlobalStore, useUserStore } from "@/store/module";-import { useUserV1Store } from "@/store/v1";-import { UserNamePrefix } from "@/store/v1/resourceName";+import { useUserV1Store, UserNamePrefix } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import { generateDialog } from "./Dialog";import Icon from "./Icon";diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsxindex eb410d195..07fa39803 100644--- a/web/src/components/Header.tsx+++ b/web/src/components/Header.tsx@@ -3,7 +3,7 @@ import { useEffect } from "react";import { NavLink, useLocation } from "react-router-dom";import useCurrentUser from "@/hooks/useCurrentUser";import { useLayoutStore } from "@/store/module";-import useInboxStore from "@/store/v1/inbox";+import { useInboxStore } from "@/store/v1";import { Inbox_Status } from "@/types/proto/api/v2/inbox_service";import { useTranslate } from "@/utils/i18n";import { resolution } from "@/utils/layout";diff --git a/web/src/components/Inbox/MemoCommentMessage.tsx b/web/src/components/Inbox/MemoCommentMessage.tsxindex ccbca9e28..ce206d9b5 100644--- a/web/src/components/Inbox/MemoCommentMessage.tsx+++ b/web/src/components/Inbox/MemoCommentMessage.tsx@@ -4,8 +4,7 @@ import { useEffect, useState } from "react";import toast from "react-hot-toast";import { activityServiceClient } from "@/grpcweb";import useNavigateTo from "@/hooks/useNavigateTo";-import useInboxStore from "@/store/v1/inbox";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { useInboxStore, extractUsernameFromName } from "@/store/v1";import { Activity } from "@/types/proto/api/v2/activity_service";import { Inbox, Inbox_Status } from "@/types/proto/api/v2/inbox_service";import { useTranslate } from "@/utils/i18n";diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsxindex aa54b9a4f..5bebd0867 100644--- a/web/src/components/Memo.tsx+++ b/web/src/components/Memo.tsx@@ -8,8 +8,7 @@ import { getRelativeTimeString } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";import { useFilterStore, useMemoStore, useUserStore } from "@/store/module";-import { useUserV1Store } from "@/store/v1";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { useUserV1Store, extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import showChangeMemoCreatedTsDialog from "./ChangeMemoCreatedTsDialog";import { showCommonDialog } from "./Dialog/CommonDialog";diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex 6af94e3d0..c8ef4c12f 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -7,7 +7,7 @@ import { getTimeStampByDate } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";import { TAG_REG } from "@/labs/marked/parser";import { useFilterStore, useMemoStore } from "@/store/module";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import Empty from "./Empty";import Memo from "./Memo";diff --git a/web/src/components/Settings/AccessTokenSection.tsx b/web/src/components/Settings/AccessTokenSection.tsxindex 90ddb40fc..a8c72dde5 100644--- a/web/src/components/Settings/AccessTokenSection.tsx+++ b/web/src/components/Settings/AccessTokenSection.tsx@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { userServiceClient } from "@/grpcweb";import useCurrentUser from "@/hooks/useCurrentUser";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { UserAccessToken } from "@/types/proto/api/v2/user_service";import { useTranslate } from "@/utils/i18n";import showCreateAccessTokenDialog from "../CreateAccessTokenDialog";diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsxindex 2f42670e3..e3b330b88 100644--- a/web/src/components/Settings/MyAccountSection.tsx+++ b/web/src/components/Settings/MyAccountSection.tsx@@ -1,6 +1,6 @@import { Button } from "@mui/joy";import useCurrentUser from "@/hooks/useCurrentUser";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import showChangePasswordDialog from "../ChangePasswordDialog";import showUpdateAccountDialog from "../UpdateAccountDialog";diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsxindex 851dd4669..6ab547a7d 100644--- a/web/src/components/ShareMemoDialog.tsx+++ b/web/src/components/ShareMemoDialog.tsx@@ -5,8 +5,7 @@ import { toast } from "react-hot-toast";import { getDateTimeString } from "@/helpers/datetime";import useLoading from "@/hooks/useLoading";import toImage from "@/labs/html2image";-import { useUserV1Store } from "@/store/v1";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { useUserV1Store, extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import { generateDialog } from "./Dialog";import showEmbedMemoDialog from "./EmbedMemoDialog";diff --git a/web/src/components/UsageHeatMap.tsx b/web/src/components/UsageHeatMap.tsxindex 6854f8e40..346100625 100644--- a/web/src/components/UsageHeatMap.tsx+++ b/web/src/components/UsageHeatMap.tsx@@ -5,8 +5,7 @@ import { getDateStampByDate, getDateString, getTimeStampByDate } from "@/helpersimport * as utils from "@/helpers/utils";import useCurrentUser from "@/hooks/useCurrentUser";import { useGlobalStore } from "@/store/module";-import { useUserV1Store } from "@/store/v1";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { useUserV1Store, extractUsernameFromName } from "@/store/v1";import { useTranslate, Translations } from "@/utils/i18n";import { useFilterStore, useMemoStore } from "../store/module";import "@/less/usage-heat-map.less";diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsxindex 5f4df67a0..f96ec7c34 100644--- a/web/src/components/UserBanner.tsx+++ b/web/src/components/UserBanner.tsx@@ -1,7 +1,7 @@import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";import { useGlobalStore, useUserStore } from "@/store/module";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { User_Role } from "@/types/proto/api/v2/user_service";import { useTranslate } from "@/utils/i18n";import showAboutSiteDialog from "./AboutSiteDialog";diff --git a/web/src/components/kit/DatePicker.tsx b/web/src/components/kit/DatePicker.tsxindex d46df5ee7..6d6df7c7e 100644--- a/web/src/components/kit/DatePicker.tsx+++ b/web/src/components/kit/DatePicker.tsx@@ -5,7 +5,7 @@ import { getMemoStats } from "@/helpers/api";import { DAILY_TIMESTAMP } from "@/helpers/consts";import { getDateStampByDate, isFutureDate } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";import Icon from "../Icon";import "@/less/common/date-picker.less";diff --git a/web/src/pages/DailyReview.tsx b/web/src/pages/DailyReview.tsxindex c5893c23b..2d48893bc 100644--- a/web/src/pages/DailyReview.tsx+++ b/web/src/pages/DailyReview.tsx@@ -15,7 +15,7 @@ import { DAILY_TIMESTAMP, DEFAULT_MEMO_LIMIT } from "@/helpers/consts";import { getDateStampByDate, getNormalizedDateString, getTimeStampByDate, getTimeString } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";import { useMemoStore, useUserStore } from "@/store/module";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { extractUsernameFromName } from "@/store/v1";import { useTranslate } from "@/utils/i18n";const DailyReview = () => {diff --git a/web/src/pages/Inboxes.tsx b/web/src/pages/Inboxes.tsxindex 55f653301..c0d7ae382 100644--- a/web/src/pages/Inboxes.tsx+++ b/web/src/pages/Inboxes.tsx@@ -3,7 +3,7 @@ import Empty from "@/components/Empty";import Icon from "@/components/Icon";import MemoCommentMessage from "@/components/Inbox/MemoCommentMessage";import MobileHeader from "@/components/MobileHeader";-import useInboxStore from "@/store/v1/inbox";+import { useInboxStore } from "@/store/v1";import { Inbox_Type } from "@/types/proto/api/v2/inbox_service";import { useTranslate } from "@/utils/i18n";diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex 7be780c6d..e09c766bb 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -19,8 +19,7 @@ import { getDateTimeString } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";import useNavigateTo from "@/hooks/useNavigateTo";import { useGlobalStore, useMemoStore } from "@/store/module";-import { useUserV1Store } from "@/store/v1";-import { extractUsernameFromName } from "@/store/v1/resourceName";+import { useUserV1Store, extractUsernameFromName } from "@/store/v1";import { User, User_Role } from "@/types/proto/api/v2/user_service";import { useTranslate } from "@/utils/i18n";diff --git a/web/src/store/v1/inbox.ts b/web/src/store/v1/inbox.tsindex 982d73b23..b6510d732 100644--- a/web/src/store/v1/inbox.ts+++ b/web/src/store/v1/inbox.ts@@ -8,7 +8,7 @@ interface InboxStore {updateInbox: (inbox: Partial<Inbox>, updateMask: string[]) => Promise<Inbox>;}-const useInboxStore = create<InboxStore>()((set, get) => ({+export const useInboxStore = create<InboxStore>()((set, get) => ({inboxes: [],fetchInboxes: async () => {const { inboxes } = await inboxServiceClient.listInboxes({});@@ -28,5 +28,3 @@ const useInboxStore = create<InboxStore>()((set, get) => ({return updatedInbox;},}));--export default useInboxStore;diff --git a/web/src/store/v1/index.ts b/web/src/store/v1/index.tsindex d6a351eed..276ba9765 100644--- a/web/src/store/v1/index.ts+++ b/web/src/store/v1/index.ts@@ -1,4 +1,4 @@-import useMemoCacheStore from "./memo";-import useUserV1Store from "./user";--export { useUserV1Store, useMemoCacheStore };+export * from "./user";+export * from "./memo";+export * from "./inbox";+export * from "./resourceName";diff --git a/web/src/store/v1/memo.ts b/web/src/store/v1/memo.tsindex 96c1c89aa..669d69ac3 100644--- a/web/src/store/v1/memo.ts+++ b/web/src/store/v1/memo.ts@@ -3,7 +3,7 @@ import { combine } from "zustand/middleware";import * as api from "@/helpers/api";import { convertResponseModelMemo } from "../module";-const useMemoCacheStore = create(+export const useMemoCacheStore = create(combine({ memoById: new Map<MemoId, Memo>() }, (set, get) => ({getState: () => get(),getOrFetchMemoById: async (memoId: MemoId) => {@@ -39,5 +39,3 @@ const useMemoCacheStore = create(},})));--export default useMemoCacheStore;diff --git a/web/src/store/v1/user.ts b/web/src/store/v1/user.tsindex f25d67b6b..b55617126 100644--- a/web/src/store/v1/user.ts+++ b/web/src/store/v1/user.ts@@ -13,7 +13,7 @@ interface UserV1Store {// Request cache is used to prevent multiple requests.const requestCache = new Map<string, Promise<any>>();-const useUserV1Store = create<UserV1Store>()((set, get) => ({+export const useUserV1Store = create<UserV1Store>()((set, get) => ({userMapByUsername: {},getOrFetchUserByUsername: async (username: string) => {const userMap = get().userMapByUsername;@@ -58,5 +58,3 @@ const useUserV1Store = create<UserV1Store>()((set, get) => ({return updatedUser;},}));--export default useUserV1Store;