hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into setttingssync

Browse source
This commit is contained in:
Henry Jameson 2026-03-11 23:33:50 +02:00
commit 53a3c8bcd6
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/fix-emojis-breaking-bio.fix Normal file
View file

@ -0,0 +1 @@
Fix emojis breaking user bio/description editing

4
src/components/post_status_form/post_status_form.js
View file

@ -278,10 +278,10 @@ const PostStatusForm = {
}) })
}, },
emoji() { emoji() {
return useEmojiStore().standardEmojiList || [] return useEmojiStore().standardEmojiList
}, },
customEmoji() { customEmoji() {
return useEmojiStore().customEmoji || [] return useEmojiStore().customEmoji
}, },
statusLength() { statusLength() {
return this.newStatus.status.length return this.newStatus.status.length

26
src/stores/emoji.js
View file

@ -115,19 +115,23 @@ export const useEmojiStore = defineStore('emoji', {
}, {}) }, {})
}, },
standardEmojiList(state) { standardEmojiList(state) {
return SORTED_EMOJI_GROUP_IDS.map((groupId) => return (
(this.emoji[groupId] || []).map((k) => SORTED_EMOJI_GROUP_IDS.map((groupId) =>
injectAnnotations(k, this.unicodeEmojiAnnotations), (this.emoji[groupId] || []).map((k) =>
), injectAnnotations(k, this.unicodeEmojiAnnotations),
).reduce((a, b) => a.concat(b), []) ),
).reduce((a, b) => a.concat(b), []) ?? []
)
}, },
standardEmojiGroupList(state) { standardEmojiGroupList(state) {
return SORTED_EMOJI_GROUP_IDS.map((groupId) => ({ return (
id: groupId, SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
emojis: (this.emoji[groupId] || []).map((k) => id: groupId,
injectAnnotations(k, this.unicodeEmojiAnnotations), emojis: (this.emoji[groupId] || []).map((k) =>
), injectAnnotations(k, this.unicodeEmojiAnnotations),
})) ),
})) ?? []
)
}, },
}, },
actions: { actions: {