Merge pull request #497 from waltcow/main

fix 头像无法正常显示
This commit is contained in:
Yifei Zhang 2023-04-05 22:07:17 +08:00 committed by GitHub
commit 2ae62d9c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View File

@ -17,6 +17,7 @@ import { Message, SubmitKey, useChatStore, BOT_HELLO, ROLES } from "../store";
import { import {
copyToClipboard, copyToClipboard,
downloadAs, downloadAs,
getEmojiUrl,
isMobileScreen, isMobileScreen,
selectOrCopy, selectOrCopy,
} from "../utils"; } from "../utils";
@ -50,7 +51,7 @@ export function Avatar(props: { role: Message["role"] }) {
return ( return (
<div className={styles["user-avtar"]}> <div className={styles["user-avtar"]}>
<Emoji unified={config.avatar} size={18} /> <Emoji unified={config.avatar} size={18} getEmojiUrl={getEmojiUrl} />
</div> </div>
); );
} }

View File

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

View File

@ -1,3 +1,4 @@
import { EmojiStyle } from "emoji-picker-react";
import { showToast } from "./components/ui-lib"; import { showToast } from "./components/ui-lib";
import Locale from "./locales"; import Locale from "./locales";
@ -81,3 +82,7 @@ export function getCurrentVersion() {
return currentId; 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`;
}