Update tauri.conf.json

Merge pull request #2542 from Yidadaa/yifei-bugfix-0802
chore: smaller auto scroll interval
2025-08-30 18:46:58 +08:00 · 2023-08-03 10:41:45 +08:00 · 2023-08-02 23:54:19 +08:00 · 2023-08-02 23:51:01 +08:00 · 2023-08-02 23:40:50 +08:00 · 2023-08-02 23:35:51 +08:00
31 changed files with 356 additions and 233 deletions
--- a/88
+++ b/88
@@ -1,75 +1,21 @@
-版权所有（c）<2023><Zhang Yifei>
+MIT License

-反996许可证版本1.0
+Copyright (c) 2023 Zhang Yifei

-在符合下列条件的情况下，
-特此免费向任何得到本授权作品的副本（包括源代码、文件和/或相关内容，以下统称为“授权作品”
-）的个人和法人实体授权：被授权个人或法人实体有权以任何目的处置授权作品，包括但不限于使
-用、复制，修改，衍生利用、散布，发布和再许可：
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:

+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.

-1.	个人或法人实体必须在许可作品的每个再散布或衍生副本上包含以上版权声明和本许可证，不
-    得自行修改。
-2.	个人或法人实体必须严格遵守与个人实际所在地或个人出生地或归化地、或法人实体注册地或
-    经营地（以较严格者为准）的司法管辖区所有适用的与劳动和就业相关法律、法规、规则和
-    标准。如果该司法管辖区没有此类法律、法规、规章和标准或其法律、法规、规章和标准不可
-    执行，则个人或法人实体必须遵守国际劳工标准的核心公约。
-3.	个人或法人不得以任何方式诱导或强迫其全职或兼职员工或其独立承包人以口头或书面形式同
-    意直接或间接限制、削弱或放弃其所拥有的，受相关与劳动和就业有关的法律、法规、规则和
-    标准保护的权利或补救措施，无论该等书面或口头协议是否被该司法管辖区的法律所承认，该
-    等个人或法人实体也不得以任何方法限制其雇员或独立承包人向版权持有人或监督许可证合规
-    情况的有关当局报告或投诉上述违反许可证的行为的权利。
-
-该授权作品是"按原样"提供，不做任何明示或暗示的保证，包括但不限于对适销性、特定用途适用
-性和非侵权性的保证。在任何情况下，无论是在合同诉讼、侵权诉讼或其他诉讼中，版权持有人均
-不承担因本软件或本软件的使用或其他交易而产生、引起或与之相关的任何索赔、损害或其他责任。
-
-
------------------------- ENGLISH ------------------------------
-
-
-Copyright (c) <2023> <Zhang Yifei>
-
-Anti 996 License Version 1.0 (Draft)
-
-Permission is hereby granted to any individual or legal entity obtaining a copy
-of this licensed work (including the source code, documentation and/or related
-items, hereinafter collectively referred to as the "licensed work"), free of
-charge, to deal with the licensed work for any purpose, including without
-limitation, the rights to use, reproduce, modify, prepare derivative works of,
-publish, distribute and sublicense the licensed work, subject to the following
-conditions:
-
-1.  The individual or the legal entity must conspicuously display, without
-    modification, this License on each redistributed or derivative copy of the
-    Licensed Work.
-
-2.  The individual or the legal entity must strictly comply with all applicable
-    laws, regulations, rules and standards of the jurisdiction relating to
-    labor and employment where the individual is physically located or where
-    the individual was born or naturalized; or where the legal entity is
-    registered or is operating (whichever is stricter). In case that the
-    jurisdiction has no such laws, regulations, rules and standards or its
-    laws, regulations, rules and standards are unenforceable, the individual
-    or the legal entity are required to comply with Core International Labor
-    Standards.
-
-3.  The individual or the legal entity shall not induce or force its
-    employee(s), whether full-time or part-time, or its independent
-    contractor(s), in any methods, to agree in oral or written form,
-    to directly or indirectly restrict, weaken or relinquish his or
-    her rights or remedies under such laws, regulations, rules and
-    standards relating to labor and employment as mentioned above,
-    no matter whether such written or oral agreement are enforceable
-    under the laws of the said jurisdiction, nor shall such individual
-    or the legal entity limit, in any methods, the rights of its employee(s)
-    or independent contractor(s) from reporting or complaining to the copyright
-    holder or relevant authorities monitoring the compliance of the license
-    about its violation(s) of the said license.
-
-THE LICENSED WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ANY WAY CONNECTION
-WITH THE LICENSED WORK OR THE USE OR OTHER DEALINGS IN THE LICENSED WORK.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -306,4 +306,4 @@ If you want to add a new translation, read this [document](./docs/translation.md

 ## LICENSE

-[Anti 996 License](https://github.com/kattgu7/Anti-996-License/blob/master/LICENSE_CN_EN)
+[MIT](https://opensource.org/license/mit/)
--- a/README_CN.md
+++ b/README_CN.md
@@ -181,6 +181,4 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s

 ## 开源协议

-> 反对 996，从我开始。
-
-[Anti 996 License](https://github.com/kattgu7/Anti-996-License/blob/master/LICENSE_CN_EN)
+[MIT](https://opensource.org/license/mit/)
--- a/README_ES.md
+++ b/README_ES.md
@@ -7,7 +7,7 @@ Implemente su aplicación web privada ChatGPT de forma gratuita con un solo clic

 [Demo demo](https://chat-gpt-next-web.vercel.app/) / [Problemas de comentarios](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) / [Únete a Discord](https://discord.gg/zrhvHCr79N) / [Grupo QQ](https://user-images.githubusercontent.com/16968934/228190818-7dd00845-e9b9-4363-97e5-44c507ac76da.jpeg) / [Desarrolladores de consejos](https://user-images.githubusercontent.com/16968934/227772541-5bcd52d8-61b7-488c-a203-0330d8006e2b.jpg) / [Donar](#捐赠-donate-usdt)

-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web\&env=OPENAI_API_KEY\&env=CODE\&project-name=chatgpt-next-web\&repository-name=ChatGPT-Next-Web)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web)

 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web)

@@ -19,7 +19,7 @@ Implemente su aplicación web privada ChatGPT de forma gratuita con un solo clic

 1.  Prepara el tuyo [Clave API OpenAI](https://platform.openai.com/account/api-keys);
 2.  Haga clic en el botón de la derecha para iniciar la implementación:
-    [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web\&env=OPENAI_API_KEY\&env=CODE\&project-name=chatgpt-next-web\&repository-name=ChatGPT-Next-Web), inicie sesión directamente con su cuenta de Github y recuerde completar la clave API y la suma en la página de variables de entorno[Contraseña de acceso a la página](#配置页面访问密码) CÓDIGO;
+    [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web), inicie sesión directamente con su cuenta de Github y recuerde completar la clave API y la suma en la página de variables de entorno[Contraseña de acceso a la página](#配置页面访问密码) CÓDIGO;
 3.  Una vez implementado, puede comenzar;
 4.  (Opcional)[Enlazar un nombre de dominio personalizado](https://vercel.com/docs/concepts/projects/domains/add-a-domain): El nombre de dominio DNS asignado por Vercel está contaminado en algunas regiones y puede conectarse directamente enlazando un nombre de dominio personalizado.

@@ -28,9 +28,9 @@ Implemente su aplicación web privada ChatGPT de forma gratuita con un solo clic
 Si sigue los pasos anteriores para implementar su proyecto con un solo clic, es posible que siempre diga "La actualización existe" porque Vercel creará un nuevo proyecto para usted de forma predeterminada en lugar de bifurcar el proyecto, lo que evitará que la actualización se detecte correctamente.
 Le recomendamos que siga estos pasos para volver a implementar:

-*   Eliminar el repositorio original;
-*   Utilice el botón de bifurcación en la esquina superior derecha de la página para bifurcar este proyecto;
-*   En Vercel, vuelva a seleccionar e implementar,[Echa un vistazo al tutorial detallado](./docs/vercel-cn.md#如何新建项目)。
+- Eliminar el repositorio original;
+- Utilice el botón de bifurcación en la esquina superior derecha de la página para bifurcar este proyecto;
+- En Vercel, vuelva a seleccionar e implementar,[Echa un vistazo al tutorial detallado](./docs/vercel-cn.md#如何新建项目)。

 ### Activar actualizaciones automáticas

@@ -170,6 +170,4 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s

 ## Licencia de código abierto

-> Contra 996, empezando por mí.
-
-[Licencia Anti 996](https://github.com/kattgu7/Anti-996-License/blob/master/LICENSE_CN_EN)
+[MIT](https://opensource.org/license/mit/)
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -178,7 +178,7 @@ export class ChatGPTApi implements LLMApi {
        options.onFinish(message);
      }
    } catch (e) {
-      console.log("[Request] failed to make a chat reqeust", e);
+      console.log("[Request] failed to make a chat request", e);
      options.onError?.(e as Error);
    }
  }
--- a/app/command.ts
+++ b/app/command.ts
@@ -7,6 +7,8 @@ interface Commands {
  fill?: Command;
  submit?: Command;
  mask?: Command;
+  code?: Command;
+  settings?: Command;
 }

 export function useCommand(commands: Commands = {}) {
--- a/app/components/chat.module.scss
+++ b/app/components/chat.module.scss
@@ -14,10 +14,11 @@
    padding: 4px 10px;
    animation: slide-in ease 0.3s;
    box-shadow: var(--card-shadow);
-    transition: all ease 0.3s;
+    transition: width ease 0.3s;
    align-items: center;
    height: 16px;
    width: var(--icon-width);
+    overflow: hidden;

    &:not(:last-child) {
      margin-right: 5px;
@@ -29,14 +30,16 @@
      opacity: 0;
      transform: translateX(-5px);
      transition: all ease 0.3s;
-      transition-delay: 0.1s;
      pointer-events: none;
    }

    &:hover {
+      --delay: 0.5s;
      width: var(--full-width);
+      transition-delay: var(--delay);

      .text {
+        transition-delay: var(--delay);
        opacity: 1;
        transform: translate(0);
      }
@@ -95,11 +98,28 @@
 }

 .context-prompt {
+  .context-prompt-insert {
+    display: flex;
+    justify-content: center;
+    padding: 4px;
+    opacity: 0.2;
+    transition: all ease 0.3s;
+    background-color: rgba(0, 0, 0, 0);
+    cursor: pointer;
+    border-radius: 4px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+
+    &:hover {
+      opacity: 1;
+      background-color: rgba(0, 0, 0, 0.05);
+    }
+  }
+
  .context-prompt-row {
    display: flex;
    justify-content: center;
    width: 100%;
-    margin-bottom: 10px;

    &:hover {
      .context-drag {
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -25,6 +25,8 @@ import SettingsIcon from "../icons/chat-settings.svg";
 import DeleteIcon from "../icons/clear.svg";
 import PinIcon from "../icons/pin.svg";
 import EditIcon from "../icons/rename.svg";
+import ConfirmIcon from "../icons/confirm.svg";
+import CancelIcon from "../icons/cancel.svg";

 import LightIcon from "../icons/light.svg";
 import DarkIcon from "../icons/dark.svg";
@@ -63,6 +65,7 @@ import { IconButton } from "./button";
 import styles from "./chat.module.scss";

 import {
+  List,
  ListItem,
  Modal,
  Selector,
@@ -73,7 +76,7 @@ import {
 import { useLocation, useNavigate } from "react-router-dom";
 import { LAST_INPUT_KEY, Path, REQUEST_TIMEOUT_MS } from "../constant";
 import { Avatar } from "./emoji";
-import { MaskAvatar, MaskConfig } from "./mask";
+import { ContextPrompts, MaskAvatar, MaskConfig } from "./mask";
 import { useMaskStore } from "../store/mask";
 import { ChatCommandPrefix, useChatCommand, useCommand } from "../command";
 import { prettyObject } from "../utils/format";
@@ -367,18 +370,27 @@ function ChatAction(props: {
 function useScrollToBottom() {
  // for auto-scroll
  const scrollRef = useRef<HTMLDivElement>(null);
-  const [autoScroll, setAutoScroll] = useState(true);
+  const autoScroll = useRef(true);
  const scrollToBottom = useCallback(() => {
    const dom = scrollRef.current;
    if (dom) {
      requestAnimationFrame(() => dom.scrollTo(0, dom.scrollHeight));
    }
  }, []);
+  const setAutoScroll = (enable: boolean) => {
+    autoScroll.current = enable;
+  };

  // auto scroll
  useEffect(() => {
-    autoScroll && scrollToBottom();
-  });
+    const intervalId = setInterval(() => {
+      if (autoScroll.current) {
+        scrollToBottom();
+      }
+    }, 30);
+    return () => clearInterval(intervalId);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);

  return {
    scrollRef,
@@ -501,6 +513,7 @@ export function ChatActions(props: {

      {showModelSelector && (
        <Selector
+          defaultSelectedValue={currentModel}
          items={models.map((m) => ({
            title: m,
            value: m,
@@ -520,14 +533,73 @@ export function ChatActions(props: {
  );
 }

+export function EditMessageModal(props: { onClose: () => void }) {
+  const chatStore = useChatStore();
+  const session = chatStore.currentSession();
+  const [messages, setMessages] = useState(session.messages.slice());
+
+  return (
+    <div className="modal-mask">
+      <Modal
+        title={Locale.Chat.EditMessage.Title}
+        onClose={props.onClose}
+        actions={[
+          <IconButton
+            text={Locale.UI.Cancel}
+            icon={<CancelIcon />}
+            key="cancel"
+            onClick={() => {
+              props.onClose();
+            }}
+          />,
+          <IconButton
+            type="primary"
+            text={Locale.UI.Confirm}
+            icon={<ConfirmIcon />}
+            key="ok"
+            onClick={() => {
+              chatStore.updateCurrentSession(
+                (session) => (session.messages = messages),
+              );
+              props.onClose();
+            }}
+          />,
+        ]}
+      >
+        <List>
+          <ListItem
+            title={Locale.Chat.EditMessage.Topic.Title}
+            subTitle={Locale.Chat.EditMessage.Topic.SubTitle}
+          >
+            <input
+              type="text"
+              value={session.topic}
+              onInput={(e) =>
+                chatStore.updateCurrentSession(
+                  (session) => (session.topic = e.currentTarget.value),
+                )
+              }
+            ></input>
+          </ListItem>
+        </List>
+        <ContextPrompts
+          context={messages}
+          updateContext={(updater) => {
+            const newMessages = messages.slice();
+            updater(newMessages);
+            setMessages(newMessages);
+          }}
+        />
+      </Modal>
+    </div>
+  );
+}
+
 export function Chat() {
  type RenderMessage = ChatMessage & { preview?: boolean };

  const chatStore = useChatStore();
-  const [session, sessionIndex] = useChatStore((state) => [
-    state.currentSession(),
-    state.currentSessionIndex,
-  ]);
+  const session = chatStore.currentSession();
  const config = useAppConfig();
  const fontSize = config.fontSize;

@@ -542,9 +614,14 @@ export function Chat() {
  const isMobileScreen = useMobileScreen();
  const navigate = useNavigate();

+  const lastBodyScroolTop = useRef(0);
  const onChatBodyScroll = (e: HTMLElement) => {
    const isTouchBottom = e.scrollTop + e.clientHeight >= e.scrollHeight - 10;
    setHitBottom(isTouchBottom);
+
+    // only enable auto scroll when scroll down and touched bottom
+    setAutoScroll(e.scrollTop >= lastBodyScroolTop.current && isTouchBottom);
+    lastBodyScroolTop.current = e.scrollTop;
  };

  // prompt hints
@@ -710,22 +787,6 @@ export function Chat() {
    }
  };

-  const findLastUserIndex = (messageId: string) => {
-    // find last user input message
-    let lastUserMessageIndex: number | null = null;
-    for (let i = 0; i < session.messages.length; i += 1) {
-      const message = session.messages[i];
-      if (message.role === "user") {
-        lastUserMessageIndex = i;
-      }
-      if (message.id === messageId) {
-        break;
-      }
-    }
-
-    return lastUserMessageIndex;
-  };
-
  const deleteMessage = (msgId?: string) => {
    chatStore.updateCurrentSession(
      (session) =>
@@ -859,16 +920,6 @@ export function Chat() {

  const [showPromptModal, setShowPromptModal] = useState(false);

-  const renameSession = () => {
-    showPrompt(Locale.Chat.Rename, session.topic).then((newTopic) => {
-      if (newTopic && newTopic !== session.topic) {
-        chatStore.updateCurrentSession(
-          (session) => (session.topic = newTopic!),
-        );
-      }
-    });
-  };
-
  const clientConfig = useMemo(() => getClientConfig(), []);

  const location = useLocation();
@@ -882,8 +933,46 @@ export function Chat() {
    submit: (text) => {
      doSubmit(text);
    },
+    code: (text) => {
+      console.log("[Command] got code from url: ", text);
+      showConfirm(Locale.URLCommand.Code + `code = ${text}`).then((res) => {
+        if (res) {
+          accessStore.updateCode(text);
+        }
+      });
+    },
+    settings: (text) => {
+      try {
+        const payload = JSON.parse(text) as {
+          key?: string;
+          url?: string;
+        };
+
+        console.log("[Command] got settings from url: ", payload);
+
+        if (payload.key || payload.url) {
+          showConfirm(
+            Locale.URLCommand.Settings +
+              `\n${JSON.stringify(payload, null, 4)}`,
+          ).then((res) => {
+            if (!res) return;
+            if (payload.key) {
+              accessStore.updateToken(payload.key);
+            }
+            if (payload.url) {
+              accessStore.updateOpenAiUrl(payload.url);
+            }
+          });
+        }
+      } catch {
+        console.error("[Command] failed to get settings from url: ", text);
+      }
+    },
  });

+  // edit / insert message modal
+  const [isEditingMessage, setIsEditingMessage] = useState(false);
+
  return (
    <div className={styles.chat} key={session.id}>
      <div className="window-header" data-tauri-drag-region>
@@ -903,7 +992,7 @@ export function Chat() {
        <div className={`window-header-title ${styles["chat-body-title"]}`}>
          <div
            className={`window-header-main-title ${styles["chat-body-main-title"]}`}
-            onClickCapture={renameSession}
+            onClickCapture={() => setIsEditingMessage(true)}
          >
            {!session.topic ? DEFAULT_TOPIC : session.topic}
          </div>
@@ -917,7 +1006,7 @@ export function Chat() {
              <IconButton
                icon={<RenameIcon />}
                bordered
-                onClick={renameSession}
+                onClick={() => setIsEditingMessage(true)}
              />
            </div>
          )}
@@ -958,7 +1047,6 @@ export function Chat() {
        ref={scrollRef}
        onScroll={(e) => onChatBodyScroll(e.currentTarget)}
        onMouseDown={() => inputRef.current?.blur()}
-        onWheel={(e) => setAutoScroll(hitBottom && e.deltaY > 0)}
        onTouchStart={() => {
          inputRef.current?.blur();
          setAutoScroll(false);
@@ -1070,7 +1158,7 @@ export function Chat() {
                      }}
                      fontSize={fontSize}
                      parentRef={scrollRef}
-                      defaultShow={i >= messages.length - 10}
+                      defaultShow={i >= messages.length - 6}
                    />
                  </div>

@@ -1115,7 +1203,6 @@ export function Chat() {
            value={userInput}
            onKeyDown={onInputKeyDown}
            onFocus={() => setAutoScroll(true)}
-            onBlur={() => setAutoScroll(false)}
            rows={inputRows}
            autoFocus={autoFocus}
            style={{
@@ -1135,6 +1222,14 @@ export function Chat() {
      {showExport && (
        <ExportMessageModal onClose={() => setShowExport(false)} />
      )}
+
+      {isEditingMessage && (
+        <EditMessageModal
+          onClose={() => {
+            setIsEditingMessage(false);
+          }}
+        />
+      )}
    </div>
  );
 }
--- a/app/components/home.module.scss
+++ b/app/components/home.module.scss
@@ -174,6 +174,7 @@
  user-select: none;
  border: 2px solid transparent;
  position: relative;
+  content-visibility: auto;
 }

 .chat-item:hover {
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -215,67 +215,58 @@ function ContextPromptItem(props: {
  const [focusingInput, setFocusingInput] = useState(false);

  return (
-    <Draggable draggableId={props.prompt.id || props.index.toString()} index={props.index}>
-      {(provided) => (
-        <div
-          className={chatStyle["context-prompt-row"]}
-          ref={provided.innerRef}
-          {...provided.draggableProps}
-          {...provided.dragHandleProps}
-        >
-          {!focusingInput && (
-            <>
-              <div className={chatStyle["context-drag"]}>
-                <DragIcon />
-              </div>
-              <Select
-                value={props.prompt.role}
-                className={chatStyle["context-role"]}
-                onChange={(e) =>
-                  props.update({
-                    ...props.prompt,
-                    role: e.target.value as any,
-                  })
-                }
-              >
-                {ROLES.map((r) => (
-                  <option key={r} value={r}>
-                    {r}
-                  </option>
-                ))}
-              </Select>
-            </>
-          )}
-          <Input
-            value={props.prompt.content}
-            type="text"
-            className={chatStyle["context-content"]}
-            rows={focusingInput ? 5 : 1}
-            onFocus={() => setFocusingInput(true)}
-            onBlur={() => {
-              setFocusingInput(false);
-              // If the selection is not removed when the user loses focus, some
-              // extensions like "Translate" will always display a floating bar
-              window?.getSelection()?.removeAllRanges();
-            }}
-            onInput={(e) =>
+    <div className={chatStyle["context-prompt-row"]}>
+      {!focusingInput && (
+        <>
+          <div className={chatStyle["context-drag"]}>
+            <DragIcon />
+          </div>
+          <Select
+            value={props.prompt.role}
+            className={chatStyle["context-role"]}
+            onChange={(e) =>
              props.update({
                ...props.prompt,
-                content: e.currentTarget.value as any,
+                role: e.target.value as any,
              })
            }
-          />
-          {!focusingInput && (
-            <IconButton
-              icon={<DeleteIcon />}
-              className={chatStyle["context-delete-button"]}
-              onClick={() => props.remove()}
-              bordered
-            />
-          )}
-        </div>
+          >
+            {ROLES.map((r) => (
+              <option key={r} value={r}>
+                {r}
+              </option>
+            ))}
+          </Select>
+        </>
      )}
-    </Draggable>
+      <Input
+        value={props.prompt.content}
+        type="text"
+        className={chatStyle["context-content"]}
+        rows={focusingInput ? 5 : 1}
+        onFocus={() => setFocusingInput(true)}
+        onBlur={() => {
+          setFocusingInput(false);
+          // If the selection is not removed when the user loses focus, some
+          // extensions like "Translate" will always display a floating bar
+          window?.getSelection()?.removeAllRanges();
+        }}
+        onInput={(e) =>
+          props.update({
+            ...props.prompt,
+            content: e.currentTarget.value as any,
+          })
+        }
+      />
+      {!focusingInput && (
+        <IconButton
+          icon={<DeleteIcon />}
+          className={chatStyle["context-delete-button"]}
+          onClick={() => props.remove()}
+          bordered
+        />
+      )}
+    </div>
  );
 }

@@ -285,8 +276,8 @@ export function ContextPrompts(props: {
 }) {
  const context = props.context;

-  const addContextPrompt = (prompt: ChatMessage) => {
-    props.updateContext((context) => context.push(prompt));
+  const addContextPrompt = (prompt: ChatMessage, i: number) => {
+    props.updateContext((context) => context.splice(i, 0, prompt));
  };

  const removeContextPrompt = (i: number) => {
@@ -319,13 +310,41 @@ export function ContextPrompts(props: {
            {(provided) => (
              <div ref={provided.innerRef} {...provided.droppableProps}>
                {context.map((c, i) => (
-                  <ContextPromptItem
+                  <Draggable
+                    draggableId={c.id || i.toString()}
                    index={i}
                    key={c.id}
-                    prompt={c}
-                    update={(prompt) => updateContextPrompt(i, prompt)}
-                    remove={() => removeContextPrompt(i)}
-                  />
+                  >
+                    {(provided) => (
+                      <div
+                        ref={provided.innerRef}
+                        {...provided.draggableProps}
+                        {...provided.dragHandleProps}
+                      >
+                        <ContextPromptItem
+                          index={i}
+                          prompt={c}
+                          update={(prompt) => updateContextPrompt(i, prompt)}
+                          remove={() => removeContextPrompt(i)}
+                        />
+                        <div
+                          className={chatStyle["context-prompt-insert"]}
+                          onClick={() => {
+                            addContextPrompt(
+                              createMessage({
+                                role: "user",
+                                content: "",
+                                date: new Date().toLocaleString(),
+                              }),
+                              i + 1,
+                            );
+                          }}
+                        >
+                          <AddIcon />
+                        </div>
+                      </div>
+                    )}
+                  </Draggable>
                ))}
                {provided.placeholder}
              </div>
@@ -333,23 +352,26 @@ export function ContextPrompts(props: {
          </Droppable>
        </DragDropContext>

-        <div className={chatStyle["context-prompt-row"]}>
-          <IconButton
-            icon={<AddIcon />}
-            text={Locale.Context.Add}
-            bordered
-            className={chatStyle["context-prompt-button"]}
-            onClick={() =>
-              addContextPrompt(
-                createMessage({
-                  role: "user",
-                  content: "",
-                  date: "",
-                }),
-              )
-            }
-          />
-        </div>
+        {props.context.length === 0 && (
+          <div className={chatStyle["context-prompt-row"]}>
+            <IconButton
+              icon={<AddIcon />}
+              text={Locale.Context.Add}
+              bordered
+              className={chatStyle["context-prompt-button"]}
+              onClick={() =>
+                addContextPrompt(
+                  createMessage({
+                    role: "user",
+                    content: "",
+                    date: "",
+                  }),
+                  props.context.length,
+                )
+              }
+            />
+          </div>
+        )}
      </div>
    </>
  );
--- a/app/components/model-config.tsx
+++ b/app/components/model-config.tsx
@@ -76,7 +76,7 @@ export function ModelConfigList(props: {
        <input
          type="number"
          min={100}
-          max={32000}
+          max={100000}
          value={props.modelConfig.max_tokens}
          onChange={(e) =>
            props.updateConfig(
@@ -169,7 +169,7 @@ export function ModelConfigList(props: {
          title={props.modelConfig.historyMessageCount.toString()}
          value={props.modelConfig.historyMessageCount}
          min="0"
-          max="32"
+          max="64"
          step="1"
          onChange={(e) =>
            props.updateConfig(
--- a/app/components/ui-lib.tsx
+++ b/app/components/ui-lib.tsx
@@ -377,7 +377,7 @@ export function showPrompt(content: any, value = "", rows = 3) {
  };

  return new Promise<string>((resolve) => {
-    let userInput = "";
+    let userInput = value;

    root.render(
      <Modal
@@ -443,6 +443,7 @@ export function Selector<T>(props: {
    subTitle?: string;
    value: T;
  }>;
+  defaultSelectedValue?: T;
  onSelection?: (selection: T[]) => void;
  onClose?: () => void;
  multiple?: boolean;
@@ -452,6 +453,7 @@ export function Selector<T>(props: {
      <div className={styles["selector-content"]}>
        <List>
          {props.items.map((item, i) => {
+            const selected = props.defaultSelectedValue === item.value;
            return (
              <ListItem
                className={styles["selector-item"]}
@@ -462,7 +464,20 @@ export function Selector<T>(props: {
                  props.onSelection?.([item.value]);
                  props.onClose?.();
                }}
-              ></ListItem>
+              >
+                {selected ? (
+                  <div
+                    style={{
+                      height: 10,
+                      width: 10,
+                      backgroundColor: "var(--primary)",
+                      borderRadius: 10,
+                    }}
+                  ></div>
+                ) : (
+                  <></>
+                )}
+              </ListItem>
            );
          })}
        </List>
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -18,6 +18,13 @@ const cn = {
  },
  Chat: {
    SubTitle: (count: number) => `共 ${count} 条对话`,
+    EditMessage: {
+      Title: "编辑消息记录",
+      Topic: {
+        Title: "聊天主题",
+        SubTitle: "更改当前聊天主题",
+      },
+    },
    Actions: {
      ChatList: "查看消息列表",
      CompressedHistory: "查看压缩后的历史 Prompt",
@@ -268,7 +275,7 @@ const cn = {
  Context: {
    Toast: (x: any) => `包含 ${x} 条预设提示词`,
    Edit: "当前对话设置",
-    Add: "新增预设对话",
+    Add: "新增一条对话",
    Clear: "上下文已清除",
    Revert: "恢复上下文",
  },
@@ -326,6 +333,11 @@ const cn = {
    More: "查看全部",
  },

+  URLCommand: {
+    Code: "检测到链接中已经包含访问码，是否自动填入？",
+    Settings: "检测到链接中包含了预制设置，是否自动填入？",
+  },
+
  UI: {
    Confirm: "确认",
    Cancel: "取消",
--- a/app/locales/cs.ts
+++ b/app/locales/cs.ts
@@ -5,7 +5,7 @@ const cs: PartialLocaleType = {
  WIP: "V přípravě...",
  Error: {
    Unauthorized:
-      "Neoprávněný přístup, zadejte přístupový kód na stránce nastavení.",
+      "Neoprávněný přístup, zadejte přístupový kód na [stránce](/#/auth) nastavení.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} zpráv`,
--- a/app/locales/de.ts
+++ b/app/locales/de.ts
@@ -5,7 +5,7 @@ const de: PartialLocaleType = {
  WIP: "In Bearbeitung...",
  Error: {
    Unauthorized:
-      "Unbefugter Zugriff, bitte geben Sie den Zugangscode auf der Einstellungsseite ein.",
+      "Unbefugter Zugriff, bitte geben Sie den Zugangscode auf der [Einstellungsseite](/#/auth) ein.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} Nachrichten`,
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -20,6 +20,13 @@ const en: LocaleType = {
  },
  Chat: {
    SubTitle: (count: number) => `${count} messages`,
+    EditMessage: {
+      Title: "Edit All Messages",
+      Topic: {
+        Title: "Topic",
+        SubTitle: "Change the current topic",
+      },
+    },
    Actions: {
      ChatList: "Go To Chat List",
      CompressedHistory: "Compressed History Memory Prompt",
@@ -344,6 +351,11 @@ const en: LocaleType = {
    Topic: "Topic",
    Time: "Time",
  },
+
+  URLCommand: {
+    Code: "Detected access code from url, confirm to apply? ",
+    Settings: "Detected settings from url, confirm to apply?",
+  },
 };

 export default en;
--- a/app/locales/es.ts
+++ b/app/locales/es.ts
@@ -5,7 +5,7 @@ const es: PartialLocaleType = {
  WIP: "En construcción...",
  Error: {
    Unauthorized:
-      "Acceso no autorizado, por favor ingrese el código de acceso en la página de configuración.",
+      "Acceso no autorizado, por favor ingrese el código de acceso en la [página](/#/auth) de configuración.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} mensajes`,
--- a/app/locales/fr.ts
+++ b/app/locales/fr.ts
@@ -5,7 +5,7 @@ const fr: PartialLocaleType = {
  WIP: "Prochainement...",
  Error: {
    Unauthorized:
-      "Accès non autorisé, veuillez saisir le code d'accès dans la page des paramètres.",
+      "Accès non autorisé, veuillez saisir le code d'accès dans la [page](/#/auth) des paramètres.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} messages en total`,
--- a/app/locales/it.ts
+++ b/app/locales/it.ts
@@ -5,7 +5,7 @@ const it: PartialLocaleType = {
  WIP: "Work in progress...",
  Error: {
    Unauthorized:
-      "Accesso non autorizzato, inserire il codice di accesso nella pagina delle impostazioni.",
+      "Accesso non autorizzato, inserire il codice di accesso nella [pagina](/#/auth) delle impostazioni.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} messaggi`,
--- a/app/locales/ko.ts
+++ b/app/locales/ko.ts
@@ -5,7 +5,8 @@ import type { PartialLocaleType } from "./index";
 const ko: PartialLocaleType = {
  WIP: "곧 출시 예정...",
  Error: {
-    Unauthorized: "권한이 없습니다. 설정 페이지에서 액세스 코드를 입력하세요.",
+    Unauthorized:
+      "권한이 없습니다. 설정 페이지에서 액세스 코드를 [입력하세요](/#/auth).",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count}개의 메시지`,
--- a/app/locales/no.ts
+++ b/app/locales/no.ts
@@ -4,7 +4,8 @@ import type { PartialLocaleType } from "./index";
 const no: PartialLocaleType = {
  WIP: "Arbeid pågår ...",
  Error: {
-    Unauthorized: "Du har ikke tilgang. Vennlig oppgi tildelt adgangskode.",
+    Unauthorized:
+      "Du har ikke tilgang. [Vennlig oppgi tildelt adgangskode](/#/auth).",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} meldinger`,
--- a/app/locales/ru.ts
+++ b/app/locales/ru.ts
@@ -5,7 +5,7 @@ const ru: PartialLocaleType = {
  WIP: "Скоро...",
  Error: {
    Unauthorized:
-      "Несанкционированный доступ. Пожалуйста, введите код доступа на странице настроек.",
+      "Несанкционированный доступ. Пожалуйста, введите код доступа на [странице](/#/auth) настроек.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} сообщений`,
--- a/app/locales/tr.ts
+++ b/app/locales/tr.ts
@@ -5,7 +5,7 @@ const tr: PartialLocaleType = {
  WIP: "Çalışma devam ediyor...",
  Error: {
    Unauthorized:
-      "Yetkisiz erişim, lütfen erişim kodunu ayarlar sayfasından giriniz.",
+      "Yetkisiz erişim, lütfen erişim kodunu ayarlar [sayfasından](/#/auth) giriniz.",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} mesaj`,
--- a/app/locales/tw.ts
+++ b/app/locales/tw.ts
@@ -4,7 +4,7 @@ import type { PartialLocaleType } from "./index";
 const tw: PartialLocaleType = {
  WIP: "該功能仍在開發中……",
  Error: {
-    Unauthorized: "目前您的狀態是未授權，請前往設定頁面輸入授權碼。",
+    Unauthorized: "目前您的狀態是未授權，請前往[設定頁面](/#/auth)輸入授權碼。",
  },
  ChatItem: {
    ChatItemCount: (count: number) => `${count} 條對話`,
--- a/app/store/access.ts
+++ b/app/store/access.ts
@@ -48,13 +48,13 @@ export const useAccessStore = create<AccessControlStore>()(
        return get().needCode;
      },
      updateCode(code: string) {
-        set(() => ({ accessCode: code }));
+        set(() => ({ accessCode: code?.trim() }));
      },
      updateToken(token: string) {
-        set(() => ({ token }));
+        set(() => ({ token: token?.trim() }));
      },
      updateOpenAiUrl(url: string) {
-        set(() => ({ openaiUrl: url }));
+        set(() => ({ openaiUrl: url?.trim() }));
      },
      isAuthorized() {
        get().fetch();
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -81,7 +81,7 @@ export const ModalConfigValidator = {
    return x as ModelType;
  },
  max_tokens(x: number) {
-    return limitNumber(x, 0, 32000, 2000);
+    return limitNumber(x, 0, 100000, 2000);
  },
  presence_penalty(x: number) {
    return limitNumber(x, -2, 2, 0);
--- a/docs/faq-cn.md
+++ b/docs/faq-cn.md
@@ -39,7 +39,7 @@ Docker 版本相当于稳定版，latest Docker 总是与 latest release version

 > 相关讨论：[#386](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/386)

-如果你使用 ngnix 反向代理，需要在配置文件中增加下列代码：
+如果你使用 nginx 反向代理，需要在配置文件中增加下列代码：

 ```
 # 不缓存，支持流式输出
--- a/docs/faq-es.md
+++ b/docs/faq-es.md
@@ -39,7 +39,7 @@ Esta es su contraseña de acceso personalizada, puede elegir:

 > Debates relacionados:[#386](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/386)

-Si utiliza el proxy inverso ngnix, debe agregar el siguiente código al archivo de configuración:
+Si utiliza el proxy inverso nginx, debe agregar el siguiente código al archivo de configuración:

    # 不缓存，支持流式输出
    proxy_cache off;  # 关闭缓存
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
    "@tauri-apps/cli": "^1.4.0",
    "@types/node": "^20.3.3",
    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.0.11",
+    "@types/react-dom": "^18.2.7",
    "@types/react-katex": "^3.0.0",
    "@types/spark-md5": "^3.0.2",
    "cross-env": "^7.0.3",
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
    "productName": "ChatGPT Next Web",
-    "version": "2.9.0"
+    "version": "2.9.2"
  },
  "tauri": {
    "allowlist": {
--- a/yarn.lock
+++ b/yarn.lock
@@ -1505,10 +1505,10 @@
  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==

-"@types/react-dom@^18.0.11":
-  version "18.0.11"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33"
-  integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==
+"@types/react-dom@^18.2.7":
+  version "18.2.7"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.7.tgz#67222a08c0a6ae0a0da33c3532348277c70abb63"
+  integrity sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==
  dependencies:
    "@types/react" "*"
Author	SHA1	Message	Date
Yifei Zhang	081d84f848	Update tauri.conf.json	2023-08-03 10:41:45 +08:00
Yifei Zhang	e381add944	Merge pull request #2542 from Yidadaa/yifei-bugfix-0802 chore: smaller auto scroll interval	2023-08-02 23:54:19 +08:00
Yidadaa	75d4eca722	chore: smaller auto scroll interval	2023-08-02 23:51:01 +08:00
Yifei Zhang	56904ad6b2	Merge pull request #2541 from Yidadaa/yifei-bugfix-0802 feat: improve chat action, auto scroll and edit model title	2023-08-02 23:40:50 +08:00
Yidadaa	b5ef552c25	feat: improve auto scroll ux and edit model title	2023-08-02 23:35:51 +08:00
Yidadaa	cbabb9392c	feat: improve ChatAction ux	2023-08-02 22:53:36 +08:00
Yifei Zhang	531b3dcf9e	Merge pull request #2531 from LeviBorodenko/main Add link to authentication page to i18n	2023-08-02 15:35:05 +08:00
Levi Borodenko	d975daf3f0	locale: add link to authentication page in i18n	2023-08-01 16:17:26 +02:00
Yifei Zhang	6137d551fe	Merge pull request #2525 from 7lsu/main typo fix	2023-08-01 15:17:26 +08:00
7lsu	cf625e3542	typo fix	2023-08-01 10:16:36 +08:00
Yifei Zhang	e354fca4a4	Merge pull request #2524 from Yidadaa/bugfix-0731 fix: #2514 should not clear the message after editing message	2023-07-31 22:23:11 +08:00
Yidadaa	129e7afc16	fix: #2514 should not clear the message after editing message	2023-07-31 22:20:39 +08:00
Yifei Zhang	e83e0f6a33	Merge pull request #2486 from fernandoxu/main fix(typo): ngnix -> nginx	2023-07-26 17:13:46 +08:00
fernandoxu	cf4f928b25	fix(typo): ngnix -> nginx	2023-07-26 10:06:06 +08:00
Yifei Zhang	e4d955e3f9	Merge pull request #2483 from Yidadaa/bugfix-0725 fix: #2393 try to fix chat list lag	2023-07-25 23:01:46 +08:00
Yidadaa	13576087f4	fix: #2393 try to fix chat list lag	2023-07-25 22:59:21 +08:00
Yifei Zhang	e74f6f3183	Merge pull request #2469 from Yidadaa/dependabot/npm_and_yarn/types/react-dom-18.2.7 chore(deps-dev): bump @types/react-dom from 18.0.11 to 18.2.7	2023-07-24 22:06:40 +08:00
dependabot[bot]	8302d1d3c1	chore(deps-dev): bump @types/react-dom from 18.0.11 to 18.2.7 Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.0.11 to 18.2.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: "@types/react-dom" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-24 10:33:12 +00:00
Yifei Zhang	b7320e6834	Update tauri.conf.json	2023-07-21 00:37:38 +08:00
Yifei Zhang	3193fe0235	Merge pull request #2452 from Yidadaa/bugfix-0720 feat: close #2449 edit / insert / delete messages modal	2023-07-21 00:25:33 +08:00
Yidadaa	7c2fa9f8a4	feat: close #2449 edit / insert / delete messages modal	2023-07-21 00:24:26 +08:00
Yidadaa	e5f6133127	feat: close #2447 pre-fill key/code/url	2023-07-20 23:17:58 +08:00
Yidadaa	0198c5b781	feat: close #2445 switch to mit license	2023-07-20 22:51:49 +08:00
Yifei Zhang	f535073ae4	Merge pull request #2431 from Hopelwj/main 设置页面-参数过滤空格	2023-07-19 20:14:13 +08:00
Hopelwj	b9895ecadd	Merge branch 'Yidadaa:main' into main	2023-07-18 19:39:59 +08:00
liuweijie	322eb66fdf	fix: useAccessStore filter spaces	2023-07-18 19:38:16 +08:00