logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: aec05686d0fa300b8b8348d8d1ba2724d1dd0014
parent b0ae32e309134f0e91026c6712f2e9081f493c22
Author: Henry Jameson <me@hjkos.com>
Date:   Mon,  7 Jun 2021 16:37:12 +0300

lint, fix warnings

Diffstat:

Msrc/components/mention_link/mention_link.vue30++++++++++++++++++++++++++----
Msrc/components/status_content/status_content.js5++---
2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue @@ -1,12 +1,34 @@ <template> <span class="MentionLink"> - <a v-if="!user" v-html="content" href="url" class="original"/> - <span v-if="user" class="new" :style="style" :class="{ '-you': isYou }" > - <button class="button-unstyled short" @click.prevent="onClick"> + <!-- eslint-disable vue/no-v-html --> + <a + v-if="!user" + href="url" + class="original" + v-html="content" + /> + <!-- eslint-enable vue/no-v-html --> + <span + v-if="user" + class="new" + :style="style" + :class="{ '-you': isYou }" + > + <button + class="button-unstyled short" + @click.prevent="onClick" + > + <!-- eslint-disable vue/no-v-html --> <span class="shortName">@<span v-html="userName" /></span> <span v-if="isYou">(You)</span> + <!-- eslint-enable vue/no-v-html --> </button> - <span class="full" v-if="userName !== userNameFull"> + <span + v-if="userName !== userNameFull" + class="full" + > + <!-- eslint-disable vue/no-v-html --> @<span v-html="userNameFull" /> + <!-- eslint-enable vue/no-v-html --> </span> </span> </span> diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js @@ -169,10 +169,9 @@ const StatusContent = { RichContent }, mounted () { - const { attentions } = this.status - attentions.forEach(attn => { + this.status.attentions.forEach(attn => { const { id } = attn - this.$store.state.api.backendInteractor.fetchUserIfMissing(this.$store, id) + this.$store.dispatch('fetchUserIfMissing', id) }) }, methods: {