Don't use nsfw clickthrough if the post is collapsed by default.
This commit is contained in:
parent
d50440d802
commit
52ce86ed57
2 changed files with 10 additions and 1 deletions
|
@ -164,6 +164,15 @@ const Status = {
|
||||||
showingMore () {
|
showingMore () {
|
||||||
return this.showingTall || (this.status.summary && this.expandingSubject)
|
return this.showingTall || (this.status.summary && this.expandingSubject)
|
||||||
},
|
},
|
||||||
|
nsfwClickthrough () {
|
||||||
|
if (!this.status.nsfw) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
},
|
||||||
attachmentSize () {
|
attachmentSize () {
|
||||||
if ((this.$store.state.config.hideAttachments && !this.inConversation) ||
|
if ((this.$store.state.config.hideAttachments && !this.inConversation) ||
|
||||||
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)) {
|
(this.$store.state.config.hideAttachmentsInConv && this.inConversation)) {
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if='status.attachments && !hideSubjectStatus' class='attachments media-body'>
|
<div v-if='status.attachments && !hideSubjectStatus' class='attachments media-body'>
|
||||||
<attachment :size="attachmentSize" :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id">
|
<attachment :size="attachmentSize" :status-id="status.id" :nsfw="nsfwClickthrough" :attachment="attachment" v-for="attachment in status.attachments" :key="attachment.id">
|
||||||
</attachment>
|
</attachment>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue