refactor: remove NSFW content settings from instance configuration

Author: johnnyjoygh

proto/api/v1/instance_service.proto

@@ -157,10 +157,6 @@ message InstanceSetting {
     bool enable_double_click_edit = 4;
     // reactions is the list of reactions.
     repeated string reactions = 7;
-    // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW).
-    bool enable_blur_nsfw_content = 9;
-    // nsfw_tags is the list of tags that mark content as NSFW for blurring.
-    repeated string nsfw_tags = 10;
   }
 }
 

proto/gen/api/v1/instance_service.pb.go

@@ -2210,14 +2210,6 @@ components:
                     items:
                         type: string
                     description: reactions is the list of reactions.
-                enableBlurNsfwContent:
-                    type: boolean
-                    description: enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW).
-                nsfwTags:
-                    type: array
-                    items:
-                        type: string
-                    description: nsfw_tags is the list of tags that mark content as NSFW for blurring.
             description: Memo-related instance settings and policies.
         InstanceSetting_StorageSetting:
             type: object

proto/gen/openapi.yaml

@@ -102,8 +102,4 @@ message InstanceMemoRelatedSetting {
   bool enable_double_click_edit = 4;
   // reactions is the list of reactions.
   repeated string reactions = 7;
-  // enable_blur_nsfw_content enables blurring of content marked as not safe for work (NSFW).
-  bool enable_blur_nsfw_content = 9;
-  // nsfw_tags is the list of tags that mark content as NSFW for blurring.
-  repeated string nsfw_tags = 10;
 }

proto/gen/store/instance_setting.pb.go

@@ -251,8 +251,6 @@ func convertInstanceMemoRelatedSettingFromStore(setting *storepb.InstanceMemoRel
 		ContentLengthLimit:       setting.ContentLengthLimit,
 		EnableDoubleClickEdit:    setting.EnableDoubleClickEdit,
 		Reactions:                setting.Reactions,
-		EnableBlurNsfwContent:    setting.EnableBlurNsfwContent,
-		NsfwTags:                 setting.NsfwTags,
 	}
 }
 
@@ -266,8 +264,6 @@ func convertInstanceMemoRelatedSettingToStore(setting *v1pb.InstanceSetting_Memo
 		ContentLengthLimit:       setting.ContentLengthLimit,
 		EnableDoubleClickEdit:    setting.EnableDoubleClickEdit,
 		Reactions:                setting.Reactions,
-		EnableBlurNsfwContent:    setting.EnableBlurNsfwContent,
-		NsfwTags:                 setting.NsfwTags,
 	}
 }
 

proto/store/instance_setting.proto

@@ -143,9 +143,6 @@ const DefaultContentLengthLimit = 8 * 1024
 // DefaultReactions is the default reactions for memo related setting.
 var DefaultReactions = []string{"👍", "👎", "❤️", "🎉", "😄", "😕", "😢", "😡"}
 
