From 58817ae82f9ae42fbb4dfb59a463ea7b9b91bde2 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Tue, 22 Oct 2024 17:37:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=20#208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/i18n/en-us.json                        | 3 ++-
 src/renderer/src/i18n/zh-cn.json                        | 3 ++-
 src/renderer/src/i18n/zh-tw.json                        | 3 ++-
 src/renderer/src/pages/agents/Agents.tsx                | 4 ++--
 src/renderer/src/pages/home/Messages/MessageMenubar.tsx | 3 ++-
 src/renderer/src/pages/home/Tabs/Assistants.tsx         | 6 +++++-
 src/renderer/src/services/tokens.ts                     | 2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/i18n/en-us.json b/src/renderer/src/i18n/en-us.json
index bcae0787..81a3bcc0 100644
--- a/src/renderer/src/i18n/en-us.json
+++ b/src/renderer/src/i18n/en-us.json
@@ -127,7 +127,8 @@
       "copy.title": "Copy Assistant",
       "clear.title": "Clear topics",
       "clear.content": "Clearing the topic will delete all topics and files in the assistant. Are you sure you want to continue?",
-      "saveto.title": "Save to agent",
+      "save.title": "Save to agent",
+      "save.success": "Saved successfully",
       "delete.title": "Delete Assistant",
       "delete.content": "Deleting an assistant will delete all topics and files under the assistant. Are you sure you want to delete it?"
     },
diff --git a/src/renderer/src/i18n/zh-cn.json b/src/renderer/src/i18n/zh-cn.json
index ddc173ae..baeb864e 100644
--- a/src/renderer/src/i18n/zh-cn.json
+++ b/src/renderer/src/i18n/zh-cn.json
@@ -127,7 +127,8 @@
       "copy.title": "复制助手",
       "clear.title": "清空话题",
       "clear.content": "清空话题会删除助手下所有话题和文件，确定要继续吗？",
-      "saveto.title": "保存到智能体",
+      "save.title": "保存到智能体",
+      "save.success": "保存成功",
       "delete.title": "删除助手",
       "delete.content": "删除助手会删除所有该助手下的话题和文件，确定要继续吗？"
     },
diff --git a/src/renderer/src/i18n/zh-tw.json b/src/renderer/src/i18n/zh-tw.json
index 4886d21a..dbc15dd7 100644
--- a/src/renderer/src/i18n/zh-tw.json
+++ b/src/renderer/src/i18n/zh-tw.json
@@ -127,7 +127,8 @@
       "copy.title": "複製助手",
       "clear.title": "清空話題",
       "clear.content": "清空話題會刪除助手下所有主題和文件，確定要繼續嗎？",
-      "saveto.title": "儲存到智能體",
+      "save.title": "儲存到智能體",
+      "save.success": "儲存成功",
       "delete.title": "删除助手",
       "delete.content": "删除助手会删除所有该助手下的话题和文件，确定要繼續吗？"
     },
diff --git a/src/renderer/src/pages/agents/Agents.tsx b/src/renderer/src/pages/agents/Agents.tsx
index fdd0956e..40672ee7 100644
--- a/src/renderer/src/pages/agents/Agents.tsx
+++ b/src/renderer/src/pages/agents/Agents.tsx
@@ -32,8 +32,8 @@ const Agents: React.FC<Props> = ({ onClick }) => {
           onClick: () => AssistantSettingsPopup.show({ assistant: agent })
         },
         {
-          label: t('agents.add.title'),
-          key: 'add',
+          label: t('agents.add.button'),
+          key: 'create',
           icon: <PlusOutlined />,
           onClick: () => createAssistantFromAgent(agent)
         },
diff --git a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
index dd93dafb..9d5480fa 100644
--- a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
@@ -14,6 +14,7 @@ import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
 import { Message, Model } from '@renderer/types'
 import { removeTrailingDoubleSpaces } from '@renderer/utils'
 import { Dropdown, Popconfirm, Tooltip } from 'antd'
+import dayjs from 'dayjs'
 import { FC, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -72,7 +73,7 @@ const MessageMenubar: FC<Props> = (props) => {
         key: 'save',
         icon: <SaveOutlined />,
         onClick: () => {
-          const fileName = message.createdAt + '.md'
+          const fileName = dayjs(message.createdAt).format('YYYYMMDDHHmm') + '.md'
           window.api.file.save(fileName, message.content)
         }
       },
diff --git a/src/renderer/src/pages/home/Tabs/Assistants.tsx b/src/renderer/src/pages/home/Tabs/Assistants.tsx
index 33d9adc6..da342bf8 100644
--- a/src/renderer/src/pages/home/Tabs/Assistants.tsx
+++ b/src/renderer/src/pages/home/Tabs/Assistants.tsx
@@ -85,7 +85,7 @@ const Assistants: FC<Props> = ({
           }
         },
         {
-          label: t('assistants.saveto.title'),
+          label: t('assistants.save.title'),
           key: 'save-to-agent',
           icon: <SaveOutlined />,
           onClick: async () => {
@@ -93,6 +93,10 @@ const Assistants: FC<Props> = ({
             agent.id = uuid()
             agent.type = 'agent'
             addAgent(agent)
+            window.message.success({
+              content: t('assistants.save.success'),
+              key: 'save-to-agent'
+            })
           }
         },
         { type: 'divider' },
diff --git a/src/renderer/src/services/tokens.ts b/src/renderer/src/services/tokens.ts
index 816123f8..38ec9d5b 100644
--- a/src/renderer/src/services/tokens.ts
+++ b/src/renderer/src/services/tokens.ts
@@ -77,7 +77,7 @@ export async function estimateMessageUsage(message: Message): Promise<Completion
   return {
     prompt_tokens: promptUsedTokens,
     completion_tokens: completionUsedTokens,
-    total_tokens: usedTokens + imageTokens - 7
+    total_tokens: usedTokens + (imageTokens ? imageTokens - 7 : 0)
   }
 }