diff --git a/make-pages/Info.hs b/make-pages/Info.hs index 7ff0043..2a1cce9 100644 --- a/make-pages/Info.hs +++ b/make-pages/Info.hs @@ -37,6 +37,7 @@ data Info = date :: !Day, title :: !Text, artist :: !(Maybe Artist), -- nothing = me, obv + nsfwOnly :: !Bool, tags :: ![Text], nsfwTags :: ![Text], desc :: !(Maybe Text), @@ -146,6 +147,7 @@ instance FromYAML Info where Info <$> m .: "date" <*> m .: "title" <*> m .:? "artist" + <*> m .:? "nsfw-only" .!= False <*> m .:? "tags" .!= [] <*> m .:? "nsfw-tags" .!= [] <*> m .:? "desc" @@ -227,7 +229,7 @@ readNsfwFilter "all" = pure AllN readNsfwFilter _ = empty matchNsfw :: NsfwFilter -> Info -> Bool -matchNsfw NoNsfw i = #anySfw i +matchNsfw NoNsfw i = #anySfw i && not (#nsfwOnly i) matchNsfw OnlyNsfw i = #anyNsfw i matchNsfw AllN _ = True