From 61c9ecd855eaa557610246c48abe276058d11ee6 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 22 Jan 2019 23:57:51 +0300 Subject: [PATCH 1/2] fix reply-to tooltip being somewhat unreliable --- src/components/status/status.js | 20 ++++++++++++++++++- src/components/status/status.vue | 12 +++++------ .../entity_normalizer.service.js | 8 ++++++++ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 105a736b..44a6d5c5 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -73,6 +73,16 @@ const Status = { return (this.$store.state.config.hideAttachments && !this.inConversation) || (this.$store.state.config.hideAttachmentsInConv && this.inConversation) }, + userProfileLink () { + return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name) + }, + replyProfileLink () { + if (this.isReply) { + return this.generateUserProfileLink(this.status.in_reply_to_status_id, this.replyToName) + } else { + return '' + } + }, retweet () { return !!this.statusoid.retweeted_status }, retweeter () { return this.statusoid.user.name }, retweeterHtml () { return this.statusoid.user.name_html }, @@ -119,6 +129,14 @@ const Status = { isReply () { return !!this.status.in_reply_to_status_id }, + replyToName () { + const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id] + if (user) { + return user.screen_name + } else { + return this.status.in_reply_to_screen_name || '' + } + }, hideReply () { if (this.$store.state.config.replyVisibility === 'all') { return false @@ -277,7 +295,7 @@ const Status = { replyLeave () { this.showPreview = false }, - userProfileLink (id, name) { + generateUserProfileLink (id, name) { return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames) } }, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 4a1aef8f..5c956467 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -3,7 +3,7 @@