HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream

Browse source
This commit is contained in:
freeplay 2023-06-30 03:52:52 -04:00
commit 72a54a48f7
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/client/src/components/MkEmojiPickerDialog.vue
View file

@ -65,7 +65,7 @@ function chosen(emoji: any) {
} }
function opening() { function opening() {
picker.value?.reset(); // picker.value?.reset();
picker.value?.focus(); picker.value?.focus();
} }
</script> </script>

15
packages/client/src/scripts/emojilist.ts
View file

@ -1,5 +1,6 @@
import data from "unicode-emoji-json/data-by-group.json"; import data from "unicode-emoji-json/data-by-group.json";
import emojiComponents from "unicode-emoji-json/data-emoji-components.json"; import emojiComponents from "unicode-emoji-json/data-emoji-components.json";
import individualData from "unicode-emoji-json/data-by-emoji.json";
import keywordSet from "emojilib"; import keywordSet from "emojilib";
import { defaultStore } from "@/store"; import { defaultStore } from "@/store";
@ -36,8 +37,6 @@ export const categoryMapping = {
} as const; } as const;
export function addSkinTone(emoji: string, skinTone?: number) { export function addSkinTone(emoji: string, skinTone?: number) {
const individualData = import("unicode-emoji-json/data-by-emoji.json");
const chosenSkinTone = skinTone || defaultStore.state.reactionPickerSkinTone; const chosenSkinTone = skinTone || defaultStore.state.reactionPickerSkinTone;
const skinToneModifiers = [ const skinToneModifiers = [
"", "",
@ -47,15 +46,15 @@ export function addSkinTone(emoji: string, skinTone?: number) {
emojiComponents.medium_dark_skin_tone, emojiComponents.medium_dark_skin_tone,
emojiComponents.dark_skin_tone, emojiComponents.dark_skin_tone,
]; ];
if (individualData[emoji]?.skin_tone_support === false) { const strippedEmoji = emoji.replace(
return emoji;
}
return (
emoji.replace(
new RegExp(`(${skinToneModifiers.slice(1).join("|")})`, "gi"), new RegExp(`(${skinToneModifiers.slice(1).join("|")})`, "gi"),
"", "",
) + (skinToneModifiers[chosenSkinTone - 1] || "")
); );
if (individualData[strippedEmoji].skin_tone_support) {
return strippedEmoji + (skinToneModifiers[chosenSkinTone - 1] || "");
} else {
return emoji;
}
} }
const unicodeFifteenEmojis = [ const unicodeFifteenEmojis = [