puniko/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow custom reactions

Browse source
This commit is contained in:
FloatingGhost 2022-06-08 12:37:22 +01:00 committed by Absturztaube
parent ca5d0bea60
commit 66604e987c
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

@ -45,7 +45,10 @@ const ReactButton = {
if (this.filterWord !== '') { if (this.filterWord !== '') {
const filterWordLowercase = this.filterWord.toLowerCase() const filterWordLowercase = this.filterWord.toLowerCase()
let orderedEmojiList = [] 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] if (emoji.replacement === this.filterWord) return [emoji]
const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase) const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
@ -58,7 +61,10 @@ const ReactButton = {
} }
return orderedEmojiList.flat() return orderedEmojiList.flat()
} }
return this.$store.state.instance.emoji || [] return [
...this.$store.state.instance.emoji,
...this.$store.state.instance.customEmoji
] || []
}, },
mergedConfig () { mergedConfig () {
return this.$store.getters.mergedConfig return this.$store.getters.mergedConfig

7
src/components/react_button/react_button.vue
View file

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