hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'better-still-emoji' into shigusegubu

Browse source 
* better-still-emoji:
  fix repeats having wrong mentions
  fix console errors
This commit is contained in:
Henry Jameson 2021-06-08 17:05:39 +03:00
commit d2f9a4a1e6
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/status/status.js
View file

@ -139,7 +139,10 @@ const Status = {
return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
},
replyProfileLink () {
return this.$store.getters.findUser(this.status.in_reply_to_user_id).statusnet_profile_url
if (this.isReply) {
const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
return user && user.statusnet_profile_url
}
},
retweet () { return !!this.statusoid.retweeted_status },
retweeterUser () { return this.statusoid.user },
@ -167,9 +170,9 @@ const Status = {
return this.mergedConfig.mentionsOwnLine
},
mentions () {
return this.statusoid.attentions.filter(attn => {
return this.status.attentions.filter(attn => {
return attn.screen_name !== this.replyToName &&
attn.screen_name !== this.statusoid.user.screen_name
attn.screen_name !== this.statuso.user.screen_name
})
},
hasMentions () {