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 telegram bot related section (#1750)
boojackdbe8aa1d3af9
diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsxindex 68dad14ed..0136f9f76 100644--- a/web/src/components/Settings/PreferencesSection.tsx+++ b/web/src/components/Settings/PreferencesSection.tsx@@ -1,13 +1,13 @@import { Input, Button, Divider, Switch, Option, Select } from "@mui/joy";-import { useEffect, useState } from "react";+import { useState } from "react";import { toast } from "react-hot-toast";-import { getMyselfUser } from "@/helpers/api";import React from "react";import { useTranslation } from "react-i18next";import { useGlobalStore, useUserStore } from "@/store/module";import { VISIBILITY_SELECTOR_ITEMS } from "@/helpers/consts";import AppearanceSelect from "../AppearanceSelect";import LocaleSelect from "../LocaleSelect";+import HelpButton from "../kit/HelpButton";import "@/less/settings/preferences-section.less";const PreferencesSection = () => {@@ -16,7 +16,7 @@ const PreferencesSection = () => {const userStore = useUserStore();const { appearance, locale } = globalStore.state;const { setting, localSetting } = userStore.state.user as User;- const [telegramUserId, setTelegramUserId] = useState<string>("");+ const [telegramUserId, setTelegramUserId] = useState<string>(setting.telegramUserId);const visibilitySelectorItems = VISIBILITY_SELECTOR_ITEMS.map((item) => {return {value: item.value,@@ -24,21 +24,6 @@ const PreferencesSection = () => {};});- useEffect(() => {- getMyselfUser().then(- ({- data: {- data: { userSettingList: userSettingList },- },- }) => {- const telegramUserIdSetting = userSettingList.find((setting: any) => setting.key === "telegram-user-id");- if (telegramUserIdSetting) {- setTelegramUserId(JSON.parse(telegramUserIdSetting.value));- }- }- );- }, []);-const dailyReviewTimeOffsetOptions: number[] = [...Array(24).keys()];const handleLocaleSelectChange = async (locale: Locale) => {@@ -63,7 +48,6 @@ const PreferencesSection = () => {userStore.upsertLocalSetting({ ...localSetting, dailyReviewTimeOffset: value });};- //enableAutoCollapseconst handleAutoCollapseChanged = (event: React.ChangeEvent<HTMLInputElement>) => {userStore.upsertLocalSetting({ ...localSetting, enableAutoCollapse: event.target.checked });};@@ -75,7 +59,6 @@ const PreferencesSection = () => {} catch (error: any) {console.error(error);toast.error(error.response.data.message);- return;}};@@ -155,9 +138,10 @@ const PreferencesSection = () => {<Divider className="!mt-3 !my-4" />- <div className="form-label">- <div className="flex flex-row items-center">+ <div className="mb-2 w-full flex flex-row justify-between items-center">+ <div className="w-auto flex items-center"><span className="text-sm mr-1">{t("setting.preference-section.telegram-user-id")}</span>+ <HelpButton icon="help" url="https://usememos.com/docs/integration/telegram-bot" /></div><Button onClick={handleSaveTelegramUserId}>{t("common.save")}</Button></div>diff --git a/web/src/components/Settings/SystemSection.tsx b/web/src/components/Settings/SystemSection.tsxindex 421d0ab18..9b29421b9 100644--- a/web/src/components/Settings/SystemSection.tsx+++ b/web/src/components/Settings/SystemSection.tsx@@ -272,11 +272,10 @@ const SystemSection = () => {<Divider className="!mt-3 !my-4" /><div className="form-label"><div className="flex flex-row items-center">- <span className="text-sm mr-1">{t("setting.system-section.telegram-robot-token")}</span>- <HelpButton- hint={t("setting.system-section.telegram-robot-token-description")}- url="https://core.telegram.org/bots#how-do-i-create-a-bot"- />+ <div className="w-auto flex items-center">+ <span className="text-sm mr-1">{t("setting.system-section.telegram-robot-token")}</span>+ <HelpButton icon="help" url="https://usememos.com/docs/integration/telegram-bot" />+ </div></div><Button onClick={handleSaveTelegramRobotToken}>{t("common.save")}</Button></div>diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.jsonindex ffab21d9a..5432495a0 100644--- a/web/src/locales/zh-Hans.json+++ b/web/src/locales/zh-Hans.json@@ -333,7 +333,7 @@"theme": "主题","updated_ts": "更新时间"},- "sso": "单点登陆(SSO)",+ "sso": "SSO","sso-section": {"authorization-endpoint": "授权端点(Authorization Endpoint)","client-id": "客户端ID(Client ID)",diff --git a/web/src/store/module/user.ts b/web/src/store/module/user.tsindex 468d5c084..29e392825 100644--- a/web/src/store/module/user.ts+++ b/web/src/store/module/user.ts@@ -11,6 +11,7 @@ const defaultSetting: Setting = {locale: "en",appearance: getSystemColorScheme(),memoVisibility: "PRIVATE",+ telegramUserId: "",};const defaultLocalSetting: LocalSetting = {diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.tsindex 59c0b4edc..7a50662ac 100644--- a/web/src/types/modules/setting.d.ts+++ b/web/src/types/modules/setting.d.ts@@ -4,6 +4,7 @@ interface Setting {locale: Locale;appearance: Appearance;memoVisibility: Visibility;+ telegramUserId: string;}interface LocalSetting {@@ -27,7 +28,12 @@ interface UserMemoVisibilitySetting {value: Visibility;}-type UserSetting = UserLocaleSetting | UserAppearanceSetting | UserMemoVisibilitySetting;+interface UserTelegramUserIdSetting {+ key: "telegram-user-id";+ value: string;+}++type UserSetting = UserLocaleSetting | UserAppearanceSetting | UserMemoVisibilitySetting | UserTelegramUserIdSetting;interface UserSettingUpsert {key: keyof Setting;