aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-03-15 13:14:41 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-03-15 13:14:41 +0000
commit9364964b017154f61072ffa70b08f2ed0c7dcaeb (patch)
treebcc17450b6d66df1c12acf25eea05fb5d4ed34ab /src/components/status/status.js
parent92eb55c7bc3cf210b86259b99c3e2b8f192bf325 (diff)
parent71c12fa3a58ff2b498ed5ba9d3fc3d58d016bd97 (diff)
Merge branch 'mastoapi/user-stuff' into 'develop'
Transition to MastoAPI: user data See merge request pleroma/pleroma-fe!655
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 9e18fe15..c90da6d4 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 () {