Skip to content

fix: issue of get icons #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qinluhe merged 1 commit into from
Mar 5, 2025
Merged

fix: issue of get icons #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions src/utils/emoji.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,27 @@ import { renderColor } from '@/utils/color';
import { EmojiMartData } from '@emoji-mart/data';
import axios from 'axios';

export async function randomEmoji (skin = 0) {
const http = axios.create();

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const pendingRequests: Map<string, Promise<any>> = new Map();

async function httpGet(url: string) {
if(pendingRequests.has(url)) {
return pendingRequests.get(url);
}

const request = http.get(url).then((res) => {
pendingRequests.delete(url);
return res;
});

pendingRequests.set(url, request);

return request;
}

export async function randomEmoji(skin = 0) {
const emojiData = await loadEmojiData();
const emojis = (emojiData as EmojiMartData).emojis;
const keys = Object.keys(emojis);
Expand All @@ -11,11 +31,11 @@ export async function randomEmoji (skin = 0) {
return emojis[randomKey].skins[skin].native;
}

export async function loadEmojiData () {
export async function loadEmojiData() {
return import('@emoji-mart/data/sets/15/native.json');
}

export function isFlagEmoji (emoji: string) {
export function isFlagEmoji(emoji: string) {
return /\uD83C[\uDDE6-\uDDFF]/.test(emoji);
}

Expand Down Expand Up @@ -46,7 +66,7 @@ let icons: Record<ICON_CATEGORY,
keywords: string[];
}[]> | undefined;

export async function loadIcons (): Promise<
export async function loadIcons(): Promise<
Record<
ICON_CATEGORY,
{
Expand All @@ -57,34 +77,35 @@ export async function loadIcons (): Promise<
}[]
>
> {
if (icons) {
if(icons) {
return icons;
}

return axios.get('/af_icons/icons.json').then((res) => {
return httpGet('/af_icons/icons.json').then((res) => {
icons = res.data;
return res.data;
});
}

export async function getIconBase64 (id: string, color: string) {
export async function getIconBase64(id: string, color: string) {
try {
const response = await fetch(`/af_icons/${id}.svg`);
let svgText = await response.text();
const response = await httpGet(`/af_icons/${id}.svg`);

let svgText = response.data as string;

svgText = svgText.replace(/fill="[^"]*"/g, ``);
svgText = svgText.replace('<svg', `<svg fill="${renderColor(color)}"`);

const base64String = btoa(svgText);

return `data:image/svg+xml;base64,${base64String}`;
} catch (error) {
} catch(error) {
console.error('Error setting favicon:', error);
return '';
}
}

export async function randomIcon () {
export async function randomIcon() {
const icons = await loadIcons();
const categories = Object.keys(icons);
const randomCategory = categories[Math.floor(Math.random() * categories.length)] as ICON_CATEGORY;
Expand All @@ -93,12 +114,12 @@ export async function randomIcon () {
return randomIcon;
}

export async function getIcon (id: string) {
export async function getIcon(id: string) {
const icons = await loadIcons();

for (const category of Object.keys(icons)) {
for (const icon of icons[category as ICON_CATEGORY]) {
if (icon.id === id) {
for(const category of Object.keys(icons)) {
for(const icon of icons[category as ICON_CATEGORY]) {
if(icon.id === id) {
return icon;
}
}
Expand Down
Loading