Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Use unicode-emoji-json instead of emojilib

This commit is contained in:
AkiraFukushima 2021-02-04 11:55:59 +09:00
parent 0938bc4004
commit 053e580552
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -178,7 +178,6 @@
"electron-window-state": "^5.0.3",
"element-ui": "2.15.0",
"emoji-mart-vue": "^2.6.6",
"emojilib": "^2.4.0",
"i18next": "^19.8.7",
"lodash": "^4.17.20",
"megalodon": "3.3.3",
@ -193,6 +192,7 @@
"simplayer": "0.0.8",
"system-font-families": "^0.4.1",
"tunnel-agent": "^0.6.0",
"unicode-emoji-json": "^0.2.1",
"vue": "^2.6.11",
"vue-awesome": "^4.1.0",
"vue-click-outside": "^1.1.0",

10
src/renderer/store/TimelineSpace/Modals/NewToot/Status.ts
View File

@ -1,4 +1,4 @@
import emojilib from 'emojilib'
import emojidata from 'unicode-emoji-json/data-by-emoji.json'
import generator, { MegalodonInterface } from 'megalodon'
import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'
import { RootState } from '@/store/index'
@ -234,11 +234,11 @@ const actions: ActionTree<StatusState, RootState> = {
suggestEmoji: ({ commit, rootState }, wordStart: WordStart) => {
const { word, start } = wordStart
// Find native emojis
const filteredEmojiName: Array<string> = emojilib.ordered.filter((emoji: string) => `:${emoji}:`.includes(word))
const filteredNativeEmoji: Array<SuggestEmoji> = filteredEmojiName.map((name: string) => {
const filteredEmojiName: Array<string> = Object.keys(emojidata).filter((emoji: string) => `:${emojidata[emoji].name}:`.includes(word))
const filteredNativeEmoji: Array<SuggestEmoji> = filteredEmojiName.map((emoji: string) => {
return {
name: `:${name}:`,
code: emojilib.lib[name].char
name: `:${emojidata[emoji].name}:`,
code: emoji
}
})
// Find custom emojis

10
yarn.lock
View File

@ -4775,11 +4775,6 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
emojilib@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/emojilib/-/emojilib-2.4.0.tgz#ac518a8bb0d5f76dda57289ccb2fdf9d39ae721e"
integrity sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==
emojis-list@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@ -12774,6 +12769,11 @@ unicode-canonical-property-names-ecmascript@^1.0.4:
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
unicode-emoji-json@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/unicode-emoji-json/-/unicode-emoji-json-0.2.1.tgz#ebe57f39ecbc8cc3508063e5c03a20e1096fa234"
integrity sha512-4X736t5oVw33kPIPo9F0UUQqUY2gEtAwVFFnE7LXfExhPeWO64FahKw6yFb6gps7Ex7cat5LJPemVEzdk8pWug==
unicode-match-property-ecmascript@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"