From 0554cac113555b948cdad3d9f14ec6f548c93c01 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivlim@pm.me>
Date: Wed, 27 Jun 2018 22:43:22 -0700
Subject: Add click-to-show content warnings on posts

---
 src/components/status/status.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 87ef90d8..9f88d38c 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -28,7 +28,8 @@ const Status = {
     userExpanded: false,
     preview: null,
     showPreview: false,
-    showingTall: false
+    showingTall: false,
+    showingContentWarningContent: false
   }),
   computed: {
     muteWords () {
@@ -145,6 +146,9 @@ const Status = {
     toggleShowTall () {
       this.showingTall = !this.showingTall
     },
+    toggleContentWarningContent () {
+      this.showingContentWarningContent = !this.showingContentWarningContent
+    },
     replyEnter (id, event) {
       this.showPreview = true
       const targetId = Number(id)
-- 
cgit v1.2.3-70-g09d2


From b0cf050797702d6a7cc921c71b27cecb5ce234c6 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivlim@pm.me>
Date: Thu, 28 Jun 2018 21:39:25 -0700
Subject: Add configuration option to enable click-through content warnings

---
 src/components/status/status.js  |  7 +++++--
 src/components/status/status.vue | 10 ++++++----
 src/main.js                      |  4 +++-
 static/config.json               |  3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9f88d38c..4e242701 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -29,7 +29,7 @@ const Status = {
     preview: null,
     showPreview: false,
     showingTall: false,
-    showingContentWarningContent: false
+    showingContentWarningContent: false 
   }),
   computed: {
     muteWords () {
@@ -93,7 +93,10 @@ const Status = {
         return 'small'
       }
       return 'normal'
-    }
+    },
+    clickThroughContentWarningsEnabled () {
+      return this.$store.state.config.clickThroughContentWarningsEnabled
+    },
   },
   components: {
     Attachment,
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 77a7904e..2e33999a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -76,17 +76,19 @@
             <div v-if="status.summary" @click.prevent="linkClicked" class="status-content media-body">
               <div class="contentWarningLabel">
                 <span v-html="status.summary"></span>
-                <button v-if="showingContentWarningContent" @click.prevent="toggleContentWarningContent">Hide</button>
-                <button v-else @click.prevent="toggleContentWarningContent">Show</button>
+                <span v-if="clickThroughContentWarningsEnabled">
+                  <button v-if="showingContentWarningContent" @click.prevent="toggleContentWarningContent">Hide</button>
+                  <button v-else @click.prevent="toggleContentWarningContent">Show</button>
+                </span>
               </div>
-              <div v-if="showingContentWarningContent" v-html="status.content" class="contentWarnedContent"></div>
+              <div v-if="showingContentWarningContent || !clickThroughContentWarningsEnabled" v-html="status.content" class="contentWarnedContent"></div>
               <div v-else class="hiddenContent" @click.prevent="toggleContentWarningContent">Click to view this post.<span v-if="status.attachments && status.attachments.length > 0"> (has attachments)</span></div>
             </div>
             <div v-else @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div>
             <a v-if="showingTall" href="#" class="tall-status-unhider" @click.prevent="toggleShowTall">Show less</a>
           </div>
 
-          <div v-if='status.attachments && (!status.summary || showingContentWarningContent)' class='attachments media-body'>
+          <div v-if='status.attachments && (!status.summary || showingContentWarningContent || !clickThroughContentWarningsEnabled)' 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>
           </div>
diff --git a/src/main.js b/src/main.js
index bacd7f6d..01ee7f75 100644
--- a/src/main.js
+++ b/src/main.js
@@ -89,7 +89,7 @@ window.fetch('/api/statusnet/config.json')
 window.fetch('/static/config.json')
   .then((res) => res.json())
   .then((data) => {
-    const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled} = data
+    const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, clickThroughContentWarningsEnabled} = data
     store.dispatch('setOption', { name: 'theme', value: theme })
     store.dispatch('setOption', { name: 'background', value: background })
     store.dispatch('setOption', { name: 'logo', value: logo })
@@ -98,6 +98,8 @@ window.fetch('/static/config.json')
     store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink })
     store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
     store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
+    store.dispatch('setOption', { name: 'clickThroughContentWarningsEnabled', value: clickThroughContentWarningsEnabled })
+
     if (data['chatDisabled']) {
       store.dispatch('disableChat')
     }
diff --git a/static/config.json b/static/config.json
index 4dacfebe..4fdddf29 100644
--- a/static/config.json
+++ b/static/config.json
@@ -11,5 +11,6 @@
   "whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}",
   "whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html",
   "showInstanceSpecificPanel": false,
-  "scopeOptionsEnabled": false
+  "scopeOptionsEnabled": true,
+  "clickThroughContentWarningsEnabled": true
 }
-- 
cgit v1.2.3-70-g09d2


From 158342fc394b7fded6e25b8cb40516ccaff6ac26 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Fri, 29 Jun 2018 00:10:17 -0700
Subject: Fix lint warnings

---
 src/components/status/status.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 4e242701..40786d94 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -29,7 +29,7 @@ const Status = {
     preview: null,
     showPreview: false,
     showingTall: false,
-    showingContentWarningContent: false 
+    showingContentWarningContent: false
   }),
   computed: {
     muteWords () {
@@ -96,7 +96,7 @@ const Status = {
     },
     clickThroughContentWarningsEnabled () {
       return this.$store.state.config.clickThroughContentWarningsEnabled
-    },
+    }
   },
   components: {
     Attachment,
-- 
cgit v1.2.3-70-g09d2