n/nyxmuks
1
0
Fork 0
forked from Mirrors/gomuks
Code Pull requests Activity

web/emoji: allow custom emojis in frequently used

Browse source
This commit is contained in:
Tulir Asokan 2024-10-27 13:05:41 +02:00
parent 808bdbc068
commit 21e2dcbc43
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/src/api/client.ts
View file

@ -127,9 +127,6 @@ export default class Client {
} }
async incrementFrequentlyUsedEmoji(targetEmoji: string) { async incrementFrequentlyUsedEmoji(targetEmoji: string) {
if (targetEmoji.startsWith("mxc://")) {
return
}
let recentEmoji = this.store.accountData.get("io.element.recent_emoji")?.recent_emoji as let recentEmoji = this.store.accountData.get("io.element.recent_emoji")?.recent_emoji as
[string, number][] | undefined [string, number][] | undefined
if (!Array.isArray(recentEmoji)) { if (!Array.isArray(recentEmoji)) {

14
web/src/util/emoji/index.ts
View file

@ -199,7 +199,17 @@ export function useFilteredEmojis(query: string, params: useEmojisParams = {}):
} }
return Array.from(params.frequentlyUsed.keys() return Array.from(params.frequentlyUsed.keys()
.map(key => { .map(key => {
const emoji = emojiMap.get(key) let emoji: Emoji | undefined
if (key.startsWith("mxc://")) {
for (const pack of params.customEmojiPacks?.values() ?? []) {
emoji = pack.emojiMap.get(key)
if (emoji) {
break
}
}
} else {
emoji = emojiMap.get(key)
}
if (!emoji) { if (!emoji) {
return undefined return undefined
} }
@ -207,7 +217,7 @@ export function useFilteredEmojis(query: string, params: useEmojisParams = {}):
}) })
.filter(emoji => emoji !== undefined)) .filter(emoji => emoji !== undefined))
.filter((_emoji, index) => index < 24) .filter((_emoji, index) => index < 24)
}, [params.frequentlyUsed]) }, [params.frequentlyUsed, params.customEmojiPacks])
const prev = useRef<filteredEmojiCache>({ const prev = useRef<filteredEmojiCache>({
query: "", query: "",
result: [], result: [],