diff options
| author | scarlett <nia@netbsd.org> | 2018-08-26 00:21:54 +0100 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-08-26 00:21:54 +0100 |
| commit | 52ce86ed573deede5e762f4096ef02ee87b04e88 (patch) | |
| tree | db16c8ae033572a255666f7305849babf8f03178 /src | |
| parent | d50440d8024a36a8b0d6ab6f44ff8e0aeaedf9c8 (diff) | |
Don't use nsfw clickthrough if the post is collapsed by default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/status/status.js | 9 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 11b8feba..7aa1e03b 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -164,6 +164,15 @@ const Status = { showingMore () { 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 () { if ((this.$store.state.config.hideAttachments && !this.inConversation) || (this.$store.state.config.hideAttachmentsInConv && this.inConversation)) { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index e8951220..c7ef92a2 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -84,7 +84,7 @@ </div> <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> </div> |