Merge branch 'main' of https://github.com/OpenTreeHole/treehole_next

OpenTreeHole · Jul 12, 2024 · a930891 · a930891
2 parents 93c99fc + f0619dd
commit a930891
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 19 deletions.
diff --git a/apis/hole/apis.go b/apis/hole/apis.go
@@ -450,25 +450,59 @@ func ModifyHole(c *fiber.Ctx) error {
 		}
 
 		// modify hidden
-		if body.Unhidden != nil && *body.Unhidden && hole.Hidden {
-			hole.Hidden = false
-			changed = true
-
-			// reindex into Elasticsearch
-			var floors Floors
-			_ = DB.Where("hole_id = ?", hole.ID).Find(&floors)
-			var floorModels []FloorModel
-			for _, floor := range floors {
-				floorModels = append(floorModels, FloorModel{
-					ID:        floor.ID,
-					UpdatedAt: floor.UpdatedAt,
-					Content:   floor.Content,
-				})
+		if body.Hidden != nil {
+			if *body.Hidden && !hole.Hidden {
+				hole.Hidden = true
+				changed = true
+
+				// delete floors from Elasticsearch
+				var floors Floors
+				_ = DB.Where("hole_id = ?", hole.ID).Find(&floors)
+				go BulkDelete(Models2IDSlice(floors))
+
+				// log
+				MyLog("Hole", "Modify", holeID, user.ID, RoleAdmin, "Hidden: ")
+			} else if !*body.Hidden && hole.Hidden {
+				hole.Hidden = false
+				changed = true
+
+				// reindex into Elasticsearch
+				var floors Floors
+				_ = DB.Where("hole_id = ?", hole.ID).Find(&floors)
+				var floorModels []FloorModel
+				for _, floor := range floors {
+					floorModels = append(floorModels, FloorModel{
+						ID:        floor.ID,
+						UpdatedAt: floor.UpdatedAt,
+						Content:   floor.Content,
+					})
+				}
+				go BulkInsert(floorModels)
+
+				// log
+				MyLog("Hole", "Modify", holeID, user.ID, RoleAdmin, "Unhidden: ")
+			}
+		} else {
+			if body.Unhidden != nil && *body.Unhidden && hole.Hidden {
+				hole.Hidden = false
+				changed = true
+
+				// reindex into Elasticsearch
+				var floors Floors
+				_ = DB.Where("hole_id = ?", hole.ID).Find(&floors)
+				var floorModels []FloorModel
+				for _, floor := range floors {
+					floorModels = append(floorModels, FloorModel{
+						ID:        floor.ID,
+						UpdatedAt: floor.UpdatedAt,
+						Content:   floor.Content,
+					})
+				}
+				go BulkInsert(floorModels)
+
+				// log
+				MyLog("Hole", "Modify", holeID, user.ID, RoleAdmin, "Unhidden: ")
 			}
-			go BulkInsert(floorModels)
-
-			// log
-			MyLog("Hole", "Modify", holeID, user.ID, RoleAdmin, "Unhidden: ")
 		}
 
 		// modify tags

diff --git a/apis/hole/schemas.go b/apis/hole/schemas.go
@@ -68,6 +68,7 @@ type CreateOldResponse struct {
 type ModifyModel struct {
 	TagCreateModelSlice
 	DivisionID *int  `json:"division_id" validate:"omitempty,min=1"` // Admin and owner only
+	Hidden     *bool `json:"hidden"`                                 // Admin only
 	Unhidden   *bool `json:"unhidden"`                               // admin only
 	Lock       *bool `json:"lock"`                                   // admin only
 }
@@ -76,6 +77,9 @@ func (body ModifyModel) CheckPermission(user *models.User, hole *models.Hole) er
 	if body.DivisionID != nil && !user.IsAdmin {
 		return common.Forbidden("非管理员禁止修改分区")
 	}
+	if body.Hidden != nil && !user.IsAdmin {
+		return common.Forbidden("非管理员禁止隐藏帖子")
+	}
 	if body.Unhidden != nil && !user.IsAdmin {
 		return common.BadRequest("非管理员禁止取消隐藏")
 	}
@@ -92,5 +96,5 @@ func (body ModifyModel) CheckPermission(user *models.User, hole *models.Hole) er
 }
 
 func (body ModifyModel) DoNothing() bool {
-	return body.Unhidden == nil && body.Tags == nil && body.DivisionID == nil && body.Lock == nil
+	return body.Hidden == nil && body.Unhidden == nil && body.Tags == nil && body.DivisionID == nil && body.Lock == nil
 }
diff --git a/docs/docs.go b/docs/docs.go
@@ -3331,6 +3331,10 @@ const docTemplate = `{
                     "type": "integer",
                     "minimum": 1
                 },
+                "hidden": {
+                    "description": "Admin only",
+                    "type": "boolean"
+                },
                 "lock": {
                     "description": "admin only",
                     "type": "boolean"

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -3324,6 +3324,10 @@
                     "type": "integer",
                     "minimum": 1
                 },
+                "hidden": {
+                    "description": "Admin only",
+                    "type": "boolean"
+                },
                 "lock": {
                     "description": "admin only",
                     "type": "boolean"

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -288,6 +288,9 @@ definitions:
         description: Admin and owner only
         minimum: 1
         type: integer
+      hidden:
+        description: Admin only
+        type: boolean
       lock:
         description: admin only
         type: boolean