From fe624f6114220320e1528981af83fb7ab39c0e67 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 9 Mar 2019 01:34:15 +0200
Subject: [PATCH] fix reply-to marker, also whoops console log
---
src/components/status/status.js | 8 ++++----
src/modules/statuses.js | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9e18fe15..43572fe8 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 {
+ const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
+ if (this.status.in_reply_to_screen_name) {
return this.status.in_reply_to_screen_name
+ } else {
+ return user.screen_name
}
},
hideReply () {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4ee75d48..2b0215f0 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -135,7 +135,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
// This makes sure that user timeline won't get data meant for other
// user. I.e. opening different user profiles makes request which could
// return data late after user already viewing different user profile
- console.log('TIMEINLINE', timelineObject.userId)
if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
return
}