aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.js
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-03-25 10:22:16 -0400
committerdave <starpumadev@gmail.com>2019-03-25 10:22:16 -0400
commit4cec0d589dfc54987ec6f024b0a463d0abd847d2 (patch)
treea88953cc409d162127edb43a702d6540c64c023e /src/components/status/status.js
parent63d7c7bd80cf8028cdefee99c1cb75614385f96b (diff)
parent01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
Diffstat (limited to 'src/components/status/status.js')
-rw-r--r--src/components/status/status.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 8e489704..550fe76f 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -145,11 +145,11 @@ const Status = {
return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
},
replyToName () {
- const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
- if (user) {
- return user.screen_name
- } else {
+ if (this.status.in_reply_to_screen_name) {
return this.status.in_reply_to_screen_name
+ } else {
+ const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
+ return user && user.screen_name
}
},
hideReply () {