Merge pull request ChatGPTNextWeb#497 from waltcow/main

fix 头像无法正常显示
tdkr · Apr 5, 2023 · 2ae62d9 · 2ae62d9
2 parents ee4564d + f4fc682
commit 2ae62d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/components/chat.tsx b/app/components/chat.tsx
@@ -17,6 +17,7 @@ import { Message, SubmitKey, useChatStore, BOT_HELLO, ROLES } from "../store";
 import {
   copyToClipboard,
   downloadAs,
+  getEmojiUrl,
   isMobileScreen,
   selectOrCopy,
 } from "../utils";
@@ -50,7 +51,7 @@ export function Avatar(props: { role: Message["role"] }) {
 
   return (
     <div className={styles["user-avtar"]}>
-      <Emoji unified={config.avatar} size={18} />
+      <Emoji unified={config.avatar} size={18} getEmojiUrl={getEmojiUrl} />
     </div>
   );
 }

diff --git a/app/components/settings.tsx b/app/components/settings.tsx
@@ -26,7 +26,7 @@ import {
 import { Avatar } from "./chat";
 
 import Locale, { AllLangs, changeLang, getLang } from "../locales";
-import { getCurrentVersion } from "../utils";
+import { getCurrentVersion, getEmojiUrl } from "../utils";
 import Link from "next/link";
 import { UPDATE_URL } from "../constant";
 import { SearchService, usePromptStore } from "../store/prompt";
@@ -181,6 +181,7 @@ export function Settings(props: { closeSettings: () => void }) {
                 <EmojiPicker
                   lazyLoadEmojis
                   theme={EmojiTheme.AUTO}
+                  getEmojiUrl={getEmojiUrl}
                   onEmojiClick={(e) => {
                     updateConfig((config) => (config.avatar = e.unified));
                     setShowEmojiPicker(false);

diff --git a/app/utils.ts b/app/utils.ts
@@ -1,3 +1,4 @@
+import { EmojiStyle } from "emoji-picker-react";
 import { showToast } from "./components/ui-lib";
 import Locale from "./locales";
 
@@ -81,3 +82,7 @@ export function getCurrentVersion() {
 
   return currentId;
 }
+
+export function getEmojiUrl(unified: string, style: EmojiStyle) {
+  return `https://cdn.staticfile.org/emoji-datasource-apple/14.0.0/img/${style}/64/${unified}.png`;
+}