7x31/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git synced 2025-08-08 06:46:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into gpt-4o

Browse Source 
# Conflicts:
#	public/apple-touch-icon.png
This commit is contained in:
Hao Jia
2024-05-16 14:43:10 +08:00
parent 5bf402710f bffd9d9173
commit 01c9dbc1fd
46 changed files with 2181 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/masks/index.ts
View File

@@ -1,5 +1,6 @@
import { Mask } from "../store/mask";
import { CN_MASKS } from "./cn";
import { TW_MASKS } from "./tw";
import { EN_MASKS } from "./en";
import { type BuiltinMask } from "./typing";
@@ -21,6 +22,8 @@ export const BUILTIN_MASK_STORE = {
},
};
export const BUILTIN_MASKS: BuiltinMask[] = [...CN_MASKS, ...EN_MASKS].map(
(m) => BUILTIN_MASK_STORE.add(m),
);
export const BUILTIN_MASKS: BuiltinMask[] = [
...CN_MASKS,
...TW_MASKS,
...EN_MASKS,
].map((m) => BUILTIN_MASK_STORE.add(m));