fest: 支持评论免审核设置 #58

controller/apiTag.go

@@ -1286,6 +1286,20 @@ func ApiCommentPublish(ctx iris.Context) {
 			req.ToUid = parent.UserId
 		}
 	}
+	// 是否需要审核
+	var contentVerify = true
+	userGroup := ctx.Values().Get("userGroup")
+	if userGroup != nil {
+		group, ok := userGroup.(*model.UserGroup)
+		if ok {
+			contentVerify = !group.Setting.ContentNoVerify
+		}
+	}
+	req.Status = 0
+	if contentVerify == false {
+		// 不需要审核
+		req.Status = 1
+	}
 
 	comment, err := currentSite.SaveComment(&req)
 	if err != nil {
@@ -1451,8 +1465,14 @@ func ApiArchivePublish(ctx iris.Context) {
 		})
 		return
 	}
-	if currentSite.Safe.APIPublish != 1 {
-		req.Draft = true
+	// 是否需要审核
+	req.Draft = currentSite.Safe.APIPublish != 1
+	userGroup := ctx.Values().Get("userGroup")
+	if userGroup != nil {
+		group, ok := userGroup.(*model.UserGroup)
+		if ok {
+			req.Draft = !group.Setting.ContentNoVerify
+		}
 	}
 	userId := ctx.Values().GetIntDefault("userId", 0)
 	req.UserId = uint(userId)

controller/comment.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/kataras/iris/v12"
 	"kandaoni.com/anqicms/config"
+	"kandaoni.com/anqicms/model"
 	"kandaoni.com/anqicms/provider"
 	"kandaoni.com/anqicms/request"
 	"kandaoni.com/anqicms/response"
@@ -27,9 +28,24 @@ func CommentPublish(ctx iris.Context) {
 
 	//登录状态的用户，发布不进审核，否则进审核
 	status := uint(0)
-	userId := ctx.Values().GetIntDefault("adminId", 0)
-	if userId > 0 {
+	userId := ctx.Values().GetIntDefault("userId", 0)
+	adminId := ctx.Values().GetIntDefault("adminId", 0)
+	if adminId > 0 {
 		status = 1
+	} else {
+		// 是否需要审核
+		var contentVerify = true
+		userGroup := ctx.Values().Get("userGroup")
+		if userGroup != nil {
+			group, ok := userGroup.(*model.UserGroup)
+			if ok {
+				contentVerify = !group.Setting.ContentNoVerify
+			}
+		}
+		if contentVerify == false {
+			// 不需要审核
+			status = 1
+		}
 	}
 
 	var req request.PluginComment

controller/common.go

@@ -817,8 +817,18 @@ func GenerateCaptcha(ctx iris.Context) {
 
 func SafeVerify(ctx iris.Context, req map[string]string, returnType string, from string) bool {
 	currentSite := provider.CurrentSite(ctx)
+	// 检查如果用户是否登录
+	// 是否需要验证码
+	var contentCaptcha = currentSite.Safe.Captcha == 1
+	userGroup := ctx.Values().Get("userGroup")
+	if userGroup != nil {
+		group, ok := userGroup.(*model.UserGroup)
+		if ok {
+			contentCaptcha = !group.Setting.ContentNoCaptcha
+		}
+	}
 	// 检查验证码
-	if currentSite.Safe.Captcha == 1 {
+	if contentCaptcha {
 		captchaId := ctx.PostValueTrim("captcha_id")
 		captchaValue := ctx.PostValueTrim("captcha")
 		if req != nil {

model/user.go

@@ -56,6 +56,9 @@ type UserGroupSetting struct {
 	ParentReward int64 `json:"parent_reward"`
 	Discount     int64 `json:"discount"`
 	ExpireDay    int   `json:"expire_day"`
+
+	ContentNoVerify  bool `json:"content_no_verify"`  // 评论/内容发布是否不需要审核
+	ContentNoCaptcha bool `json:"content_no_captcha"` // 评论/内容发布是否不需要验证码
 }
 
 // Value implements the driver.Valuer interface.

provider/comment.go

@@ -13,15 +13,15 @@ func (w *Website) SaveComment(req *request.PluginComment) (comment *model.Commen
 		}
 	} else {
 		comment = &model.Comment{
-			Status:    0,
+			Status:    req.Status,
 			ArchiveId: req.ArchiveId,
 			UserId:    req.UserId,
 			Ip:        req.Ip,
 			ParentId:  req.ParentId,
 			ToUid:     req.ToUid,
 		}
 	}
-
+	comment.Status = req.Status
 	comment.UserName = req.UserName
 	comment.Content = req.Content