sam/pleroma-fe
sam
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow custom reactions

This commit is contained in:
FloatingGhost 2022-06-08 12:37:22 +01:00 committed by Zero
parent 710891d1f3
commit 3cc6a0b252
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/react_button/react_button.js
View File

@ -64,7 +64,10 @@ const ReactButton = {
if (this.filterWord !== '') {
const filterWordLowercase = this.filterWord.toLowerCase()
let orderedEmojiList = []
for (const emoji of this.$store.state.instance.emoji) {
for (const emoji of [
...this.$store.state.instance.emoji,
...this.$store.state.instance.customEmoji
]) {
if (emoji.replacement === this.filterWord) return [emoji]
const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
@ -77,7 +80,10 @@ const ReactButton = {
}
return orderedEmojiList.flat()
}
return this.$store.state.instance.emoji || []
return [
...this.$store.state.instance.emoji,
...this.$store.state.instance.customEmoji
] || []
},
mergedConfig () {
return this.$store.getters.mergedConfig

9
src/components/react_button/react_button.vue
View File

@ -39,7 +39,14 @@
:title="emoji.displayText"
@click="addReaction($event, emoji.replacement, close, keepReactOpen)"
>
{{ emoji.replacement }}
<img
v-if="emoji.imageUrl !== false"
:src="emoji.imageUrl"
width="30px"
>
<span v-else>
{{ emoji.replacement }}
</span>
</span>
<div class="reaction-bottom-fader" />
</div>