chore: merge code

jamebal · May 14, 2024 · 6d655d5 · 6d655d5
1 parent 9090954
commit 6d655d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/service/src/chatgpt/index.ts b/service/src/chatgpt/index.ts
@@ -115,6 +115,7 @@ export async function initApi(key: KeyConfig, chatModel: string, maxContextCount
 }
 const processThreads: { userId: string; abort: AbortController; messageId: string }[] = []
 async function chatReplyProcess(options: RequestOptions) {
+  console.log('options', options)
   const model = options.room.chatModel
   const key = await getRandomApiKey(options.user, model, options.room.accountId)
   const userId = options.user._id.toString()
@@ -415,7 +416,7 @@ async function getMessageById(id: string): Promise<ChatMessage | undefined> {
             url: string
           }
         }[] = chatInfo.prompt
-        if (chatInfo.images) {
+        if (chatInfo.images && chatInfo.images.length > 0) {
           content = [
             {
               type: 'text',

diff --git a/src/components/common/GitHubSite/index.vue b/src/components/common/GitHubSite/index.vue
@@ -8,7 +8,7 @@ const releaseVersion = import.meta.env.VITE_RELEASE_VERSION || 'v0.0.0'
     <span class="text-neutral-400">
       Powered by
     </span>
-    <a href="https://chatgpt-web.dev" target="_blank">
+    <a href="https://github.com/jamebal/chatgpt-web" target="_blank">
       <span class="text-blue-500">
         chatgpt-web
       </span>

diff --git a/src/components/common/Setting/index.vue b/src/components/common/Setting/index.vue
@@ -108,13 +108,6 @@ const show = computed({
           </template>
           <ChatRecord />
         </NTabPane>
-        <NTabPane v-if="userStore.userInfo.root" name="UserConfig" tab="UserConfig">
-          <template #tab>
-            <SvgIcon class="text-lg" icon="ri-user-5-line" />
-            <span class="ml-2">{{ $t('setting.userConfig') }}</span>
-          </template>
-          <User />
-        </NTabPane>
         <NTabPane v-if="userStore.userInfo.root" name="KeysConfig" tab="KeysConfig">
           <template #tab>
             <SvgIcon class="text-lg" icon="ri-key-2-line" />
@@ -157,13 +150,6 @@ const show = computed({
           </template>
           <User />
         </NTabPane>
-        <NTabPane v-if="userStore.userInfo.root" name="KeysConfig" tab="KeysConfig">
-          <template #tab>
-            <SvgIcon class="text-lg" icon="ri-key-2-line" />
-            <span class="ml-2">{{ $t('setting.keysConfig') }}</span>
-          </template>
-          <Key />
-        </NTabPane>
         <NTabPane v-if="userStore.userInfo.root" name="GiftCardConfig" tab="GiftCardConfig">
           <template #tab>
             <SvgIcon class="text-lg" icon="mdi-gift" />

diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
@@ -726,7 +726,7 @@ onUnmounted(() => {
           <div class="flex items-center space-x-2">
             <div>
               <NUpload
-                :disabled="!isVisionModel"
+                :disabled="true"
                 action="/api/upload-image"
                 list-type="image"
                 class="flex items-center justify-center h-10 transition hover:bg-neutral-100 dark:hover:bg-[#414755]"