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
fix: initial system locale (#1684)
boojackae1d9adf657e
diff --git a/server/auth.go b/server/auth.goindex 51dab3211..f874b7e9c 100644--- a/server/auth.go+++ b/server/auth.go@@ -101,24 +101,6 @@ func (s *Server) registerAuthRoutes(g *echo.Group, secret string) {return echo.NewHTTPError(http.StatusInternalServerError, "Incorrect login credentials, please try again")}if user == nil {- allowSignUpSetting, err := s.Store.FindSystemSetting(ctx, &api.SystemSettingFind{- Name: api.SystemSettingAllowSignUpName,- })- if err != nil && common.ErrorCode(err) != common.NotFound {- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find system setting").SetInternal(err)- }-- allowSignUpSettingValue := false- if allowSignUpSetting != nil {- err = json.Unmarshal([]byte(allowSignUpSetting.Value), &allowSignUpSettingValue)- if err != nil {- return echo.NewHTTPError(http.StatusInternalServerError, "Failed to unmarshal system setting allow signup").SetInternal(err)- }- }- if !allowSignUpSettingValue {- return echo.NewHTTPError(http.StatusUnauthorized, "signup is disabled").SetInternal(err)- }-userCreate := &api.UserCreate{Username: userInfo.Identifier,// The new signup user should be normal user by default.diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsxindex a6d7f7f6a..ce0da25be 100644--- a/web/src/components/Memo.tsx+++ b/web/src/components/Memo.tsx@@ -210,10 +210,7 @@ const Memo: React.FC<Props> = (props: Props) => {return (<>- <div- className={`memo-wrapper ${"memos-" + memo.id} ${relatedMemoList.length > 0 && "pinned"} ${memo.pinned ? "pinned" : ""}`}- ref={memoContainerRef}- >+ <div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned && !readonly ? "pinned" : ""}`} ref={memoContainerRef}><div className="memo-top-wrapper"><div className="status-text-container"><Link className="time-text" to={`/m/${memo.id}`} onClick={handleMemoCreatedTimeClick}>diff --git a/web/src/components/MemoEditor/RelationListView.tsx b/web/src/components/MemoEditor/RelationListView.tsxindex 03ec5948d..37b8be0c2 100644--- a/web/src/components/MemoEditor/RelationListView.tsx+++ b/web/src/components/MemoEditor/RelationListView.tsx@@ -41,7 +41,7 @@ const RelationListView = () => {return (<divkey={memoRelation.relatedMemoId}- className="w-auto max-w-[50%] overflow-hidden flex flex-row justify-start items-center bg-gray-100 hover:bg-gray-200 rounded text-sm p-1 px-2 text-gray-500 cursor-pointer"+ className="w-auto max-w-[50%] overflow-hidden flex flex-row justify-start items-center bg-gray-100 dark:bg-zinc-800 hover:opacity-80 rounded text-sm p-1 px-2 text-gray-500 cursor-pointer"><Icon.Link className="w-4 h-auto shrink-0" /><span className="mx-1 max-w-full text-ellipsis font-mono whitespace-nowrap overflow-hidden">diff --git a/web/src/components/MemoEditor/ResourceListView.tsx b/web/src/components/MemoEditor/ResourceListView.tsxindex 6bc9afa96..af79e8397 100644--- a/web/src/components/MemoEditor/ResourceListView.tsx+++ b/web/src/components/MemoEditor/ResourceListView.tsx@@ -18,7 +18,7 @@ const ResourceListView = () => {return (<divkey={resource.id}- className="max-w-full flex flex-row justify-start items-center flex-nowrap bg-gray-100 px-2 py-1 rounded cursor-pointer text-gray-500 hover:bg-gray-200 dark:opacity-60"+ className="max-w-full flex flex-row justify-start items-center flex-nowrap bg-gray-100 dark:bg-zinc-800 hover:opacity-80 px-2 py-1 rounded cursor-pointer text-gray-500"><ResourceIcon resourceType={resource.type} className="w-4 h-auto mr-1" /><span className="text-sm max-w-xs truncate font-mono">{resource.filename}</span>diff --git a/web/src/components/Settings/SystemSection.tsx b/web/src/components/Settings/SystemSection.tsxindex afb2a4ab2..e1200aa64 100644--- a/web/src/components/Settings/SystemSection.tsx+++ b/web/src/components/Settings/SystemSection.tsx@@ -232,7 +232,7 @@ const SystemSection = () => {</div><div className="form-label"><div className="flex flex-row items-center">- <span className="normal-text mr-1">{t("setting.system-section.max-upload-size")}</span>+ <span className="text-sm mr-1">{t("setting.system-section.max-upload-size")}</span><HelpButton icon="info" hint={t("setting.system-section.max-upload-size-hint")} /></div><Input@@ -248,7 +248,7 @@ const SystemSection = () => {<Divider className="!mt-3 !my-4" /><div className="form-label"><div className="flex flex-row items-center">- <span className="normal-text mr-1">{t("setting.system-section.openai-api-key")}</span>+ <span className="text-sm mr-1">{t("setting.system-section.openai-api-key")}</span><HelpButton hint={t("setting.system-section.openai-api-key-description")} url="https://platform.openai.com/account/api-keys" /></div><Button onClick={handleSaveOpenAIConfig}>{t("common.save")}</Button>diff --git a/web/src/components/UsageHeatMap.tsx b/web/src/components/UsageHeatMap.tsxindex 947065e8c..7ad9164e6 100644--- a/web/src/components/UsageHeatMap.tsx+++ b/web/src/components/UsageHeatMap.tsx@@ -44,16 +44,19 @@ const UsageHeatMap = () => {const [allStat, setAllStat] = useState<DailyUsageStat[]>(getInitialUsageStat(usedDaysAmount, beginDayTimestamp));const [currentStat, setCurrentStat] = useState<DailyUsageStat | null>(null);const containerElRef = useRef<HTMLDivElement>(null);+ const currentUserId = userStore.getCurrentUserId();useEffect(() => {- if (!userStore.state.user) {- return;- }- setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(userStore.state.user.createdTs)) / 1000 / 3600 / 24));- }, [userStore.state.user]);+ userStore.getUserById(currentUserId).then((user) => {+ if (!user) {+ return;+ }+ setCreatedDays(Math.ceil((Date.now() - getTimeStampByDate(user.createdTs)) / 1000 / 3600 / 24));+ });+ }, [currentUserId]);useEffect(() => {- getMemoStats(userStore.getCurrentUserId())+ getMemoStats(currentUserId).then(({ data: { data } }) => {setMemoAmount(data.length);const newStat: DailyUsageStat[] = getInitialUsageStat(usedDaysAmount, beginDayTimestamp);@@ -72,11 +75,7 @@ const UsageHeatMap = () => {.catch((error) => {console.error(error);});-- return () => {- handleUsageStatItemMouseLeave();- };- }, [memos.length]);+ }, [memos.length, currentUserId]);const handleUsageStatItemMouseEnter = useCallback((event: React.MouseEvent, item: DailyUsageStat) => {const tempDiv = document.createElement("div");diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.tsindex 50b62ca21..38c4866f2 100644--- a/web/src/store/module/global.ts+++ b/web/src/store/module/global.ts@@ -49,8 +49,9 @@ export const initialGlobalState = async () => {externalUrl: "",},};- defaultGlobalState.locale = storageLocale || findNearestLanguageMatch(i18n.language);- defaultGlobalState.appearance = customizedProfile.appearance;+ defaultGlobalState.locale =+ storageLocale || defaultGlobalState.systemStatus.customizedProfile.locale || findNearestLanguageMatch(i18n.language);+ defaultGlobalState.appearance = defaultGlobalState.systemStatus.customizedProfile.appearance;}store.dispatch(setGlobalState(defaultGlobalState));};