Merge branch 'better-still-emoji' into shigusegubu

* better-still-emoji:
  fix repeats having wrong mentions
  fix console errors
This commit is contained in:
Henry Jameson 2021-06-08 17:17:12 +03:00
commit 49439af879
3 changed files with 10 additions and 2 deletions

View file

@ -16,6 +16,10 @@ const MentionLink = {
required: false, required: false,
type: String type: String
}, },
userScreenName: {
required: false,
type: String
},
firstMention: { firstMention: {
required: false, required: false,
type: Boolean, type: Boolean,
@ -24,7 +28,10 @@ const MentionLink = {
}, },
methods: { methods: {
onClick () { onClick () {
const link = generateProfileLink(this.userId || this.user.id, this.user.screen_name) const link = generateProfileLink(
this.userId || this.user.id,
this.userScreenName || this.user.screen_name
)
this.$router.push(link) this.$router.push(link)
} }
}, },

View file

@ -172,7 +172,7 @@ const Status = {
mentions () { mentions () {
return this.status.attentions.filter(attn => { return this.status.attentions.filter(attn => {
return attn.screen_name !== this.replyToName && return attn.screen_name !== this.replyToName &&
attn.screen_name !== this.statuso.user.screen_name attn.screen_name !== this.status.user.screen_name
}) })
}, },
hasMentions () { hasMentions () {

View file

@ -263,6 +263,7 @@
:content="replyToName" :content="replyToName"
:url="replyProfileLink" :url="replyProfileLink"
:userId="status.in_reply_to_user_id" :userId="status.in_reply_to_user_id"
:userScreenName="status.in_reply_to_screen_name"
:first-mention="false" :first-mention="false"
/> />
<span <span