This is an automated email from the ASF dual-hosted git repository.

LinkinStars pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/answer.git

commit 54b1b35df5aec3b80c834c35546cf8a35d927395
Author: LinkinStars <[email protected]>
AuthorDate: Tue Jul 7 12:18:55 2026 +0800

    Align revision audit permission checks
---
 internal/service/content/revision_service.go | 48 +++++++++++++++++-----------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/internal/service/content/revision_service.go 
b/internal/service/content/revision_service.go
index 83568088..b932ba8b 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -114,14 +114,20 @@ func (rs *RevisionService) RevisionAudit(ctx 
context.Context, req *schema.Revisi
        if revisioninfo.Status != entity.RevisionUnreviewedStatus {
                return
        }
+       objectType, objectTypeerr := 
obj.GetObjectTypeStrByObjectID(revisioninfo.ObjectID)
+       if objectTypeerr != nil {
+               return objectTypeerr
+       }
        if req.Operation == schema.RevisionAuditReject {
+               if err = checkRevisionAuditPermission(req, objectType); err != 
nil {
+                       return err
+               }
                err = rs.revisionRepo.UpdateStatus(ctx, req.ID, 
entity.RevisionReviewRejectStatus, req.UserID)
                return
        }
        if req.Operation == schema.RevisionAuditApprove {
-               objectType, objectTypeerr := 
obj.GetObjectTypeStrByObjectID(revisioninfo.ObjectID)
-               if objectTypeerr != nil {
-                       return objectTypeerr
+               if err = checkRevisionAuditPermission(req, objectType); err != 
nil {
+                       return err
                }
                revisionitem := &schema.GetRevisionResp{}
                _ = copier.Copy(revisionitem, revisioninfo)
@@ -129,23 +135,11 @@ func (rs *RevisionService) RevisionAudit(ctx 
context.Context, req *schema.Revisi
                var saveErr error
                switch objectType {
                case constant.QuestionObjectType:
-                       if !req.CanReviewQuestion {
-                               saveErr = 
errors.BadRequest(reason.RevisionNoPermission)
-                       } else {
-                               saveErr = rs.revisionAuditQuestion(ctx, 
revisionitem)
-                       }
+                       saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
                case constant.AnswerObjectType:
-                       if !req.CanReviewAnswer {
-                               saveErr = 
errors.BadRequest(reason.RevisionNoPermission)
-                       } else {
-                               saveErr = rs.revisionAuditAnswer(ctx, 
revisionitem)
-                       }
+                       saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
                case constant.TagObjectType:
-                       if !req.CanReviewTag {
-                               saveErr = 
errors.BadRequest(reason.RevisionNoPermission)
-                       } else {
-                               saveErr = rs.revisionAuditTag(ctx, revisionitem)
-                       }
+                       saveErr = rs.revisionAuditTag(ctx, revisionitem)
                }
                if saveErr != nil {
                        return saveErr
@@ -179,6 +173,24 @@ func (rs *RevisionService) RevisionAudit(ctx 
context.Context, req *schema.Revisi
        return nil
 }
 
+func checkRevisionAuditPermission(req *schema.RevisionAuditReq, objectType 
string) error {
+       switch objectType {
+       case constant.QuestionObjectType:
+               if !req.CanReviewQuestion {
+                       return errors.BadRequest(reason.RevisionNoPermission)
+               }
+       case constant.AnswerObjectType:
+               if !req.CanReviewAnswer {
+                       return errors.BadRequest(reason.RevisionNoPermission)
+               }
+       case constant.TagObjectType:
+               if !req.CanReviewTag {
+                       return errors.BadRequest(reason.RevisionNoPermission)
+               }
+       }
+       return nil
+}
+
 func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, 
revisionitem *schema.GetRevisionResp) (err error) {
        questioninfo, ok := 
revisionitem.ContentParsed.(*schema.QuestionInfoResp)
        if ok {

Reply via email to