added config for preload and made attachment responsive to it

4 files changed, 11 insertions, 3 deletions

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 41730720..71ef2ca4 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -13,6 +13,7 @@ const Attachment = {
     return {
       nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
+      preloadNsfwImage: this.$store.state.config.preloadNsfwImage,
       loopVideo: this.$store.state.config.loopVideo,
       showHidden: false,
       loading: false,
@@ -27,7 +28,7 @@ const Attachment = {
       return fileTypeService.fileType(this.attachment.mimetype)
     },
     hidden () {
-      return this.nsfw && this.hideNsfwLocal && !this.showHidden
+      return (this.nsfw && this.hideNsfwLocal && !this.showHidden)
     },
     isEmpty () {
       return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown'
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 6c8a04ed..1b1956e0 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -9,8 +9,7 @@
     <div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
       <a href="#" @click.prevent="toggleHidden()">Hide</a>
     </div>
-
-    <a v-if="type === 'image'" class="image-attachment" :class="{'hidden': hidden}" :href="attachment.url" target="_blank" :title="attachment.description">
+    <a v-if="type === 'image' && (!hidden || preloadNsfwImage)" class="image-attachment" :class="{'hidden': hidden && preloadNsfwImage}" :href="attachment.url" target="_blank" :title="attachment.description">
       <StillImage :class="{'small': isSmall}" referrerpolicy="no-referrer" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
     </a>
 
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 19bd2e5b..4d8744da 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -14,6 +14,7 @@ const settings = {
       hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
       hideNsfwLocal: user.hideNsfw,
       hideISPLocal: user.hideISP,
+      preloadNsfwImage: user.preloadNsfwImage,
       hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
         ? instance.hidePostStats
         : user.hidePostStats,
@@ -84,6 +85,9 @@ const settings = {
     hideNsfwLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideNsfw', value })
     },
+    preloadNsfwImage(value) {
+      this.$store.dispatch('setOption', { name: 'preloadNsfwImage', value })
+    },
     hideISPLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideISP', value })
     },
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index dec33505..60b70227 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -119,6 +119,10 @@
               <label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label>
             </li>
             <li>
+              <input type="checkbox" id="preloadNsfwImage" v-model="preloadNsfwImage">
+              <label for="preloadNsfwImage">{{$t('settings.preload_sensitive')}}</label>
+            </li>
+            <li>
               <input type="checkbox" id="stopGifs" v-model="stopGifs">
               <label for="stopGifs">{{$t('settings.stop_gifs')}}</label>
             </li>