-// DefaultNsfwTags is the default tags that mark content as NSFW for blurring.
-var DefaultNsfwTags = []string{"nsfw"}
-
 func (s *Store) GetInstanceMemoRelatedSetting(ctx context.Context) (*storepb.InstanceMemoRelatedSetting, error) {
 	instanceSetting, err := s.GetInstanceSetting(ctx, &FindInstanceSetting{
 		Name: storepb.InstanceSettingKey_MEMO_RELATED.String(),
@@ -164,9 +161,6 @@ func (s *Store) GetInstanceMemoRelatedSetting(ctx context.Context) (*storepb.Ins
 	if len(instanceMemoRelatedSetting.Reactions) == 0 {
 		instanceMemoRelatedSetting.Reactions = append(instanceMemoRelatedSetting.Reactions, DefaultReactions...)
 	}
-	if len(instanceMemoRelatedSetting.NsfwTags) == 0 {
-		instanceMemoRelatedSetting.NsfwTags = append(instanceMemoRelatedSetting.NsfwTags, DefaultNsfwTags...)
-	}
 	s.instanceSettingCache.Set(ctx, storepb.InstanceSettingKey_MEMO_RELATED.String(), &storepb.InstanceSetting{
 		Key:   storepb.InstanceSettingKey_MEMO_RELATED,
 		Value: &storepb.InstanceSetting_MemoRelatedSetting{MemoRelatedSetting: instanceMemoRelatedSetting},

server/router/api/v1/instance_service.go

@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { useInstance } from "@/contexts/InstanceContext";
 import type { Memo } from "@/types/proto/api/v1/memo_service_pb";
 
 export interface UseNsfwContentReturn {
@@ -10,14 +9,12 @@ export interface UseNsfwContentReturn {
 
 export const useNsfwContent = (memo: Memo, initialShowNsfw?: boolean): UseNsfwContentReturn => {
   const [showNSFWContent, setShowNSFWContent] = useState(initialShowNsfw ?? false);
-  const { memoRelatedSetting } = useInstance();
 
-  const nsfw =
-    memoRelatedSetting.enableBlurNsfwContent &&
-    memo.tags?.some((tag) => memoRelatedSetting.nsfwTags.some((nsfwTag) => tag === nsfwTag || tag.startsWith(`${nsfwTag}/`)));
+  // Always blur content tagged with NSFW
+  const nsfw = memo.tags?.includes("NSFW") ?? false;
 
   return {
-    nsfw: nsfw ?? false,
+    nsfw,
     showNSFWContent,
     toggleNsfwVisibility: () => setShowNSFWContent((prev) => !prev),
   };

store/instance_setting.go

@@ -25,7 +25,6 @@ const MemoRelatedSettings = () => {
   const { memoRelatedSetting: originalSetting, updateSetting, fetchSetting } = useInstance();
   const [memoRelatedSetting, setMemoRelatedSetting] = useState<InstanceSetting_MemoRelatedSetting>(originalSetting);
   const [editingReaction, setEditingReaction] = useState<string>("");
-  const [editingNsfwTag, setEditingNsfwTag] = useState<string>("");
 
   const updatePartialSetting = (partial: Partial<InstanceSetting_MemoRelatedSetting>) => {
     const newInstanceMemoRelatedSetting = create(InstanceSetting_MemoRelatedSettingSchema, {
@@ -44,15 +43,6 @@ const MemoRelatedSettings = () => {
     setEditingReaction("");
   };
 
-  const upsertNsfwTags = () => {
-    if (!editingNsfwTag) {
-      return;
-    }
-
-    updatePartialSetting({ nsfwTags: uniq([...memoRelatedSetting.nsfwTags, editingNsfwTag.trim()]) });
-    setEditingNsfwTag("");
-  };
-
   const handleUpdateSetting = async () => {
     if (memoRelatedSetting.reactions.length === 0) {
       toast.error("Reactions must not be empty.");
@@ -140,44 +130,6 @@ const MemoRelatedSettings = () => {
         </div>
       </SettingGroup>
 
-      <SettingGroup showSeparator>
-        <SettingRow label={t("setting.memo-related-settings.enable-blur-nsfw-content")}>
-          <Switch
-            checked={memoRelatedSetting.enableBlurNsfwContent}
-            onCheckedChange={(checked) => updatePartialSetting({ enableBlurNsfwContent: checked })}
-          />
-        </SettingRow>
-
-        <div className="w-full flex flex-col gap-2">
-          <span className="text-sm text-muted-foreground">NSFW Tags</span>
-          <div className="w-full flex flex-row flex-wrap gap-2">
-            {memoRelatedSetting.nsfwTags.map((nsfwTag) => (
-              <Badge key={nsfwTag} variant="outline" className="flex items-center gap-1.5 h-8 px-3">
-                {nsfwTag}
-                <span
-                  className="cursor-pointer text-muted-foreground hover:text-destructive"
-                  onClick={() => updatePartialSetting({ nsfwTags: memoRelatedSetting.nsfwTags.filter((r) => r !== nsfwTag) })}
-                >
-                  <X className="w-3.5 h-3.5" />
-                </span>
-              </Badge>
-            ))}
-            <div className="flex items-center gap-1.5">
-              <Input
-                className="w-32 h-8"
-                placeholder={t("common.input")}
-                value={editingNsfwTag}
-                onChange={(event) => setEditingNsfwTag(event.target.value.trim())}
-                onKeyDown={(e) => e.key === "Enter" && upsertNsfwTags()}
-              />
-              <Button variant="ghost" size="sm" onClick={upsertNsfwTags} className="h-8 w-8 p-0">
-                <CheckIcon className="w-4 h-4" />
-              </Button>
-            </div>
-          </div>
-        </div>
-      </SettingGroup>
-
       <div className="w-full flex justify-end">
         <Button disabled={isEqual(memoRelatedSetting, originalSetting)} onClick={handleUpdateSetting}>
           {t("common.save")}