chore(git): merge pull request #103 from 96-nsfw-list-tag into staging

Reviewed-on: #103

src/hooks/useFilteredMods.ts

@@ -22,6 +22,15 @@ export const useFilteredMods = (
 ) => {
   return useMemo(() => {
     const nsfwFilter = (mods: ModDetails[]) => {
+      // Add nsfw tag to mods included in nsfwList
+      if (filterOptions.nsfw !== NSFWFilter.Hide_NSFW) {
+        mods = mods.map((mod) => {
+          return !mod.nsfw && nsfwList.includes(mod.aTag)
+            ? { ...mod, nsfw: true }
+            : mod
+        })
+      }
+
       // Determine the filtering logic based on the NSFW filter option
       switch (filterOptions.nsfw) {
         case NSFWFilter.Hide_NSFW:

src/pages/mod/index.tsx

@@ -15,7 +15,8 @@ import {
   useAppSelector,
   useBodyScrollDisable,
   useDidMount,
-  useNDKContext
+  useNDKContext,
+  useNSFWList
 } from '../../hooks'
 import { getGamePageRoute, getModsEditPageRoute } from '../../routes'
 import '../../styles/comments.css'
@@ -51,10 +52,18 @@ import placeholder from '../../assets/img/DEGMods Placeholder Img.png'
 export const ModPage = () => {
   const { naddr } = useParams()
   const { fetchEvent } = useNDKContext()
-  const [modData, setModData] = useState<ModDetails>()
+  const [mod, setMod] = useState<ModDetails>()
   const [isFetching, setIsFetching] = useState(true)
   const [commentCount, setCommentCount] = useState(0)
 
+  // Make sure to mark non-nsfw mods as NSFW if found in nsfwList
+  const nsfwList = useNSFWList()
+  const isMissingNsfwTag =
+    !mod?.nsfw && mod?.aTag && nsfwList && nsfwList.includes(mod.aTag)
+  const modData = isMissingNsfwTag
+    ? ({ ...mod, nsfw: true } as ModDetails)
+    : mod
+
   useDidMount(async () => {
     if (naddr) {
       const decoded = nip19.decode<'naddr'>(naddr as `naddr1${string}`)
@@ -70,7 +79,7 @@ export const ModPage = () => {
         .then((event) => {
           if (event) {
             const extracted = extractModData(event)
-            setModData(extracted)
+            setMod(extracted)
           }
         })
         .catch((err) => {