feat: show origin content if floor deleted

OpenTreeHole · Nov 11, 2023 · c1c7cdb · c1c7cdb
1 parent 254497f
commit c1c7cdb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/apis/floor/schemas.go b/apis/floor/schemas.go
@@ -113,6 +113,7 @@ type SensitiveFloorResponse struct {
 	Modified          int       `json:"modified"`
 	IsActualSensitive *bool     `json:"is_actual_sensitive"`
 	HoleID            int       `json:"hole_id"`
+	Deleted           bool      `json:"deleted"`
 }
 
 func (s *SensitiveFloorResponse) FromModel(floor *models.Floor) *SensitiveFloorResponse {
@@ -123,6 +124,7 @@ func (s *SensitiveFloorResponse) FromModel(floor *models.Floor) *SensitiveFloorR
 	s.Modified = floor.Modified
 	s.IsActualSensitive = floor.IsActualSensitive
 	s.HoleID = floor.HoleID
+	s.Deleted = floor.Deleted
 	return s
 }
 

diff --git a/docs/docs.go b/docs/docs.go
@@ -2594,6 +2594,9 @@ const docTemplate = `{
                 "content": {
                     "type": "string"
                 },
+                "deleted": {
+                    "type": "boolean"
+                },
                 "hole_id": {
                     "type": "integer"
                 },

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -2587,6 +2587,9 @@
                 "content": {
                     "type": "string"
                 },
+                "deleted": {
+                    "type": "boolean"
+                },
                 "hole_id": {
                     "type": "integer"
                 },

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -166,6 +166,8 @@ definitions:
     properties:
       content:
         type: string
+      deleted:
+        type: boolean
       hole_id:
         type: integer
       id:

diff --git a/models/floor.go b/models/floor.go
@@ -171,7 +171,10 @@ func (floor *Floor) SetDefaults() {
 		floor.FoldFrontend = []string{}
 	}
 
-	if floor.IsSensitive == true && (floor.IsActualSensitive == nil || *floor.IsActualSensitive == true) {
+	if !floor.Deleted &&
+		floor.IsSensitive == true &&
+		(floor.IsActualSensitive == nil ||
+			*floor.IsActualSensitive == true) {
 		floor.Content = "该内容被猫猫吃掉了"
 		floor.FoldFrontend = []string{"该内容被猫猫吃掉了"}
 	}