diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue index 84ed3205064899434c97f8be932d888e6a585a36..80aadd3fa87f71e74f795c237ead7d728f3d315b 100644 --- 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 index 79408e38fb1469063ffe0cb1f18c947dda2795a8..c21afc24f072dcacb52603a730beb6cadd02e31f 100644 --- 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: {