From b1fc470ba0681d383c0e60eef0581551f874696f Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:46:42 -0400
Subject: [PATCH] Fix blur and adjust user settings

---
 src/shared/components/common/pictrs-image.tsx |  7 +-
 src/shared/components/person/settings.tsx     | 64 +++++++++++--------
 src/shared/utils/helpers/index.ts             |  2 +
 src/shared/utils/helpers/should-blur-nsfw.ts  | 12 ++++
 4 files changed, 52 insertions(+), 33 deletions(-)
 create mode 100644 src/shared/utils/helpers/should-blur-nsfw.ts

diff --git a/src/shared/components/common/pictrs-image.tsx b/src/shared/components/common/pictrs-image.tsx
index 06495636..e58facd5 100644
--- a/src/shared/components/common/pictrs-image.tsx
+++ b/src/shared/components/common/pictrs-image.tsx
@@ -1,9 +1,9 @@
 import classNames from "classnames";
 import { Component } from "inferno";
 
-import { UserService } from "../../services";
 import { setIsoData } from "@utils/app";
 import { IsoDataOptionalSite } from "shared/interfaces";
+import { shouldBlurNsfw } from "@utils/helpers";
 
 const iconThumbnailSize = 96;
 const thumbnailSize = 256;
@@ -31,10 +31,7 @@ export class PictrsImage extends Component<PictrsImageProps, any> {
     const { src, icon, iconOverlay, banner, thumbnail, nsfw, pushup, cardTop } =
       this.props;
 
-    const blurImage =
-      nsfw &&
-      (!this.isoData.site_res?.site_view.site.content_warning ||
-        UserService.Instance.myUserInfo?.local_user_view.local_user.blur_nsfw);
+    const blurImage = nsfw && shouldBlurNsfw(this.isoData.site_res);
 
     return (
       <picture>
diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx
index bd1905e3..cdb79b20 100644
--- a/src/shared/components/person/settings.tsx
+++ b/src/shared/components/person/settings.tsx
@@ -898,34 +898,42 @@ export class Settings extends Component<SettingsRouteProps, SettingsState> {
               />
             </div>
           </form>
-          <div className="input-group mb-3">
-            <div className="form-check">
-              <input
-                className="form-check-input"
-                id="user-show-nsfw"
-                type="checkbox"
-                checked={this.state.saveUserSettingsForm.show_nsfw}
-                onChange={linkEvent(this, this.handleShowNsfwChange)}
-              />
-              <label className="form-check-label" htmlFor="user-show-nsfw">
-                {I18NextService.i18n.t("show_nsfw")}
-              </label>
-            </div>
-          </div>
-          <div className="input-group mb-3">
-            <div className="form-check">
-              <input
-                className="form-check-input"
-                id="user-blur-nsfw"
-                type="checkbox"
-                checked={this.state.saveUserSettingsForm.blur_nsfw}
-                onChange={linkEvent(this, this.handleBlurNsfwChange)}
-              />
-              <label className="form-check-label" htmlFor="user-blur-nsfw">
-                {I18NextService.i18n.t("blur_nsfw")}
-              </label>
-            </div>
-          </div>
+          {this.state.siteRes.site_view.local_site.enable_nsfw && (
+            <>
+              <div className="input-group mb-3">
+                <div className="form-check">
+                  <input
+                    className="form-check-input"
+                    id="user-show-nsfw"
+                    type="checkbox"
+                    checked={this.state.saveUserSettingsForm.show_nsfw}
+                    onChange={linkEvent(this, this.handleShowNsfwChange)}
+                  />
+                  <label className="form-check-label" htmlFor="user-show-nsfw">
+                    {I18NextService.i18n.t("show_nsfw")}
+                  </label>
+                </div>
+              </div>
+              <div className="input-group mb-3">
+                <div className="form-check">
+                  <input
+                    className="form-check-input"
+                    id="user-blur-nsfw"
+                    type="checkbox"
+                    disabled={!this.state.saveUserSettingsForm.show_nsfw}
+                    checked={
+                      this.state.saveUserSettingsForm.blur_nsfw &&
+                      this.state.saveUserSettingsForm.show_nsfw
+                    }
+                    onChange={linkEvent(this, this.handleBlurNsfwChange)}
+                  />
+                  <label className="form-check-label" htmlFor="user-blur-nsfw">
+                    {I18NextService.i18n.t("blur_nsfw")}
+                  </label>
+                </div>
+              </div>
+            </>
+          )}
           <div className="input-group mb-3">
             <div className="form-check">
               <input
diff --git a/src/shared/utils/helpers/index.ts b/src/shared/utils/helpers/index.ts
index 58eec8cc..5fcc1e1c 100644
--- a/src/shared/utils/helpers/index.ts
+++ b/src/shared/utils/helpers/index.ts
@@ -25,6 +25,7 @@ import validTitle from "./valid-title";
 import validURL from "./valid-url";
 import dedupByProperty from "./dedup-by-property";
 import getApubName from "./apub-name";
+import shouldBlurNsfw from "./should-blur-nsfw";
 
 export {
   capitalizeFirstLetter,
@@ -54,4 +55,5 @@ export {
   validURL,
   dedupByProperty,
   getApubName,
+  shouldBlurNsfw,
 };
diff --git a/src/shared/utils/helpers/should-blur-nsfw.ts b/src/shared/utils/helpers/should-blur-nsfw.ts
new file mode 100644
index 00000000..57c036e8
--- /dev/null
+++ b/src/shared/utils/helpers/should-blur-nsfw.ts
@@ -0,0 +1,12 @@
+import { SiteResponse } from "lemmy-js-client";
+import { adultConsentLocalStorageKey } from "../../config";
+import { UserService } from "../../services";
+
+export default function shouldBlurNsfw(siteRes?: SiteResponse) {
+  return siteRes?.site_view.site.content_warning
+    ? !(
+        localStorage.getItem(adultConsentLocalStorageKey) ||
+        UserService.Instance.myUserInfo
+      )
+    : UserService.Instance.myUserInfo?.local_user_view.local_user.blur_nsfw;
+}