aboutsummaryrefslogtreecommitdiff
path: root/src/components/status
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/status')
-rw-r--r--src/components/status/status.js14
-rw-r--r--src/components/status/status.vue2
2 files changed, 2 insertions, 14 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 73d53694..7d6acbac 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -117,19 +117,7 @@ const Status = {
return lengthScore > 20
},
isReply () {
- if (this.status.in_reply_to_status_id) {
- return true
- }
- // For private replies where we can't see the OP, in_reply_to_status_id will be null.
- // So instead, check that the post starts with a @mention.
- if (this.status.visibility === 'private') {
- var textBody = this.status.text
- if (this.status.summary !== null) {
- textBody = textBody.substring(this.status.summary.length, textBody.length)
- }
- return textBody.startsWith('@')
- }
- return false
+ return !!this.status.in_reply_to_status_id
},
hideReply () {
if (this.$store.state.config.replyVisibility === 'all') {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index af756801..4a1aef8f 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -88,7 +88,7 @@
<div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper">
<a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a>
<div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div>
- <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary" v-else></div>
+ <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div>
<a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a>
<a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
</div>