From b97f0fe9d3102f600e51813a977dc27b121e4a27 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 21 Nov 2022 10:12:27 +0800
Subject: [PATCH 001/194] feat: add diff function

---
 ui/package.json         |  1 +
 ui/pnpm-lock.yaml       |  7 +++++++
 ui/src/index.scss       | 15 +++++++++++++++
 ui/src/router/routes.ts |  4 ++++
 ui/src/utils/common.ts  | 21 +++++++++++++++++++++
 5 files changed, 48 insertions(+)

diff --git a/ui/package.json b/ui/package.json
index 4dd40263..a26e51bb 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -19,6 +19,7 @@
     "codemirror": "5.65.0",
     "copy-to-clipboard": "^3.3.2",
     "dayjs": "^1.11.5",
+    "diff": "^5.1.0",
     "i18next": "^21.9.0",
     "katex": "^0.16.2",
     "lodash": "^4.17.21",
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index 78e83835..6f91fd63 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -25,6 +25,7 @@ specifiers:
   copy-to-clipboard: ^3.3.2
   customize-cra: ^1.0.0
   dayjs: ^1.11.5
+  diff: ^5.1.0
   eslint: ^8.0.1
   eslint-config-airbnb: ^19.0.4
   eslint-config-airbnb-typescript: ^17.0.0
@@ -72,6 +73,7 @@ dependencies:
   codemirror: 5.65.0
   copy-to-clipboard: 3.3.2
   dayjs: 1.11.5
+  diff: 5.1.0
   i18next: 21.9.2
   katex: 0.16.2
   lodash: 4.17.21
@@ -4742,6 +4744,11 @@ packages:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
 
+  /diff/5.1.0:
+    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
+    engines: {node: '>=0.3.1'}
+    dev: false
+
   /dir-glob/3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
diff --git a/ui/src/index.scss b/ui/src/index.scss
index a767e0a0..66b3c299 100644
--- a/ui/src/index.scss
+++ b/ui/src/index.scss
@@ -253,3 +253,18 @@ a {
   padding: 1px 0.5rem 2px;
   height: 24px;
 }
+
+.review-text-delete {
+  color: #842029;
+  background-color: #F8D7DA;
+  text-decoration: line-through;
+  .review-text-add {
+    text-decoration: none;
+  }
+}
+
+.review-text-add {
+  color: #0F5132;
+  background-color: #D1E7DD;
+  text-decoration: none !important;
+}
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index be7e61ac..3454738a 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -201,6 +201,10 @@ const routes: RouteNode[] = [
           return guard.forbidden();
         },
       },
+      {
+        path: '/revision',
+        page: 'pages/Revision',
+      },
       // for admin
       {
         path: 'admin',
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 41622307..46d43ba0 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -1,5 +1,7 @@
 import i18next from 'i18next';
 
+const Diff = require('diff');
+
 function thousandthDivision(num) {
   const reg = /\d{1,3}(?=(\d{3})+$)/g;
   return `${num}`.replace(reg, '$&,');
@@ -163,6 +165,24 @@ function handleFormError(
   return data;
 }
 
+function diffText(newText: string, oldText: string): string {
+  const diff = Diff.diffChars(newText, oldText);
+  const result = diff.map((part) => {
+    if (part.added) {
+      return `<span class="review-text-add">${part.value}</span>`;
+    }
+    if (part.removed) {
+      return `<span class="review-text-delete">${part.value}</span>`;
+    }
+    return part.value;
+  });
+  return result
+    .join('')
+    ?.replace(/\n/gi, '<br>')
+    ?.replace(/<iframe/gi, '&lt;iframe')
+    ?.replace(/<input/gi, '&lt;input');
+}
+
 export {
   thousandthDivision,
   formatCount,
@@ -175,4 +195,5 @@ export {
   colorRgb,
   labelStyle,
   handleFormError,
+  diffText,
 };

From 20f0a1b6641b2354aa2c5222ed3533e22a64154f Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 21 Nov 2022 16:51:13 +0800
Subject: [PATCH 002/194] feat: question revision add tags

---
 internal/entity/question_entity.go   | 19 ++++++++++++++++-
 internal/entity/revision_entity.go   | 31 ++++++++++++++++++----------
 internal/service/question_service.go | 28 +++++++++++++++++++++----
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index 83de9520..64c982ed 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -46,10 +46,27 @@ type Question struct {
 	AcceptedAnswerID string    `xorm:"not null default 0 BIGINT(20) accepted_answer_id"`
 	LastAnswerID     string    `xorm:"not null default 0 BIGINT(20) last_answer_id"`
 	PostUpdateTime   time.Time `xorm:"default CURRENT_TIMESTAMP TIMESTAMP post_update_time"`
-	RevisionID       string    `xorm:"not null default 0 BIGINT(20)  revision_id"`
+	RevisionID       string    `xorm:"not null default 0 BIGINT(20) revision_id"`
 }
 
 // TableName question table name
 func (Question) TableName() string {
 	return "question"
 }
+
+// QuestionWithTagsRevision question
+type QuestionWithTagsRevision struct {
+	Question
+	Tags []*TagSimpleInfoForRevision `json:"tags"`
+}
+
+// TagSimpleInfoForRevision tag simple info for revision
+type TagSimpleInfoForRevision struct {
+	ID          string `xorm:"not null pk comment('tag_id') BIGINT(20) id"`
+	MainTagID   int64  `xorm:"not null default 0 BIGINT(20) main_tag_id"`
+	SlugName    string `xorm:"not null default '' unique VARCHAR(35) slug_name"`
+	DisplayName string `xorm:"not null default '' VARCHAR(35) display_name"`
+	Recommend   bool   `xorm:"not null default false BOOL recommend"`
+	Reserved    bool   `xorm:"not null default false BOOL reserved"`
+	RevisionID  string `xorm:"not null default 0 BIGINT(20) revision_id"`
+}
diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index 48740ef2..e439dcb2 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -2,19 +2,28 @@ package entity
 
 import "time"
 
+const (
+	// RevisionUnreviewedStatus this revision is unreviewed
+	RevisionUnreviewedStatus = 1
+	// RevisionReviewPassStatus this revision is reviewed and approved by operator
+	RevisionReviewPassStatus = 2
+	// RevisionReviewRejectStatus this revision is reviewed and rejected by operator
+	RevisionReviewRejectStatus = 3
+)
+
 // Revision revision
 type Revision struct {
-	ID         string    `xorm:"not null pk autoincr BIGINT(20) id"`
-	CreatedAt  time.Time `xorm:"created TIMESTAMP created_at"`
-	UpdatedAt  time.Time `xorm:"updated TIMESTAMP updated_at"`
-	UserID     string    `xorm:"not null default 0 BIGINT(20) user_id"`
-	ObjectType int       `xorm:"not null default 0 ) INT(11) object_type"`
-	ObjectID   string    `xorm:"not null default 0 BIGINT(20) INDEX object_id"`
-	Title      string    `xorm:"not null default '' VARCHAR(255) title"`
-	Content    string    `xorm:"not null TEXT content"`
-	Log        string    `xorm:"VARCHAR(255) log"`
-	// Status todo: this field is not used, will be removed in the future
-	Status int `xorm:"not null default 1 INT(11) status"`
+	ID           string    `xorm:"not null pk autoincr BIGINT(20) id"`
+	CreatedAt    time.Time `xorm:"created TIMESTAMP created_at"`
+	UpdatedAt    time.Time `xorm:"updated TIMESTAMP updated_at"`
+	UserID       string    `xorm:"not null default 0 BIGINT(20) user_id"`
+	ObjectType   int       `xorm:"not null default 0 ) INT(11) object_type"`
+	ObjectID     string    `xorm:"not null default 0 BIGINT(20) INDEX object_id"`
+	Title        string    `xorm:"not null default '' VARCHAR(255) title"`
+	Content      string    `xorm:"not null TEXT content"`
+	Log          string    `xorm:"VARCHAR(255) log"`
+	Status       int       `xorm:"not null default 1 INT(11) status"`
+	ReviewUserID string    `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
 // TableName revision table name
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 6f36fbe7..4d7764b9 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -116,7 +116,6 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		return
 	}
 
-	questionInfo = &schema.QuestionInfo{}
 	question := &entity.Question{}
 	now := time.Now()
 	question.UserID = req.UserID
@@ -146,9 +145,13 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   question.UserID,
 		ObjectID: question.ID,
-		Title:    "",
+		Title:    question.Title,
 	}
-	infoJSON, _ := json.Marshal(question)
+	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question)
+	if err != nil {
+		return nil, err
+	}
+	infoJSON, _ := json.Marshal(questionWithTagsRevision)
 	revisionDTO.Content = string(infoJSON)
 	err = qs.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
@@ -264,7 +267,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   question.UserID,
 		ObjectID: question.ID,
-		Title:    "",
+		Title:    question.Title,
 		Log:      req.EditSummary,
 	}
 	infoJSON, _ := json.Marshal(question)
@@ -688,3 +691,20 @@ func (qs *QuestionService) CmsSearchAnswerList(ctx context.Context, search *enti
 	}
 	return answerlist, count, nil
 }
+
+func (qs *QuestionService) changeQuestionToRevision(ctx context.Context, questionInfo *entity.Question) (
+	questionRevision *entity.QuestionWithTagsRevision, err error) {
+	questionRevision = &entity.QuestionWithTagsRevision{}
+	questionRevision.Question = *questionInfo
+
+	tags, err := qs.tagCommon.GetObjectEntityTag(ctx, questionInfo.ID)
+	if err != nil {
+		return nil, err
+	}
+	for _, tag := range tags {
+		item := &entity.TagSimpleInfoForRevision{}
+		_ = copier.Copy(item, tag)
+		questionRevision.Tags = append(questionRevision.Tags, item)
+	}
+	return questionRevision, nil
+}

From 6e0c41e769a2127330292e984255b3d3589110d1 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 21 Nov 2022 16:56:54 +0800
Subject: [PATCH 003/194] feat: activity add cancelled_at field

---
 internal/entity/activity_entity.go      |  1 +
 internal/repo/activity/follow_repo.go   | 12 +++++++-----
 internal/repo/activity/vote_repo.go     | 12 +++++++-----
 internal/repo/activity_common/follow.go |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/internal/entity/activity_entity.go b/internal/entity/activity_entity.go
index 3e7a7c16..b1e5fc4b 100644
--- a/internal/entity/activity_entity.go
+++ b/internal/entity/activity_entity.go
@@ -12,6 +12,7 @@ type Activity struct {
 	ID            string    `xorm:"not null pk autoincr BIGINT(20) id"`
 	CreatedAt     time.Time `xorm:"created TIMESTAMP created_at"`
 	UpdatedAt     time.Time `xorm:"updated TIMESTAMP updated_at"`
+	CancelledAt   time.Time `xorm:"TIMESTAMP cancelled_at"`
 	UserID        string    `xorm:"not null index BIGINT(20) user_id"`
 	TriggerUserID int64     `xorm:"not null default 0 index BIGINT(20) trigger_user_id"`
 	ObjectID      string    `xorm:"not null default 0 index BIGINT(20) object_id"`
diff --git a/internal/repo/activity/follow_repo.go b/internal/repo/activity/follow_repo.go
index 14238718..c8bae7b5 100644
--- a/internal/repo/activity/follow_repo.go
+++ b/internal/repo/activity/follow_repo.go
@@ -2,6 +2,7 @@ package activity
 
 import (
 	"context"
+	"time"
 
 	"github.com/answerdev/answer/internal/service/activity_common"
 	"github.com/answerdev/answer/internal/service/follow"
@@ -59,7 +60,7 @@ func (ar *FollowRepo) Follow(ctx context.Context, objectID, userID string) error
 			return
 		}
 
-		if has && existsActivity.Cancelled == 0 {
+		if has && existsActivity.Cancelled == entity.ActivityAvailable {
 			return
 		}
 
@@ -67,7 +68,7 @@ func (ar *FollowRepo) Follow(ctx context.Context, objectID, userID string) error
 			_, err = session.Where(builder.Eq{"id": existsActivity.ID}).
 				Cols(`cancelled`).
 				Update(&entity.Activity{
-					Cancelled: 0,
+					Cancelled: entity.ActivityAvailable,
 				})
 		} else {
 			// update existing activity with new user id and u object id
@@ -75,7 +76,7 @@ func (ar *FollowRepo) Follow(ctx context.Context, objectID, userID string) error
 				UserID:       userID,
 				ObjectID:     objectID,
 				ActivityType: activityType,
-				Cancelled:    0,
+				Cancelled:    entity.ActivityAvailable,
 				Rank:         0,
 				HasRank:      0,
 			})
@@ -120,13 +121,14 @@ func (ar *FollowRepo) FollowCancel(ctx context.Context, objectID, userID string)
 			return
 		}
 
-		if has && existsActivity.Cancelled == 1 {
+		if has && existsActivity.Cancelled == entity.ActivityCancelled {
 			return
 		}
 		if _, err = session.Where("id = ?", existsActivity.ID).
 			Cols("cancelled").
 			Update(&entity.Activity{
-				Cancelled: 1,
+				Cancelled:   entity.ActivityCancelled,
+				CancelledAt: time.Now(),
 			}); err != nil {
 			return
 		}
diff --git a/internal/repo/activity/vote_repo.go b/internal/repo/activity/vote_repo.go
index 00ccd04b..b42ab467 100644
--- a/internal/repo/activity/vote_repo.go
+++ b/internal/repo/activity/vote_repo.go
@@ -3,6 +3,7 @@ package activity
 import (
 	"context"
 	"strings"
+	"time"
 
 	"github.com/answerdev/answer/pkg/converter"
 
@@ -100,7 +101,7 @@ func (vr *VoteRepo) vote(ctx context.Context, objectID string, userID, objectUse
 				Get(&existsActivity)
 
 			// is is voted,return
-			if has && existsActivity.Cancelled == 0 {
+			if has && existsActivity.Cancelled == entity.ActivityAvailable {
 				return
 			}
 
@@ -111,7 +112,7 @@ func (vr *VoteRepo) vote(ctx context.Context, objectID string, userID, objectUse
 				ActivityType:  activityType,
 				Rank:          deltaRank,
 				HasRank:       hasRank,
-				Cancelled:     0,
+				Cancelled:     entity.ActivityAvailable,
 			}
 
 			// trigger user rank and send notification
@@ -131,7 +132,7 @@ func (vr *VoteRepo) vote(ctx context.Context, objectID string, userID, objectUse
 			if has {
 				if _, err = session.Where("id = ?", existsActivity.ID).Cols("`cancelled`").
 					Update(&entity.Activity{
-						Cancelled: 0,
+						Cancelled: entity.ActivityAvailable,
 					}); err != nil {
 					return
 				}
@@ -201,13 +202,14 @@ func (vr *VoteRepo) voteCancel(ctx context.Context, objectID string, userID, obj
 				return
 			}
 
-			if existsActivity.Cancelled == 1 {
+			if existsActivity.Cancelled == entity.ActivityCancelled {
 				return
 			}
 
 			if _, err = session.Where("id = ?", existsActivity.ID).Cols("`cancelled`").
 				Update(&entity.Activity{
-					Cancelled: 1,
+					Cancelled:   entity.ActivityCancelled,
+					CancelledAt: time.Now(),
 				}); err != nil {
 				return
 			}
diff --git a/internal/repo/activity_common/follow.go b/internal/repo/activity_common/follow.go
index aee42454..5f7b0ec0 100644
--- a/internal/repo/activity_common/follow.go
+++ b/internal/repo/activity_common/follow.go
@@ -124,7 +124,7 @@ func (ar *FollowRepo) IsFollowed(userID, objectID string) (bool, error) {
 	if !has {
 		return false, nil
 	}
-	if at.Cancelled == 1 {
+	if at.Cancelled == entity.ActivityCancelled {
 		return false, nil
 	} else {
 		return true, nil

From 41455099193335d6a410c11997e3280d6401df8b Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 17:58:57 +0800
Subject: [PATCH 004/194] chore(ui): Add lint-staged

---
 ui/.eslintrc.js       |  3 ++-
 ui/.lintstagedrc.json | 15 ++++++++++++---
 ui/package.json       |  3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
index 6ecb4b49..7013efbc 100644
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@@ -23,8 +23,9 @@ module.exports = {
     tsconfigRootDir: __dirname,
     project: ['./tsconfig.json'],
   },
-  plugins: ['react', '@typescript-eslint'],
+  plugins: ['react', '@typescript-eslint', 'prettier'],
   rules: {
+    'prettier/prettier': 'error',
     'no-unused-vars': 'off',
     'no-console': 'off',
     'import/prefer-default-export': 'off',
diff --git a/ui/.lintstagedrc.json b/ui/.lintstagedrc.json
index 8f3e37e6..fce648a8 100644
--- a/ui/.lintstagedrc.json
+++ b/ui/.lintstagedrc.json
@@ -1,5 +1,14 @@
 {
-  "*.{js,jsx,ts,tsx}": ["eslint --cache --fix"],
-  "*.{js,jsx,less,md,json}": ["prettier --write"],
-  "*.ts?(x)": ["prettier --parser=typescript --write"]
+  "*.{js,jsx,ts,tsx}": [
+    "cd ui && eslint --cache --fix",
+    "git add"
+  ],
+  "*.{js,jsx,scss,md,json}": [
+    "cd ui && prettier --write",
+    "git add"
+  ],
+  "*.ts?(x)": [
+    "cd ui && prettier --parser=typescript --write",
+    "git add"
+  ]
 }
diff --git a/ui/package.json b/ui/package.json
index 4dd40263..801ac693 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -9,7 +9,8 @@
     "lint": "eslint . --cache --fix --ext .ts,.tsx",
     "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "prepare": "cd .. && husky install",
-    "preinstall": "node ./scripts/preinstall.js"
+    "preinstall": "node ./scripts/preinstall.js",
+    "pre-commit": "lint-staged"
   },
   "dependencies": {
     "axios": "^0.27.2",

From 8f68fc252b1086dda8520d9dd7e7edb3507fed58 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 17:59:18 +0800
Subject: [PATCH 005/194] refactor(ui): remove setupTests.ts

---
 ui/src/setupTests.ts | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 ui/src/setupTests.ts

diff --git a/ui/src/setupTests.ts b/ui/src/setupTests.ts
deleted file mode 100644
index 8f2609b7..00000000
--- a/ui/src/setupTests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

From feb62afb9559bf8bf2a683b509effbe249c91356 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 21 Nov 2022 17:59:52 +0800
Subject: [PATCH 006/194] feat: add activity queue

---
 internal/base/constant/acticity.go            | 59 +++++++++++++++++++
 .../repo/activity_common/activity_repo.go     | 17 ++++++
 internal/schema/activity.go                   | 11 ++++
 internal/service/activity_common/activity.go  | 49 +++++++++++++++
 .../service/activity_quque/activity_queue.go  | 14 +++++
 internal/service/provider.go                  |  4 +-
 6 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 internal/base/constant/acticity.go
 create mode 100644 internal/schema/activity.go
 create mode 100644 internal/service/activity_quque/activity_queue.go

diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
new file mode 100644
index 00000000..f4c0bd1d
--- /dev/null
+++ b/internal/base/constant/acticity.go
@@ -0,0 +1,59 @@
+package constant
+
+// | 问题 回答 标签 | undeleted | 操作者        |              | 恢复删除的内容                                               |
+// | 问题 回答 标签 | deleted   | 操作者        |              | 删除内容                                                     |
+// | 问题 回答 标签 | rollback | 编辑者        | 显示编辑理由 | 回滚版本编辑记录； 点击 Type 显示最近的版本比较              |
+// | 问题 回答 标签 | edit     | 编辑者        | 显示编辑理由 | 编辑记录； 点击 Type 显示最近的版本比较                      |
+// | 问题 回答     | downvote  | 投票者 or N/A |              | 内容点踩，名字仅管理员可见； 取消时显示已取消和取消时间      |
+// | 问题 回答     | upvote    | 投票者        |              | 内容点赞； 取消时显示已取消和取消时间                        |
+// | 问题 回答     | accept    | 提问者        |              | 采纳答案，Type 链接到对应的回答； 取消时显示已取消和取消时间 |
+// | 问题 回答     | commented | 评论者        | 显示评论内容 | 添加评论，Type 链接到对应的评论                              |
+// | 问题         | answered  | 回答者        |              | 添加回答，Type 链接到对应的回答                              |
+// | 问题         | reopened  | 操作者        |              | 重新开启问题                                                 |
+// | 问题         | closed    | 操作者        | 显示关闭理由 | 关闭问题                                                     |
+// | 问题         | asked    | 提问者        |              | 初始提问版本，点击展开无需比较                               |
+// | 回答         | answered | 回答者        |              | 初始回答版本，点击展开无需比较                               |
+// | 标签         | created  | 创建者        |              | 初始标签版本，点击展开无需比较                               |
+
+// question activity
+
+type ActivityTypeKey string
+
+const (
+	ActivityQuestionAsked     ActivityTypeKey = "question.asked"
+	ActivityQuestionClosed    ActivityTypeKey = "question.closed"
+	ActivityQuestionReopened  ActivityTypeKey = "question.reopened"
+	ActivityQuestionAnswered  ActivityTypeKey = "question.answered"
+	ActivityQuestionCommented ActivityTypeKey = "question.commented"
+	ActivityQuestionAccept    ActivityTypeKey = "question.accept"
+	ActivityQuestionUpvote    ActivityTypeKey = "question.upvote"
+	ActivityQuestionDownvote  ActivityTypeKey = "question.downvote"
+	ActivityQuestionEdit      ActivityTypeKey = "question.edit"
+	ActivityQuestionRollback  ActivityTypeKey = "question.rollback"
+	ActivityQuestionDeleted   ActivityTypeKey = "question.deleted"
+	ActivityQuestionUndeleted ActivityTypeKey = "question.undeleted"
+)
+
+// answer activity
+
+const (
+	ActivityAnswerAnswered  ActivityTypeKey = "answer.answered"
+	ActivityAnswerCommented ActivityTypeKey = "answer.commented"
+	ActivityAnswerAccept    ActivityTypeKey = "answer.accept"
+	ActivityAnswerUpvote    ActivityTypeKey = "answer.upvote"
+	ActivityAnswerDownvote  ActivityTypeKey = "answer.downvote"
+	ActivityAnswerEdit      ActivityTypeKey = "answer.edit"
+	ActivityAnswerRollback  ActivityTypeKey = "answer.rollback"
+	ActivityAnswerDeleted   ActivityTypeKey = "answer.deleted"
+	ActivityAnswerUndeleted ActivityTypeKey = "answer.undeleted"
+)
+
+// tag activity
+
+const (
+	ActivityTagCreated   ActivityTypeKey = "tag.created"
+	ActivityTagEdit      ActivityTypeKey = "tag.edit"
+	ActivityTagRollback  ActivityTypeKey = "tag.rollback"
+	ActivityTagDeleted   ActivityTypeKey = "tag.deleted"
+	ActivityTagUndeleted ActivityTypeKey = "tag.undeleted"
+)
diff --git a/internal/repo/activity_common/activity_repo.go b/internal/repo/activity_common/activity_repo.go
index d52db3f2..efb7d3be 100644
--- a/internal/repo/activity_common/activity_repo.go
+++ b/internal/repo/activity_common/activity_repo.go
@@ -63,6 +63,14 @@ func (ar *ActivityRepo) GetActivityTypeByObjKey(ctx context.Context, objectKey,
 	return
 }
 
+func (ar *ActivityRepo) GetActivityTypeByConfigKey(ctx context.Context, configKey string) (activityType int, err error) {
+	activityType, err = ar.configRepo.GetConfigType(configKey)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
 func (ar *ActivityRepo) GetActivity(ctx context.Context, session *xorm.Session,
 	objectID, userID string, activityType int,
 ) (existsActivity *entity.Activity, exist bool, err error) {
@@ -89,3 +97,12 @@ func (ar *ActivityRepo) GetUserIDObjectIDActivitySum(ctx context.Context, userID
 	}
 	return sum.Rank, nil
 }
+
+// AddActivity add activity
+func (ar *ActivityRepo) AddActivity(ctx context.Context, activity *entity.Activity) (err error) {
+	_, err = ar.data.DB.Insert(activity)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
new file mode 100644
index 00000000..0284bda4
--- /dev/null
+++ b/internal/schema/activity.go
@@ -0,0 +1,11 @@
+package schema
+
+import "github.com/answerdev/answer/internal/base/constant"
+
+// ActivityMsg activity message
+type ActivityMsg struct {
+	UserID          string                   `json:"user_id"`
+	TriggerUserID   int64                    `json:"trigger_user_id"`
+	ObjectID        string                   `json:"object_id"`
+	ActivityTypeKey constant.ActivityTypeKey `json:"activity_type_key"`
+}
diff --git a/internal/service/activity_common/activity.go b/internal/service/activity_common/activity.go
index 0b35c478..9560dcc8 100644
--- a/internal/service/activity_common/activity.go
+++ b/internal/service/activity_common/activity.go
@@ -4,6 +4,8 @@ import (
 	"context"
 
 	"github.com/answerdev/answer/internal/entity"
+	"github.com/answerdev/answer/internal/service/activity_quque"
+	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
 )
 
@@ -13,4 +15,51 @@ type ActivityRepo interface {
 	GetActivity(ctx context.Context, session *xorm.Session, objectID, userID string, activityType int) (
 		existsActivity *entity.Activity, exist bool, err error)
 	GetUserIDObjectIDActivitySum(ctx context.Context, userID, objectID string) (int, error)
+	GetActivityTypeByConfigKey(ctx context.Context, configKey string) (activityType int, err error)
+	AddActivity(ctx context.Context, activity *entity.Activity) (err error)
+}
+
+type ActivityCommon struct {
+	activityRepo ActivityRepo
+}
+
+// NewActivityCommon new activity common
+func NewActivityCommon(
+	activityRepo ActivityRepo,
+) *ActivityCommon {
+	activity := &ActivityCommon{
+		activityRepo: activityRepo,
+	}
+	activity.HandleActivity()
+	return activity
+}
+
+func (ac *ActivityCommon) HandleActivity() {
+	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Error(err)
+			}
+		}()
+
+		for msg := range activity_quque.ActivityQueue {
+			log.Debugf("received activity %+v", msg)
+
+			activityType, err := ac.activityRepo.GetActivityTypeByConfigKey(context.Background(), string(msg.ActivityTypeKey))
+			if err != nil {
+				log.Errorf("error getting activity type %s, activity type is %s", err, activityType)
+			}
+
+			act := &entity.Activity{
+				UserID:        msg.UserID,
+				TriggerUserID: msg.TriggerUserID,
+				ObjectID:      msg.ObjectID,
+				ActivityType:  activityType,
+				Cancelled:     entity.ActivityAvailable,
+			}
+			if err := ac.activityRepo.AddActivity(context.TODO(), act); err != nil {
+				log.Error(err)
+			}
+		}
+	}()
 }
diff --git a/internal/service/activity_quque/activity_queue.go b/internal/service/activity_quque/activity_queue.go
new file mode 100644
index 00000000..80395ad6
--- /dev/null
+++ b/internal/service/activity_quque/activity_queue.go
@@ -0,0 +1,14 @@
+package activity_quque
+
+import (
+	"github.com/answerdev/answer/internal/schema"
+)
+
+var (
+	ActivityQueue = make(chan *schema.ActivityMsg, 128)
+)
+
+// AddActivity add new activity
+func AddActivity(msg *schema.ActivityMsg) {
+	ActivityQueue <- msg
+}
diff --git a/internal/service/provider.go b/internal/service/provider.go
index c76047bf..3a1db8a4 100644
--- a/internal/service/provider.go
+++ b/internal/service/provider.go
@@ -3,6 +3,7 @@ package service
 import (
 	"github.com/answerdev/answer/internal/service/action"
 	"github.com/answerdev/answer/internal/service/activity"
+	"github.com/answerdev/answer/internal/service/activity_common"
 	answercommon "github.com/answerdev/answer/internal/service/answer_common"
 	"github.com/answerdev/answer/internal/service/auth"
 	collectioncommon "github.com/answerdev/answer/internal/service/collection_common"
@@ -22,9 +23,9 @@ import (
 	"github.com/answerdev/answer/internal/service/report_backyard"
 	"github.com/answerdev/answer/internal/service/report_handle_backyard"
 	"github.com/answerdev/answer/internal/service/revision_common"
+	"github.com/answerdev/answer/internal/service/search_parser"
 	"github.com/answerdev/answer/internal/service/siteinfo"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
-	"github.com/answerdev/answer/internal/service/search_parser"
 	"github.com/answerdev/answer/internal/service/tag"
 	tagcommon "github.com/answerdev/answer/internal/service/tag_common"
 	"github.com/answerdev/answer/internal/service/uploader"
@@ -72,4 +73,5 @@ var ProviderSetService = wire.NewSet(
 	notification.NewNotificationService,
 	activity.NewAnswerActivityService,
 	dashboard.NewDashboardService,
+	activity_common.NewActivityCommon,
 )

From b271d4de45ea858ea5138e9459fff1bfac087359 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 18:14:38 +0800
Subject: [PATCH 007/194] chore(ui): add pre-commit

---
 .gitignore        | 1 -
 .husky/.gitignore | 1 +
 .husky/pre-commit | 4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .husky/.gitignore
 create mode 100755 .husky/pre-commit

diff --git a/.gitignore b/.gitignore
index 84af0c17..d4063a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,5 @@
 Thumbs*.db
 tmp
 vendor/
-.husky
 /answer-data/
 /answer
diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 00000000..31354ec1
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 00000000..1e22558b
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd ui && npm run pre-commit

From f13bd2ed06616347543b543ea9dedc73d85ec323 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 18:15:46 +0800
Subject: [PATCH 008/194] chore(ui): update .lintstagedrc.json

---
 ui/.lintstagedrc.json | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/ui/.lintstagedrc.json b/ui/.lintstagedrc.json
index fce648a8..573dc381 100644
--- a/ui/.lintstagedrc.json
+++ b/ui/.lintstagedrc.json
@@ -1,14 +1,5 @@
 {
-  "*.{js,jsx,ts,tsx}": [
-    "cd ui && eslint --cache --fix",
-    "git add"
-  ],
-  "*.{js,jsx,scss,md,json}": [
-    "cd ui && prettier --write",
-    "git add"
-  ],
-  "*.ts?(x)": [
-    "cd ui && prettier --parser=typescript --write",
-    "git add"
-  ]
+  "*.{js,jsx,ts,tsx}": ["eslint --cache --fix", "git add"],
+  "*.{js,jsx,scss,md,json}": ["prettier --write", "git add"],
+  "*.ts?(x)": ["prettier --parser=typescript --write", "git add"]
 }

From 35834dfcb27ab4e81b8101f3844f424e84a98104 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 18:20:27 +0800
Subject: [PATCH 009/194] chore(ui): add dev dependencies

---
 ui/package.json   |  1 +
 ui/pnpm-lock.yaml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ui/package.json b/ui/package.json
index 801ac693..065a7952 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -39,6 +39,7 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^17.0.3",
+    "@commitlint/config-conventional": "^17.2.0",
     "@fullhuman/postcss-purgecss": "^4.1.3",
     "@testing-library/dom": "^8.17.1",
     "@testing-library/jest-dom": "^4.2.4",
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index 78e83835..6632b67c 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -2,6 +2,7 @@ lockfileVersion: 5.4
 
 specifiers:
   '@commitlint/cli': ^17.0.3
+  '@commitlint/config-conventional': ^17.2.0
   '@fullhuman/postcss-purgecss': ^4.1.3
   '@testing-library/dom': ^8.17.1
   '@testing-library/jest-dom': ^4.2.4
@@ -91,6 +92,7 @@ dependencies:
 
 devDependencies:
   '@commitlint/cli': 17.1.2
+  '@commitlint/config-conventional': 17.2.0
   '@fullhuman/postcss-purgecss': 4.1.3_postcss@8.4.16
   '@testing-library/dom': 8.18.1
   '@testing-library/jest-dom': 4.2.4
@@ -1419,6 +1421,13 @@ packages:
       - '@swc/wasm'
     dev: true
 
+  /@commitlint/config-conventional/17.2.0:
+    resolution: {integrity: sha512-g5hQqRa80f++SYS233dbDSg16YdyounMTAhVcmqtInNeY/GF3aA4st9SVtJxpeGrGmueMrU4L+BBb+6Vs5wrcg==}
+    engines: {node: '>=v14'}
+    dependencies:
+      conventional-changelog-conventionalcommits: 5.0.0
+    dev: true
+
   /@commitlint/config-validator/17.1.0:
     resolution: {integrity: sha512-Q1rRRSU09ngrTgeTXHq6ePJs2KrI+axPTgkNYDWSJIuS1Op4w3J30vUfSXjwn5YEJHklK3fSqWNHmBhmTR7Vdg==}
     engines: {node: '>=v14'}
@@ -3763,6 +3772,15 @@ packages:
       q: 1.5.1
     dev: true
 
+  /conventional-changelog-conventionalcommits/5.0.0:
+    resolution: {integrity: sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==}
+    engines: {node: '>=10'}
+    dependencies:
+      compare-func: 2.0.0
+      lodash: 4.17.21
+      q: 1.5.1
+    dev: true
+
   /conventional-commits-parser/3.2.4:
     resolution: {integrity: sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==}
     engines: {node: '>=10'}

From ae6598ac41d17da0e3d51e878259283ccd73c74b Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Mon, 21 Nov 2022 18:21:00 +0800
Subject: [PATCH 010/194] chore(ui): add commit lint

---
 .husky/commit-msg       | 4 ++++
 ui/commitlint.config.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100755 .husky/commit-msg

diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 00000000..b4bc7500
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd ui && pnpm commitlint --edit $1 --config commitlint.config.js
diff --git a/ui/commitlint.config.js b/ui/commitlint.config.js
index 4944db0e..84dcb122 100644
--- a/ui/commitlint.config.js
+++ b/ui/commitlint.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  extends: ['@commitlint/routes-conventional'],
+  extends: ['@commitlint/config-conventional'],
 };

From d36f758fba579910d30e4f42d1d928c94748257f Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 21 Nov 2022 19:28:02 +0800
Subject: [PATCH 011/194] feat: add activity where needed

---
 cmd/answer/wire_gen.go                        |  6 ++-
 internal/base/constant/acticity.go            | 52 +++++++++----------
 internal/controller/activity_controller.go    | 18 +++++++
 internal/controller/controller.go             |  1 +
 internal/router/answer_api_router.go          |  3 ++
 internal/service/activity/activity.go         |  9 ++++
 internal/service/activity_common/activity.go  |  5 +-
 .../activity_queue.go                         |  2 +-
 internal/service/answer_service.go            | 12 +++++
 internal/service/comment/comment_service.go   |  7 +++
 internal/service/provider.go                  |  1 +
 internal/service/question_service.go          | 18 +++++++
 12 files changed, 104 insertions(+), 30 deletions(-)
 create mode 100644 internal/controller/activity_controller.go
 create mode 100644 internal/service/activity/activity.go
 rename internal/service/{activity_quque => activity_queue}/activity_queue.go (90%)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index acee8475..4549ab1f 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -41,6 +41,7 @@ import (
 	"github.com/answerdev/answer/internal/service"
 	"github.com/answerdev/answer/internal/service/action"
 	activity2 "github.com/answerdev/answer/internal/service/activity"
+	activity_common2 "github.com/answerdev/answer/internal/service/activity_common"
 	"github.com/answerdev/answer/internal/service/answer_common"
 	auth2 "github.com/answerdev/answer/internal/service/auth"
 	"github.com/answerdev/answer/internal/service/collection_common"
@@ -184,7 +185,10 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	notificationController := controller.NewNotificationController(notificationService)
 	dashboardController := controller.NewDashboardController(dashboardService)
 	uploadController := controller.NewUploadController(uploaderService)
-	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController)
+	activityCommon := activity_common2.NewActivityCommon(activityRepo)
+	activityService := activity2.NewActivityService()
+	activityController := controller.NewActivityController(activityCommon, activityService)
+	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
 	uiRouter := router.NewUIRouter()
 	authUserMiddleware := middleware.NewAuthUserMiddleware(authService)
diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index f4c0bd1d..9c9ba596 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -20,40 +20,40 @@ package constant
 type ActivityTypeKey string
 
 const (
-	ActivityQuestionAsked     ActivityTypeKey = "question.asked"
-	ActivityQuestionClosed    ActivityTypeKey = "question.closed"
-	ActivityQuestionReopened  ActivityTypeKey = "question.reopened"
-	ActivityQuestionAnswered  ActivityTypeKey = "question.answered"
-	ActivityQuestionCommented ActivityTypeKey = "question.commented"
-	ActivityQuestionAccept    ActivityTypeKey = "question.accept"
-	ActivityQuestionUpvote    ActivityTypeKey = "question.upvote"
-	ActivityQuestionDownvote  ActivityTypeKey = "question.downvote"
-	ActivityQuestionEdit      ActivityTypeKey = "question.edit"
-	ActivityQuestionRollback  ActivityTypeKey = "question.rollback"
-	ActivityQuestionDeleted   ActivityTypeKey = "question.deleted"
-	ActivityQuestionUndeleted ActivityTypeKey = "question.undeleted"
+	ActQuestionAsked     ActivityTypeKey = "question.asked"
+	ActQuestionClosed    ActivityTypeKey = "question.closed"
+	ActQuestionReopened  ActivityTypeKey = "question.reopened"
+	ActQuestionAnswered  ActivityTypeKey = "question.answered"
+	ActQuestionCommented ActivityTypeKey = "question.commented"
+	ActQuestionAccept    ActivityTypeKey = "question.accept"
+	ActQuestionUpvote    ActivityTypeKey = "question.upvote"
+	ActQuestionDownvote  ActivityTypeKey = "question.downvote"
+	ActQuestionEdit      ActivityTypeKey = "question.edit"
+	ActQuestionRollback  ActivityTypeKey = "question.rollback"
+	ActQuestionDeleted   ActivityTypeKey = "question.deleted"
+	ActQuestionUndeleted ActivityTypeKey = "question.undeleted"
 )
 
 // answer activity
 
 const (
-	ActivityAnswerAnswered  ActivityTypeKey = "answer.answered"
-	ActivityAnswerCommented ActivityTypeKey = "answer.commented"
-	ActivityAnswerAccept    ActivityTypeKey = "answer.accept"
-	ActivityAnswerUpvote    ActivityTypeKey = "answer.upvote"
-	ActivityAnswerDownvote  ActivityTypeKey = "answer.downvote"
-	ActivityAnswerEdit      ActivityTypeKey = "answer.edit"
-	ActivityAnswerRollback  ActivityTypeKey = "answer.rollback"
-	ActivityAnswerDeleted   ActivityTypeKey = "answer.deleted"
-	ActivityAnswerUndeleted ActivityTypeKey = "answer.undeleted"
+	ActAnswerAnswered  ActivityTypeKey = "answer.answered"
+	ActAnswerCommented ActivityTypeKey = "answer.commented"
+	ActAnswerAccept    ActivityTypeKey = "answer.accept"
+	ActAnswerUpvote    ActivityTypeKey = "answer.upvote"
+	ActAnswerDownvote  ActivityTypeKey = "answer.downvote"
+	ActAnswerEdit      ActivityTypeKey = "answer.edit"
+	ActAnswerRollback  ActivityTypeKey = "answer.rollback"
+	ActAnswerDeleted   ActivityTypeKey = "answer.deleted"
+	ActAnswerUndeleted ActivityTypeKey = "answer.undeleted"
 )
 
 // tag activity
 
 const (
-	ActivityTagCreated   ActivityTypeKey = "tag.created"
-	ActivityTagEdit      ActivityTypeKey = "tag.edit"
-	ActivityTagRollback  ActivityTypeKey = "tag.rollback"
-	ActivityTagDeleted   ActivityTypeKey = "tag.deleted"
-	ActivityTagUndeleted ActivityTypeKey = "tag.undeleted"
+	ActTagCreated   ActivityTypeKey = "tag.created"
+	ActTagEdit      ActivityTypeKey = "tag.edit"
+	ActTagRollback  ActivityTypeKey = "tag.rollback"
+	ActTagDeleted   ActivityTypeKey = "tag.deleted"
+	ActTagUndeleted ActivityTypeKey = "tag.undeleted"
 )
diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go
new file mode 100644
index 00000000..0d7f0652
--- /dev/null
+++ b/internal/controller/activity_controller.go
@@ -0,0 +1,18 @@
+package controller
+
+import (
+	"github.com/answerdev/answer/internal/service/activity"
+	"github.com/answerdev/answer/internal/service/activity_common"
+)
+
+type ActivityController struct {
+	activityCommonService *activity_common.ActivityCommon
+	activityService       *activity.ActivityService
+}
+
+// NewActivityController new activity controller.
+func NewActivityController(
+	activityCommonService *activity_common.ActivityCommon,
+	activityService *activity.ActivityService) *ActivityController {
+	return &ActivityController{activityCommonService: activityCommonService, activityService: activityService}
+}
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index e23230b1..5b3e34f3 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -22,4 +22,5 @@ var ProviderSetController = wire.NewSet(
 	NewSiteinfoController,
 	NewDashboardController,
 	NewUploadController,
+	NewActivityController,
 )
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 7640dc0f..21ee9195 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -29,6 +29,7 @@ type AnswerAPIRouter struct {
 	notificationController   *controller.NotificationController
 	dashboardController      *controller.DashboardController
 	uploadController         *controller.UploadController
+	activityController       *controller.ActivityController
 }
 
 func NewAnswerAPIRouter(
@@ -54,6 +55,7 @@ func NewAnswerAPIRouter(
 	notificationController *controller.NotificationController,
 	dashboardController *controller.DashboardController,
 	uploadController *controller.UploadController,
+	activityController *controller.ActivityController,
 ) *AnswerAPIRouter {
 	return &AnswerAPIRouter{
 		langController:           langController,
@@ -78,6 +80,7 @@ func NewAnswerAPIRouter(
 		siteinfoController:       siteinfoController,
 		dashboardController:      dashboardController,
 		uploadController:         uploadController,
+		activityController:       activityController,
 	}
 }
 
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
new file mode 100644
index 00000000..16bafffe
--- /dev/null
+++ b/internal/service/activity/activity.go
@@ -0,0 +1,9 @@
+package activity
+
+// ActivityService activity service
+type ActivityService struct {
+}
+
+func NewActivityService() *ActivityService {
+	return &ActivityService{}
+}
diff --git a/internal/service/activity_common/activity.go b/internal/service/activity_common/activity.go
index 9560dcc8..83adf2be 100644
--- a/internal/service/activity_common/activity.go
+++ b/internal/service/activity_common/activity.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/answerdev/answer/internal/entity"
-	"github.com/answerdev/answer/internal/service/activity_quque"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
 )
@@ -34,6 +34,7 @@ func NewActivityCommon(
 	return activity
 }
 
+// HandleActivity handle activity message
 func (ac *ActivityCommon) HandleActivity() {
 	go func() {
 		defer func() {
@@ -42,7 +43,7 @@ func (ac *ActivityCommon) HandleActivity() {
 			}
 		}()
 
-		for msg := range activity_quque.ActivityQueue {
+		for msg := range activity_queue.ActivityQueue {
 			log.Debugf("received activity %+v", msg)
 
 			activityType, err := ac.activityRepo.GetActivityTypeByConfigKey(context.Background(), string(msg.ActivityTypeKey))
diff --git a/internal/service/activity_quque/activity_queue.go b/internal/service/activity_queue/activity_queue.go
similarity index 90%
rename from internal/service/activity_quque/activity_queue.go
rename to internal/service/activity_queue/activity_queue.go
index 80395ad6..27897268 100644
--- a/internal/service/activity_quque/activity_queue.go
+++ b/internal/service/activity_queue/activity_queue.go
@@ -1,4 +1,4 @@
-package activity_quque
+package activity_queue
 
 import (
 	"github.com/answerdev/answer/internal/schema"
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 30f8e42d..e3fcac98 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/service/activity"
 	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/notice_queue"
 	"github.com/answerdev/answer/internal/service/revision_common"
 
@@ -169,6 +170,17 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 		return insertData.ID, err
 	}
 	as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, insertData.ID, req.UserID)
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          insertData.UserID,
+		ObjectID:        insertData.ID,
+		ActivityTypeKey: constant.ActAnswerAnswered,
+	})
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          insertData.UserID,
+		ObjectID:        insertData.ID,
+		ActivityTypeKey: constant.ActQuestionAnswered,
+	})
 	return insertData.ID, nil
 }
 
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index a7156c76..99087816 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/comment_common"
 	"github.com/answerdev/answer/internal/service/notice_queue"
 	object_info "github.com/answerdev/answer/internal/service/object_info"
@@ -148,6 +149,12 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 		resp.UserAvatar = userInfo.Avatar
 		resp.UserStatus = userInfo.Status
 	}
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          comment.UserID,
+		ObjectID:        comment.ID,
+		ActivityTypeKey: constant.ActQuestionCommented,
+	})
 	return resp, nil
 }
 
diff --git a/internal/service/provider.go b/internal/service/provider.go
index 3a1db8a4..6d1342d9 100644
--- a/internal/service/provider.go
+++ b/internal/service/provider.go
@@ -74,4 +74,5 @@ var ProviderSetService = wire.NewSet(
 	activity.NewAnswerActivityService,
 	dashboard.NewDashboardService,
 	activity_common.NewActivityCommon,
+	activity.NewActivityService,
 )
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 4d7764b9..e35b102a 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -12,6 +12,7 @@ import (
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	collectioncommon "github.com/answerdev/answer/internal/service/collection_common"
 	"github.com/answerdev/answer/internal/service/meta"
 	"github.com/answerdev/answer/internal/service/notice_queue"
@@ -85,6 +86,12 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 	if err != nil {
 		return err
 	}
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          req.UserID,
+		ObjectID:        questionInfo.ID,
+		ActivityTypeKey: constant.ActQuestionClosed,
+	})
 	return nil
 }
 
@@ -164,6 +171,12 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		log.Error("user IncreaseQuestionCount error", err.Error())
 	}
 
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          question.UserID,
+		ObjectID:        question.ID,
+		ActivityTypeKey: constant.ActQuestionAsked,
+	})
+
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
 	return
 }
@@ -276,6 +289,11 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if err != nil {
 		return
 	}
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:          req.UserID,
+		ObjectID:        question.ID,
+		ActivityTypeKey: constant.ActQuestionEdit,
+	})
 
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
 	return

From 76ace2c9a3bb878626d00a99e43b4bbf20747db7 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:12:08 +0800
Subject: [PATCH 012/194] fix question delete

---
 i18n/en_US.yaml                      |  4 ++++
 internal/base/reason/reason.go       |  2 ++
 internal/service/answer_service.go   | 14 +++++++-------
 internal/service/question_service.go |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 824c92e6..01a89c0a 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -24,6 +24,8 @@ error:
   answer:
     not_found:
       other: "Answer do not found."
+    cannot_deleted:
+      other: "Unable to delete answer."
   comment:
     edit_without_permission:
       other: "Comment are not allowed to edit."
@@ -61,6 +63,8 @@ error:
   question:
     not_found:
       other: "Question not found."
+    cannot_deleted:
+      other: "Unable to delete problem."
   rank:
     fail_to_meet_the_condition:
       other: "Rank fail to meet the condition."
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index abe1bd23..68051269 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -17,7 +17,9 @@ const (
 	EmailOrPasswordWrong         = "error.user.email_or_password_wrong"
 	CommentNotFound              = "error.comment.not_found"
 	QuestionNotFound             = "error.question.not_found"
+	QuestionCannotDeleted        = "error.question.cannot_deleted"
 	AnswerNotFound               = "error.answer.not_found"
+	AnswerCannotDeleted          = "error.answer.cannot_deleted"
 	CommentEditWithoutPermission = "error.comment.edit_without_permission"
 	DisallowVote                 = "error.object.disallow_vote"
 	DisallowFollow               = "error.object.disallow_follow"
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 30f8e42d..af7a1bd3 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -74,26 +74,26 @@ func (as *AnswerService) RemoveAnswer(ctx context.Context, req *schema.RemoveAns
 		return nil
 	}
 	if answerInfo.UserID != req.UserID {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	if answerInfo.VoteCount > 0 {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	if answerInfo.Adopted == schema.AnswerAdoptedEnable {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	questionInfo, exist, err := as.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
 	if err != nil {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	if !exist {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	if questionInfo.AnswerCount > 1 {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 	if questionInfo.AcceptedAnswerID != "" {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.AnswerCannotDeleted)
 	}
 
 	// user add question count
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 72f885b1..259ae2f2 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -164,14 +164,14 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 		return nil
 	}
 	if questionInfo.UserID != req.UserID {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 
 	if questionInfo.AcceptedAnswerID != "" {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 	if questionInfo.AnswerCount > 0 {
-		return errors.BadRequest(reason.UnauthorizedError)
+		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 
 	questionInfo.Status = entity.QuestionStatusDeleted

From 05094137799f34bea1ff040f6675f95c7320ea05 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:21:46 +0800
Subject: [PATCH 013/194] fix en_us

---
 i18n/en_US.yaml | 170 ++++++++++++++++++++++++------------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index af042916..486795cb 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -20,92 +20,92 @@ backend:
   email_or_password_wrong_error: &email_or_password_wrong
     other: "Email and password do not match."
 
-error:
-  admin:
-    email_or_password_wrong: *email_or_password_wrong
-  answer:
-    not_found:
-      other: "Answer do not found."
-    cannot_deleted:
-      other: "Unable to delete answer."
-  comment:
-    edit_without_permission:
-      other: "Comment are not allowed to edit."
-    not_found:
-      other: "Comment not found."
-  email:
-    duplicate:
-      other: "Email already exists."
-    need_to_be_verified:
-      other: "Email should be verified."
-    verify_url_expired:
-      other: "Email verified URL has expired, please resend the email."
-  lang:
-    not_found:
-      other: "Language file not found."
-  object:
-    captcha_verification_failed:
-      other: "Captcha wrong."
-    disallow_follow:
-      other: "You are not allowed to follow."
-    disallow_vote:
-      other: "You are not allowed to vote."
-    disallow_vote_your_self:
-      other: "You can't vote for your own post."
-    not_found:
-      other: "Object not found."
-    verification_failed:
-      other: "Verification failed."
-    email_or_password_incorrect:
-      other: "Email and password do not match."
-    old_password_verification_failed:
-      other: "The old password verification failed"
-    new_password_same_as_previous_setting:
-      other: "The new password is the same as the previous one."
-  question:
-    not_found:
-      other: "Question not found."
-    cannot_deleted:
-      other: "Unable to delete problem."
-  rank:
-    fail_to_meet_the_condition:
-      other: "Rank fail to meet the condition."
-  report:
-    handle_failed:
-      other: "Report handle failed."
-    not_found:
-      other: "Report not found."
-  tag:
-    not_found:
-      other: "Tag not found."
-  theme:
-    not_found:
-      other: "Theme not found."
-  user:
-    email_or_password_wrong:
-      other: *email_or_password_wrong
-    not_found:
-      other: "User not found."
-    suspended:
-      other: "User has been suspended."
-    username_invalid:
-      other: "Username is invalid."
-    username_duplicate:
-      other: "Username is already in use."
-    set_avatar:
-      other: "Avatar set failed."
+  error:
+    admin:
+      email_or_password_wrong: *email_or_password_wrong
+    answer:
+      not_found:
+        other: "Answer do not found."
+      cannot_deleted:
+        other: "Unable to delete answer."
+    comment:
+      edit_without_permission:
+        other: "Comment are not allowed to edit."
+      not_found:
+        other: "Comment not found."
+    email:
+      duplicate:
+        other: "Email already exists."
+      need_to_be_verified:
+        other: "Email should be verified."
+      verify_url_expired:
+        other: "Email verified URL has expired, please resend the email."
+    lang:
+      not_found:
+        other: "Language file not found."
+    object:
+      captcha_verification_failed:
+        other: "Captcha wrong."
+      disallow_follow:
+        other: "You are not allowed to follow."
+      disallow_vote:
+        other: "You are not allowed to vote."
+      disallow_vote_your_self:
+        other: "You can't vote for your own post."
+      not_found:
+        other: "Object not found."
+      verification_failed:
+        other: "Verification failed."
+      email_or_password_incorrect:
+        other: "Email and password do not match."
+      old_password_verification_failed:
+        other: "The old password verification failed"
+      new_password_same_as_previous_setting:
+        other: "The new password is the same as the previous one."
+    question:
+      not_found:
+        other: "Question not found."
+      cannot_deleted:
+        other: "Unable to delete problem."
+    rank:
+      fail_to_meet_the_condition:
+        other: "Rank fail to meet the condition."
+    report:
+      handle_failed:
+        other: "Report handle failed."
+      not_found:
+        other: "Report not found."
+    tag:
+      not_found:
+        other: "Tag not found."
+    theme:
+      not_found:
+        other: "Theme not found."
+    user:
+      email_or_password_wrong:
+        other: *email_or_password_wrong
+      not_found:
+        other: "User not found."
+      suspended:
+        other: "User has been suspended."
+      username_invalid:
+        other: "Username is invalid."
+      username_duplicate:
+        other: "Username is already in use."
+      set_avatar:
+        other: "Avatar set failed."
 
-    config:
-      read_config_failed:
-        other: "Read config failed"
-    database:
-      connection_failed:
-        other: "Database connection failed"
-      create_table_failed:
-        other: "Create table failed"
-    install:
-      create_config_failed:
-        other: "Can’t create the config.yaml file."
+      config:
+        read_config_failed:
+          other: "Read config failed"
+      database:
+        connection_failed:
+          other: "Database connection failed"
+        create_table_failed:
+          other: "Create table failed"
+      install:
+        create_config_failed:
+          other: "Can’t create the config.yaml file."
   report:
     spam:
       name:

From 6b983d472d404cd74eadcb2a4b3c8eeeff5a657b Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 11:37:37 +0800
Subject: [PATCH 014/194] fix tag update error

---
 i18n/en_US.yaml                           |  2 +
 internal/base/reason/reason.go            | 65 ++++++++++++-----------
 internal/service/question_service.go      | 18 +++++--
 internal/service/tag_common/tag_common.go |  2 +-
 4 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 26bef9a4..06e450a1 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -76,6 +76,8 @@ backend:
         other: "Tag not found."
       recommend_tag_not_found:
         other: "Recommend Tag is not exist."
+      recommend_tag_enter:
+        other: "Please enter at least one required tag."
       not_contain_synonym_tags:
         other: "Should not contain synonym tags."
     theme:
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 23e7bae2..c5bcd9a6 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -14,38 +14,39 @@ const (
 )
 
 const (
-	EmailOrPasswordWrong         = "error.object.email_or_password_incorrect"
-	CommentNotFound              = "error.comment.not_found"
-	QuestionNotFound             = "error.question.not_found"
-	AnswerNotFound               = "error.answer.not_found"
-	CommentEditWithoutPermission = "error.comment.edit_without_permission"
-	DisallowVote                 = "error.object.disallow_vote"
-	DisallowFollow               = "error.object.disallow_follow"
-	DisallowVoteYourSelf         = "error.object.disallow_vote_your_self"
-	CaptchaVerificationFailed    = "error.object.captcha_verification_failed"
+	EmailOrPasswordWrong             = "error.object.email_or_password_incorrect"
+	CommentNotFound                  = "error.comment.not_found"
+	QuestionNotFound                 = "error.question.not_found"
+	AnswerNotFound                   = "error.answer.not_found"
+	CommentEditWithoutPermission     = "error.comment.edit_without_permission"
+	DisallowVote                     = "error.object.disallow_vote"
+	DisallowFollow                   = "error.object.disallow_follow"
+	DisallowVoteYourSelf             = "error.object.disallow_vote_your_self"
+	CaptchaVerificationFailed        = "error.object.captcha_verification_failed"
 	OldPasswordVerificationFailed    = "error.object.old_password_verification_failed"
 	NewPasswordSameAsPreviousSetting = "error.object.new_password_same_as_previous_setting"
-	UserNotFound                 = "error.user.not_found"
-	UsernameInvalid              = "error.user.username_invalid"
-	UsernameDuplicate            = "error.user.username_duplicate"
-	UserSetAvatar                = "error.user.set_avatar"
-	EmailDuplicate               = "error.email.duplicate"
-	EmailVerifyURLExpired        = "error.email.verify_url_expired"
-	EmailNeedToBeVerified        = "error.email.need_to_be_verified"
-	UserSuspended                = "error.user.suspended"
-	ObjectNotFound               = "error.object.not_found"
-	TagNotFound                  = "error.tag.not_found"
-	TagNotContainSynonym         = "error.tag.not_contain_synonym_tags"
-	RankFailToMeetTheCondition   = "error.rank.fail_to_meet_the_condition"
-	ThemeNotFound                = "error.theme.not_found"
-	LangNotFound                 = "error.lang.not_found"
-	ReportHandleFailed           = "error.report.handle_failed"
-	ReportNotFound               = "error.report.not_found"
-	ReadConfigFailed             = "error.config.read_config_failed"
-	DatabaseConnectionFailed     = "error.database.connection_failed"
-	InstallCreateTableFailed     = "error.database.create_table_failed"
-	InstallConfigFailed          = "error.install.create_config_failed"
-	SiteInfoNotFound             = "error.site_info.not_found"
-	UploadFileSourceUnsupported  = "error.upload.source_unsupported"
-	RecommendTagNotExist         = "error.tag.recommend_tag_not_found"
+	UserNotFound                     = "error.user.not_found"
+	UsernameInvalid                  = "error.user.username_invalid"
+	UsernameDuplicate                = "error.user.username_duplicate"
+	UserSetAvatar                    = "error.user.set_avatar"
+	EmailDuplicate                   = "error.email.duplicate"
+	EmailVerifyURLExpired            = "error.email.verify_url_expired"
+	EmailNeedToBeVerified            = "error.email.need_to_be_verified"
+	UserSuspended                    = "error.user.suspended"
+	ObjectNotFound                   = "error.object.not_found"
+	TagNotFound                      = "error.tag.not_found"
+	TagNotContainSynonym             = "error.tag.not_contain_synonym_tags"
+	RankFailToMeetTheCondition       = "error.rank.fail_to_meet_the_condition"
+	ThemeNotFound                    = "error.theme.not_found"
+	LangNotFound                     = "error.lang.not_found"
+	ReportHandleFailed               = "error.report.handle_failed"
+	ReportNotFound                   = "error.report.not_found"
+	ReadConfigFailed                 = "error.config.read_config_failed"
+	DatabaseConnectionFailed         = "error.database.connection_failed"
+	InstallCreateTableFailed         = "error.database.create_table_failed"
+	InstallConfigFailed              = "error.install.create_config_failed"
+	SiteInfoNotFound                 = "error.site_info.not_found"
+	UploadFileSourceUnsupported      = "error.upload.source_unsupported"
+	RecommendTagNotExist             = "error.tag.recommend_tag_not_found"
+	RecommendTagEnter                = "error.tag.recommend_tag_enter"
 )
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 6f36fbe7..3811c8ae 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -227,6 +227,15 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 
+	recommendExist, err := qs.tagCommon.ExistRecommend(ctx, req.Tags)
+	if err != nil {
+		return
+	}
+	if !recommendExist {
+		err = errors.BadRequest(reason.RecommendTagEnter).WithError(err).WithStack()
+		return
+	}
+
 	//CheckChangeTag
 	oldTags, err := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
 	if err != nil {
@@ -240,9 +249,10 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if err != nil {
 		return
 	}
-	CheckTag, CheckTaglist := qs.CheckChangeTag(ctx, oldTags, Tags)
+
+	CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
 	if !CheckTag {
-		err = errors.BadRequest(reason.UnauthorizedError).WithMsg(fmt.Sprintf("tag [%s] cannot be modified",
+		err = errors.BadRequest(reason.RequestFormatError).WithMsg(fmt.Sprintf("The reserved tag \"%s\" must be present.",
 			strings.Join(CheckTaglist, ",")))
 		return
 	}
@@ -299,8 +309,8 @@ func (qs *QuestionService) ChangeTag(ctx context.Context, objectTagData *schema.
 	return qs.tagCommon.ObjectChangeTag(ctx, objectTagData)
 }
 
-func (qs *QuestionService) CheckChangeTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
-	return qs.tagCommon.ObjectCheckChangeTag(ctx, oldobjectTagData, objectTagData)
+func (qs *QuestionService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
+	return qs.tagCommon.CheckChangeReservedTag(ctx, oldobjectTagData, objectTagData)
 }
 
 func (qs *QuestionService) SearchUserList(ctx context.Context, userName, order string, page, pageSize int, loginUserID string) ([]*schema.UserQuestionInfo, int64, error) {
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 42a156a7..3b3efc34 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -403,7 +403,7 @@ func (ts *TagCommonService) CheckTag(ctx context.Context, tags []string, userID
 	return nil
 }
 
-func (ts *TagCommonService) ObjectCheckChangeTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
+func (ts *TagCommonService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
 	reservedTagsMap := make(map[string]bool)
 	needTagsMap := make([]string, 0)
 	for _, tag := range objectTagData {

From 4f1762f01a24c8280ba38b07a62b1517721a8265 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:13:55 +0800
Subject: [PATCH 015/194] fix question delete

---
 i18n/en_US.yaml                      |  4 ++--
 internal/service/question_service.go | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 01a89c0a..2c0908ad 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -25,7 +25,7 @@ error:
     not_found:
       other: "Answer do not found."
     cannot_deleted:
-      other: "Unable to delete answer."
+      other: "No permission to delete."
   comment:
     edit_without_permission:
       other: "Comment are not allowed to edit."
@@ -64,7 +64,7 @@ error:
     not_found:
       other: "Question not found."
     cannot_deleted:
-      other: "Unable to delete problem."
+      other: "No permission to delete."
   rank:
     fail_to_meet_the_condition:
       other: "Rank fail to meet the condition."
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 259ae2f2..2f440ca6 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -167,13 +167,27 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 
-	if questionInfo.AcceptedAnswerID != "" {
+	if questionInfo.AcceptedAnswerID != "0" {
 		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 	if questionInfo.AnswerCount > 0 {
 		return errors.BadRequest(reason.QuestionCannotDeleted)
 	}
 
+	if questionInfo.AnswerCount == 1 {
+		answersearch := &entity.AnswerSearch{}
+		answersearch.QuestionID = req.ID
+		answerList, _, err := qs.questioncommon.AnswerCommon.Search(ctx, answersearch)
+		if err != nil {
+			return err
+		}
+		for _, answer := range answerList {
+			if answer.VoteCount > 0 {
+				return errors.BadRequest(reason.QuestionCannotDeleted)
+			}
+		}
+	}
+
 	questionInfo.Status = entity.QuestionStatusDeleted
 	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
 	if err != nil {

From f216536e263de4beb95b9fb5a0286cf8032d6b1e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:22:30 +0800
Subject: [PATCH 016/194] update question delete

---
 internal/controller/question_controller.go |  2 ++
 internal/schema/question_schema.go         |  7 ++--
 internal/service/question_service.go       | 42 +++++++++++-----------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 281a7e1b..ff8a6eba 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -46,6 +46,8 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 
 	err := qc.questionService.RemoveQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 29b85be8..9005f07a 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -3,8 +3,9 @@ package schema
 // RemoveQuestionReq delete question request
 type RemoveQuestionReq struct {
 	// question id
-	ID     string `validate:"required" comment:"question id" json:"id"`
-	UserID string `json:"-" ` // user_id
+	ID      string `validate:"required" comment:"question id" json:"id"`
+	UserID  string `json:"-" ` // user_id
+	IsAdmin bool   `json:"-"`
 }
 
 type CloseQuestionReq struct {
@@ -169,7 +170,7 @@ type CmsQuestionSearch struct {
 	Page      int    `json:"page" form:"page"`           // Query number of pages
 	PageSize  int    `json:"page_size" form:"page_size"` // Search page size
 	Status    int    `json:"-" form:"-"`
-	StatusStr string `json:"status" form:"status"` // Status 1 Available 2 closed 10 UserDeleted
+	StatusStr string `json:"status" form:"status"`                                  // Status 1 Available 2 closed 10 UserDeleted
 	Query     string `validate:"omitempty,gt=0,lte=100" json:"query" form:"query" ` //Query string
 }
 
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 4abfe08a..931bb940 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -174,27 +174,29 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 	if !has {
 		return nil
 	}
-	if questionInfo.UserID != req.UserID {
-		return errors.BadRequest(reason.QuestionCannotDeleted)
-	}
-
-	if questionInfo.AcceptedAnswerID != "0" {
-		return errors.BadRequest(reason.QuestionCannotDeleted)
-	}
-	if questionInfo.AnswerCount > 0 {
-		return errors.BadRequest(reason.QuestionCannotDeleted)
-	}
-
-	if questionInfo.AnswerCount == 1 {
-		answersearch := &entity.AnswerSearch{}
-		answersearch.QuestionID = req.ID
-		answerList, _, err := qs.questioncommon.AnswerCommon.Search(ctx, answersearch)
-		if err != nil {
-			return err
+	if !req.IsAdmin {
+		if questionInfo.UserID != req.UserID {
+			return errors.BadRequest(reason.QuestionCannotDeleted)
 		}
-		for _, answer := range answerList {
-			if answer.VoteCount > 0 {
-				return errors.BadRequest(reason.QuestionCannotDeleted)
+
+		if questionInfo.AcceptedAnswerID != "0" {
+			return errors.BadRequest(reason.QuestionCannotDeleted)
+		}
+		if questionInfo.AnswerCount > 0 {
+			return errors.BadRequest(reason.QuestionCannotDeleted)
+		}
+
+		if questionInfo.AnswerCount == 1 {
+			answersearch := &entity.AnswerSearch{}
+			answersearch.QuestionID = req.ID
+			answerList, _, err := qs.questioncommon.AnswerCommon.Search(ctx, answersearch)
+			if err != nil {
+				return err
+			}
+			for _, answer := range answerList {
+				if answer.VoteCount > 0 {
+					return errors.BadRequest(reason.QuestionCannotDeleted)
+				}
 			}
 		}
 	}

From ac9aaaac83d786c147e62eaf09a73bec63770fed Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:26:49 +0800
Subject: [PATCH 017/194] en_US.yaml

---
 i18n/en_US.yaml | 183 ++++++++++++++++++++++++------------------------
 1 file changed, 91 insertions(+), 92 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 6894ca4c..1eff3012 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -12,7 +12,6 @@ backend:
     database_error:
       other: "Data server error."
 
-<<<<<<<<< Temporary merge branch 1
   email:
     other: "Email"
   password:
@@ -21,98 +20,98 @@ backend:
   email_or_password_wrong_error: &email_or_password_wrong
     other: "Email and password do not match."
 
-error:
-  admin:
-    email_or_password_wrong: *email_or_password_wrong
-  answer:
-    not_found:
-      other: "Answer do not found."
-    cannot_deleted:
-      other: "No permission to delete."
-  comment:
-    edit_without_permission:
-      other: "Comment are not allowed to edit."
-    not_found:
-      other: "Comment not found."
-  email:
-    duplicate:
-      other: "Email already exists."
-    need_to_be_verified:
-      other: "Email should be verified."
-    verify_url_expired:
-      other: "Email verified URL has expired, please resend the email."
-  lang:
-    not_found:
-      other: "Language file not found."
-  object:
-    captcha_verification_failed:
-      other: "Captcha wrong."
-    disallow_follow:
-      other: "You are not allowed to follow."
-    disallow_vote:
-      other: "You are not allowed to vote."
-    disallow_vote_your_self:
-      other: "You can't vote for your own post."
-    not_found:
-      other: "Object not found."
-    verification_failed:
-      other: "Verification failed."
-    email_or_password_incorrect:
-      other: "Email and password do not match."
-    old_password_verification_failed:
-      other: "The old password verification failed"
-    new_password_same_as_previous_setting:
-      other: "The new password is the same as the previous one."
-  question:
-    not_found:
-      other: "Question not found."
-    cannot_deleted:
-      other: "No permission to delete."
-  rank:
-    fail_to_meet_the_condition:
-      other: "Rank fail to meet the condition."
-  report:
-    handle_failed:
-      other: "Report handle failed."
-    not_found:
-      other: "Report not found."
-  tag:
-    not_found:
-      other: "Tag not found."
-    recommend_tag_not_found:
-      other: "Recommend Tag is not exist."
-    recommend_tag_enter:
-      other: "Please enter at least one required tag."
-    not_contain_synonym_tags:
-        other: "Should not contain synonym tags."
-  theme:
-    not_found:
-      other: "Theme not found."
-  user:
-    email_or_password_wrong:
-      other: *email_or_password_wrong
-    not_found:
-      other: "User not found."
-    suspended:
-      other: "User has been suspended."
-    username_invalid:
-      other: "Username is invalid."
-    username_duplicate:
-      other: "Username is already in use."
-    set_avatar:
-      other: "Avatar set failed."
+  error:
+    admin:
+      email_or_password_wrong: *email_or_password_wrong
+    answer:
+      not_found:
+        other: "Answer do not found."
+      cannot_deleted:
+        other: "No permission to delete."
+    comment:
+      edit_without_permission:
+        other: "Comment are not allowed to edit."
+      not_found:
+        other: "Comment not found."
+    email:
+      duplicate:
+        other: "Email already exists."
+      need_to_be_verified:
+        other: "Email should be verified."
+      verify_url_expired:
+        other: "Email verified URL has expired, please resend the email."
+    lang:
+      not_found:
+        other: "Language file not found."
+    object:
+      captcha_verification_failed:
+        other: "Captcha wrong."
+      disallow_follow:
+        other: "You are not allowed to follow."
+      disallow_vote:
+        other: "You are not allowed to vote."
+      disallow_vote_your_self:
+        other: "You can't vote for your own post."
+      not_found:
+        other: "Object not found."
+      verification_failed:
+        other: "Verification failed."
+      email_or_password_incorrect:
+        other: "Email and password do not match."
+      old_password_verification_failed:
+        other: "The old password verification failed"
+      new_password_same_as_previous_setting:
+        other: "The new password is the same as the previous one."
+    question:
+      not_found:
+        other: "Question not found."
+      cannot_deleted:
+        other: "No permission to delete."
+    rank:
+      fail_to_meet_the_condition:
+        other: "Rank fail to meet the condition."
+    report:
+      handle_failed:
+        other: "Report handle failed."
+      not_found:
+        other: "Report not found."
+    tag:
+      not_found:
+        other: "Tag not found."
+      recommend_tag_not_found:
+        other: "Recommend Tag is not exist."
+      recommend_tag_enter:
+        other: "Please enter at least one required tag."
+      not_contain_synonym_tags:
+          other: "Should not contain synonym tags."
+    theme:
+      not_found:
+        other: "Theme not found."
+    user:
+      email_or_password_wrong:
+        other: *email_or_password_wrong
+      not_found:
+        other: "User not found."
+      suspended:
+        other: "User has been suspended."
+      username_invalid:
+        other: "Username is invalid."
+      username_duplicate:
+        other: "Username is already in use."
+      set_avatar:
+        other: "Avatar set failed."
 
-      config:
-        read_config_failed:
-          other: "Read config failed"
-      database:
-        connection_failed:
-          other: "Database connection failed"
-        create_table_failed:
-          other: "Create table failed"
-      install:
-        create_config_failed:
-          other: "Can’t create the config.yaml file."
+        config:
+          read_config_failed:
+            other: "Read config failed"
+        database:
+          connection_failed:
+            other: "Database connection failed"
+          create_table_failed:
+            other: "Create table failed"
+        install:
+          create_config_failed:
+            other: "Can’t create the config.yaml file."
   report:
     spam:
       name:

From 19f507be2d658063f8e31cbd428be303136cc46d Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:28:15 +0800
Subject: [PATCH 018/194] fix en_US.yaml

---
 i18n/en_US.yaml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 1eff3012..d327fa48 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -100,18 +100,17 @@ backend:
         other: "Username is already in use."
       set_avatar:
         other: "Avatar set failed."
-
-        config:
-          read_config_failed:
-            other: "Read config failed"
-        database:
-          connection_failed:
-            other: "Database connection failed"
-          create_table_failed:
-            other: "Create table failed"
-        install:
-          create_config_failed:
-            other: "Can’t create the config.yaml file."
+      config:
+        read_config_failed:
+          other: "Read config failed"
+      database:
+        connection_failed:
+          other: "Database connection failed"
+        create_table_failed:
+          other: "Create table failed"
+      install:
+        create_config_failed:
+          other: "Can’t create the config.yaml file."
   report:
     spam:
       name:

From ecce2b10e6d59fe7890ce525ab0e22ffa66a75c6 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 22 Nov 2022 16:48:40 +0800
Subject: [PATCH 019/194] feat(review): review page template

---
 i18n/en_US.yaml                               | 12 +++
 ui/src/components/Empty/index.tsx             | 14 ++--
 .../Header/components/NavItems/index.tsx      |  6 ++
 ui/src/components/Header/index.tsx            |  3 -
 ui/src/pages/Review/index.tsx                 | 74 +++++++++++++++++++
 ui/src/router/routes.ts                       |  7 +-
 6 files changed, 106 insertions(+), 10 deletions(-)
 create mode 100644 ui/src/pages/Review/index.tsx

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index faa0cf7a..9bbf5d6b 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -517,6 +517,7 @@ ui:
       setting: Settings
       logout: Log out
       admin: Admin
+      review: Review
     search:
       placeholder: Search
   footer:
@@ -726,6 +727,9 @@ ui:
     logout: Log out
     verify: Verify
     add_question: Add question
+    approve: Approve
+    reject: Reject
+    skip: Skip
   search:
     title: Search Results
     keywords: Keywords
@@ -1173,3 +1177,11 @@ ui:
     invalid: is invalid
     btn_submit: Save
     not_found_props: "Required property {{ key }} not found."
+  page_review:
+    review: Reivew
+    proposed: proposed
+    question_edit: Question edit
+    answer_edit: Answer edit
+    tag_edit: Tag edit
+    edit_summary: Edit summary
+    empty: No review tasks left.
diff --git a/ui/src/components/Empty/index.tsx b/ui/src/components/Empty/index.tsx
index dc1ef0a7..82fe87ea 100644
--- a/ui/src/components/Empty/index.tsx
+++ b/ui/src/components/Empty/index.tsx
@@ -1,13 +1,15 @@
-import { FC, memo } from 'react';
+import { FC, memo, ReactNode } from 'react';
 import { Trans } from 'react-i18next';
 
-const Index: FC = () => {
+const Index: FC<{ children?: ReactNode }> = ({ children }) => {
   return (
     <div className="text-center py-5">
-      <Trans i18nKey="personal.list_empty">
-        We couldn't find anything. <br /> Try different or less specific
-        keywords.
-      </Trans>
+      {children || (
+        <Trans i18nKey="personal.list_empty">
+          We couldn't find anything. <br /> Try different or less specific
+          keywords.
+        </Trans>
+      )}
     </div>
   );
 };
diff --git a/ui/src/components/Header/components/NavItems/index.tsx b/ui/src/components/Header/components/NavItems/index.tsx
index 17e1bc64..147d3d58 100644
--- a/ui/src/components/Header/components/NavItems/index.tsx
+++ b/ui/src/components/Header/components/NavItems/index.tsx
@@ -56,6 +56,12 @@ const Index: FC<Props> = ({ redDot, userInfo, logOut }) => {
           {userInfo?.is_admin ? (
             <Dropdown.Item href="/admin">{t('header.nav.admin')}</Dropdown.Item>
           ) : null}
+          {/* TODO: use review permission */}
+          {userInfo?.is_admin ? (
+            <Dropdown.Item href="/review">
+              {t('header.nav.review')}
+            </Dropdown.Item>
+          ) : null}
           <Dropdown.Divider />
           <Dropdown.Item onClick={logOut}>
             {t('header.nav.logout')}
diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsx
index f6537d74..0a841797 100644
--- a/ui/src/components/Header/index.tsx
+++ b/ui/src/components/Header/index.tsx
@@ -122,9 +122,6 @@ const Header: FC = () => {
               <NavLink className="nav-link" to="/tags">
                 {t('header.nav.tag')}
               </NavLink>
-              <NavLink className="nav-link d-none" to="/users">
-                {t('header.nav.user')}
-              </NavLink>
             </Nav>
           </Col>
           <hr className="hr lg-none mt-2" />
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
new file mode 100644
index 00000000..6bb008ea
--- /dev/null
+++ b/ui/src/pages/Review/index.tsx
@@ -0,0 +1,74 @@
+import { FC } from 'react';
+import {
+  Container,
+  Row,
+  Col,
+  Alert,
+  Badge,
+  Stack,
+  Button,
+} from 'react-bootstrap';
+import { Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+
+import { BaseUserCard, FormatTime, Empty } from '@/components';
+import { loggedUserInfoStore } from '@/stores';
+
+const Index: FC = () => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+
+  const { user } = loggedUserInfoStore.getState();
+  return (
+    <Container className="pt-2 mt-4 mb-5">
+      <Row>
+        <Col lg={{ span: 7, offset: 1 }}>
+          <h3 className="mb-4">{t('review')}</h3>
+          <Alert variant="secondary">
+            <Stack className="align-items-start">
+              <Badge bg="secondary" className="mb-2">
+                {t('question_edit')}
+              </Badge>
+              <Link to="/review">
+                How do I test whether variable against multiple
+              </Link>
+              <p className="mb-0">
+                {t('edit_summary')}: Editing part of the code and correcting the
+                grammar.
+              </p>
+            </Stack>
+            <Stack
+              direction="horizontal"
+              gap={1}
+              className="align-items-baseline mt-2">
+              <BaseUserCard data={user} avatarSize="24" />
+              <FormatTime
+                time={Date.now()}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            </Stack>
+          </Alert>
+        </Col>
+        <Col lg={{ span: 7, offset: 1 }}>Content</Col>
+        <Col lg={{ span: 7, offset: 1 }}>
+          <Stack direction="horizontal" gap={2}>
+            <Button variant="outline-primary">
+              {t('approve', { keyPrefix: 'btns' })}
+            </Button>
+            <Button variant="outline-primary">
+              {t('reject', { keyPrefix: 'btns' })}
+            </Button>
+            <Button variant="outline-primary">
+              {t('skip', { keyPrefix: 'btns' })}
+            </Button>
+          </Stack>
+        </Col>
+        <Col lg={{ span: 7, offset: 1 }}>
+          <Empty>{t('empty')}</Empty>
+        </Col>
+      </Row>
+    </Container>
+  );
+};
+
+export default Index;
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index be7e61ac..1ceff1bc 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -83,7 +83,7 @@ const routes: RouteNode[] = [
           return guard.activated();
         },
       },
-      // users
+      // for users
       {
         path: 'users/:username',
         page: 'pages/Users/Personal',
@@ -264,6 +264,11 @@ const routes: RouteNode[] = [
           },
         ],
       },
+      // for review
+      {
+        path: 'review',
+        page: 'pages/Review',
+      },
       {
         path: '*',
         page: 'pages/404',

From 26768223312a5a61c89b848c9e0c7f1b39000f8e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:54:28 +0800
Subject: [PATCH 020/194] fix question answer delete

---
 i18n/en_US.yaml                            | 176 +++++++++++----------
 internal/base/reason/reason.go             |  71 +++++----
 internal/controller/answer_controller.go   |   5 +-
 internal/controller/question_controller.go |   5 +-
 internal/schema/answer_schema.go           |   4 +-
 internal/schema/question_schema.go         |   4 +-
 internal/service/answer_service.go         |  57 ++++---
 internal/service/question_service.go       |  13 +-
 8 files changed, 189 insertions(+), 146 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index c3ccf96a..1cd93624 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -20,92 +20,98 @@ backend:
   email_or_password_wrong_error: &email_or_password_wrong
     other: "Email and password do not match."
 
-error:
-  admin:
-    email_or_password_wrong: *email_or_password_wrong
-  answer:
-    not_found:
-      other: "Answer do not found."
-    cannot_deleted:
-      other: "No permission to delete."
-  comment:
-    edit_without_permission:
-      other: "Comment are not allowed to edit."
-    not_found:
-      other: "Comment not found."
-  email:
-    duplicate:
-      other: "Email already exists."
-    need_to_be_verified:
-      other: "Email should be verified."
-    verify_url_expired:
-      other: "Email verified URL has expired, please resend the email."
-  lang:
-    not_found:
-      other: "Language file not found."
-  object:
-    captcha_verification_failed:
-      other: "Captcha wrong."
-    disallow_follow:
-      other: "You are not allowed to follow."
-    disallow_vote:
-      other: "You are not allowed to vote."
-    disallow_vote_your_self:
-      other: "You can't vote for your own post."
-    not_found:
-      other: "Object not found."
-    verification_failed:
-      other: "Verification failed."
-    email_or_password_incorrect:
-      other: "Email and password do not match."
-    old_password_verification_failed:
-      other: "The old password verification failed"
-    new_password_same_as_previous_setting:
-      other: "The new password is the same as the previous one."
-  question:
-    not_found:
-      other: "Question not found."
-    cannot_deleted:
-      other: "No permission to delete."
-  rank:
-    fail_to_meet_the_condition:
-      other: "Rank fail to meet the condition."
-  report:
-    handle_failed:
-      other: "Report handle failed."
-    not_found:
-      other: "Report not found."
-  tag:
-    not_found:
-      other: "Tag not found."
-  theme:
-    not_found:
-      other: "Theme not found."
-  user:
-    email_or_password_wrong:
-      other: *email_or_password_wrong
-    not_found:
-      other: "User not found."
-    suspended:
-      other: "User has been suspended."
-    username_invalid:
-      other: "Username is invalid."
-    username_duplicate:
-      other: "Username is already in use."
-    set_avatar:
-      other: "Avatar set failed."
+  error:
+    admin:
+      email_or_password_wrong: *email_or_password_wrong
+    answer:
+      not_found:
+        other: "Answer do not found."
+      cannot_deleted:
+        other: "No permission to delete."
+      cannot_update:
+        other: "No permission to update."
+    comment:
+      edit_without_permission:
+        other: "Comment are not allowed to edit."
+      not_found:
+        other: "Comment not found."
+    email:
+      duplicate:
+        other: "Email already exists."
+      need_to_be_verified:
+        other: "Email should be verified."
+      verify_url_expired:
+        other: "Email verified URL has expired, please resend the email."
+    lang:
+      not_found:
+        other: "Language file not found."
+    object:
+      captcha_verification_failed:
+        other: "Captcha wrong."
+      disallow_follow:
+        other: "You are not allowed to follow."
+      disallow_vote:
+        other: "You are not allowed to vote."
+      disallow_vote_your_self:
+        other: "You can't vote for your own post."
+      not_found:
+        other: "Object not found."
+      verification_failed:
+        other: "Verification failed."
+      email_or_password_incorrect:
+        other: "Email and password do not match."
+      old_password_verification_failed:
+        other: "The old password verification failed"
+      new_password_same_as_previous_setting:
+        other: "The new password is the same as the previous one."
+    question:
+      not_found:
+        other: "Question not found."
+      cannot_deleted:
+        other: "No permission to delete."
+      cannot_close:
+        other: "No permission to close."
+      cannot_update:
+        other: "No permission to update."
+    rank:
+      fail_to_meet_the_condition:
+        other: "Rank fail to meet the condition."
+    report:
+      handle_failed:
+        other: "Report handle failed."
+      not_found:
+        other: "Report not found."
+    tag:
+      not_found:
+        other: "Tag not found."
+    theme:
+      not_found:
+        other: "Theme not found."
+    user:
+      email_or_password_wrong:
+        other: *email_or_password_wrong
+      not_found:
+        other: "User not found."
+      suspended:
+        other: "User has been suspended."
+      username_invalid:
+        other: "Username is invalid."
+      username_duplicate:
+        other: "Username is already in use."
+      set_avatar:
+        other: "Avatar set failed."
 
-    config:
-      read_config_failed:
-        other: "Read config failed"
-    database:
-      connection_failed:
-        other: "Database connection failed"
-      create_table_failed:
-        other: "Create table failed"
-    install:
-      create_config_failed:
-        other: "Can’t create the config.yaml file."
+      config:
+        read_config_failed:
+          other: "Read config failed"
+      database:
+        connection_failed:
+          other: "Database connection failed"
+        create_table_failed:
+          other: "Create table failed"
+      install:
+        create_config_failed:
+          other: "Can’t create the config.yaml file."
   report:
     spam:
       name:
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 7ac8f556..e8f6aded 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -14,40 +14,43 @@ const (
 )
 
 const (
-	EmailOrPasswordWrong         = "error.object.email_or_password_incorrect"
-	CommentNotFound              = "error.comment.not_found"
-	QuestionNotFound             = "error.question.not_found"
-	QuestionCannotDeleted        = "error.question.cannot_deleted"
-	AnswerNotFound               = "error.answer.not_found"
-	AnswerCannotDeleted          = "error.answer.cannot_deleted"
-	CommentEditWithoutPermission = "error.comment.edit_without_permission"
-	DisallowVote                 = "error.object.disallow_vote"
-	DisallowFollow               = "error.object.disallow_follow"
-	DisallowVoteYourSelf         = "error.object.disallow_vote_your_self"
-	CaptchaVerificationFailed    = "error.object.captcha_verification_failed"
+	EmailOrPasswordWrong             = "error.object.email_or_password_incorrect"
+	CommentNotFound                  = "error.comment.not_found"
+	QuestionNotFound                 = "error.question.not_found"
+	QuestionCannotDeleted            = "error.question.cannot_deleted"
+	QuestionCannotClose              = "error.question.cannot_close"
+	QuestionCannotUpdate             = "error.question.cannot_update"
+	AnswerNotFound                   = "error.answer.not_found"
+	AnswerCannotDeleted              = "error.answer.cannot_deleted"
+	AnswerCannotUpdate               = "error.answer.cannot_update"
+	CommentEditWithoutPermission     = "error.comment.edit_without_permission"
+	DisallowVote                     = "error.object.disallow_vote"
+	DisallowFollow                   = "error.object.disallow_follow"
+	DisallowVoteYourSelf             = "error.object.disallow_vote_your_self"
+	CaptchaVerificationFailed        = "error.object.captcha_verification_failed"
 	OldPasswordVerificationFailed    = "error.object.old_password_verification_failed"
 	NewPasswordSameAsPreviousSetting = "error.object.new_password_same_as_previous_setting"
-	UserNotFound                 = "error.user.not_found"
-	UsernameInvalid              = "error.user.username_invalid"
-	UsernameDuplicate            = "error.user.username_duplicate"
-	UserSetAvatar                = "error.user.set_avatar"
-	EmailDuplicate               = "error.email.duplicate"
-	EmailVerifyURLExpired        = "error.email.verify_url_expired"
-	EmailNeedToBeVerified        = "error.email.need_to_be_verified"
-	UserSuspended                = "error.user.suspended"
-	ObjectNotFound               = "error.object.not_found"
-	TagNotFound                  = "error.tag.not_found"
-	TagNotContainSynonym         = "error.tag.not_contain_synonym_tags"
-	RankFailToMeetTheCondition   = "error.rank.fail_to_meet_the_condition"
-	ThemeNotFound                = "error.theme.not_found"
-	LangNotFound                 = "error.lang.not_found"
-	ReportHandleFailed           = "error.report.handle_failed"
-	ReportNotFound               = "error.report.not_found"
-	ReadConfigFailed             = "error.config.read_config_failed"
-	DatabaseConnectionFailed     = "error.database.connection_failed"
-	InstallCreateTableFailed     = "error.database.create_table_failed"
-	InstallConfigFailed          = "error.install.create_config_failed"
-	SiteInfoNotFound             = "error.site_info.not_found"
-	UploadFileSourceUnsupported  = "error.upload.source_unsupported"
-	RecommendTagNotExist         = "error.tag.recommend_tag_not_found"
+	UserNotFound                     = "error.user.not_found"
+	UsernameInvalid                  = "error.user.username_invalid"
+	UsernameDuplicate                = "error.user.username_duplicate"
+	UserSetAvatar                    = "error.user.set_avatar"
+	EmailDuplicate                   = "error.email.duplicate"
+	EmailVerifyURLExpired            = "error.email.verify_url_expired"
+	EmailNeedToBeVerified            = "error.email.need_to_be_verified"
+	UserSuspended                    = "error.user.suspended"
+	ObjectNotFound                   = "error.object.not_found"
+	TagNotFound                      = "error.tag.not_found"
+	TagNotContainSynonym             = "error.tag.not_contain_synonym_tags"
+	RankFailToMeetTheCondition       = "error.rank.fail_to_meet_the_condition"
+	ThemeNotFound                    = "error.theme.not_found"
+	LangNotFound                     = "error.lang.not_found"
+	ReportHandleFailed               = "error.report.handle_failed"
+	ReportNotFound                   = "error.report.not_found"
+	ReadConfigFailed                 = "error.config.read_config_failed"
+	DatabaseConnectionFailed         = "error.database.connection_failed"
+	InstallCreateTableFailed         = "error.database.create_table_failed"
+	InstallConfigFailed              = "error.install.create_config_failed"
+	SiteInfoNotFound                 = "error.site_info.not_found"
+	UploadFileSourceUnsupported      = "error.upload.source_unsupported"
+	RecommendTagNotExist             = "error.tag.recommend_tag_not_found"
 )
diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 6db77008..ff0b3ff2 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -55,7 +55,8 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
-
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 	err := ac.answerService.RemoveAnswer(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
@@ -147,6 +148,8 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 
 	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerEditRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index ff8a6eba..4d7e2366 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -69,6 +69,8 @@ func (qc *QuestionController) CloseQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 	err := qc.questionService.CloseQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
@@ -215,7 +217,8 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 0c396865..390f90dc 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -5,7 +5,8 @@ type RemoveAnswerReq struct {
 	// answer id
 	ID string `validate:"required" json:"id"`
 	// user id
-	UserID string `json:"-"`
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"-"`
 }
 
 const (
@@ -28,6 +29,7 @@ type AnswerUpdateReq struct {
 	Content     string `json:"content"`                           // content
 	HTML        string `json:"html" `                             // html
 	EditSummary string `validate:"omitempty" json:"edit_summary"` // edit_summary
+	IsAdmin     bool   `json:"-"`
 }
 
 type AnswerList struct {
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 9005f07a..0669a7ec 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -13,6 +13,7 @@ type CloseQuestionReq struct {
 	UserID    string `json:"-" `          // user_id
 	CloseType int    `json:"close_type" ` // close_type
 	CloseMsg  string `json:"close_msg" `  // close_type
+	IsAdmin   bool   `json:"-"`
 }
 
 type CloseQuestionMeta struct {
@@ -47,7 +48,8 @@ type QuestionUpdate struct {
 	// edit summary
 	EditSummary string `validate:"omitempty" json:"edit_summary"`
 	// user id
-	UserID string `json:"-"`
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"-"`
 }
 
 type QuestionBaseInfo struct {
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index af7a1bd3..3fd37a3d 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -73,27 +73,29 @@ func (as *AnswerService) RemoveAnswer(ctx context.Context, req *schema.RemoveAns
 	if !exist {
 		return nil
 	}
-	if answerInfo.UserID != req.UserID {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	if answerInfo.VoteCount > 0 {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	if answerInfo.Adopted == schema.AnswerAdoptedEnable {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	questionInfo, exist, err := as.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
-	if err != nil {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	if !exist {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	if questionInfo.AnswerCount > 1 {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
-	}
-	if questionInfo.AcceptedAnswerID != "" {
-		return errors.BadRequest(reason.AnswerCannotDeleted)
+	if !req.IsAdmin {
+		if answerInfo.UserID != req.UserID {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		if answerInfo.VoteCount > 0 {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		if answerInfo.Adopted == schema.AnswerAdoptedEnable {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		questionInfo, exist, err := as.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
+		if err != nil {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		if !exist {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		if questionInfo.AnswerCount > 1 {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
+		if questionInfo.AcceptedAnswerID != "" {
+			return errors.BadRequest(reason.AnswerCannotDeleted)
+		}
 	}
 
 	// user add question count
@@ -180,6 +182,19 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	if !exist {
 		return "", errors.BadRequest(reason.QuestionNotFound)
 	}
+	if !req.IsAdmin {
+		answerInfo, exist, err := as.answerRepo.GetByID(ctx, req.ID)
+		if err != nil {
+			return "", err
+		}
+		if !exist {
+			return "", nil
+		}
+		if answerInfo.UserID != req.UserID {
+			return "", errors.BadRequest(reason.AnswerCannotUpdate)
+		}
+	}
+
 	now := time.Now()
 	insertData := new(entity.Answer)
 	insertData.ID = req.ID
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 931bb940..0409ff2d 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -71,6 +71,12 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 	if !has {
 		return nil
 	}
+
+	if !req.IsAdmin {
+		if questionInfo.UserID != req.UserID {
+			return errors.BadRequest(reason.QuestionCannotClose)
+		}
+	}
 	questionInfo.Status = entity.QuestionStatusclosed
 	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
 	if err != nil {
@@ -239,8 +245,11 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if !has {
 		return
 	}
-	if dbinfo.UserID != req.UserID {
-		return
+	if !req.IsAdmin {
+		if dbinfo.UserID != req.UserID {
+			return questionInfo, errors.BadRequest(reason.QuestionCannotUpdate)
+		}
+
 	}
 
 	//CheckChangeTag

From c8e20b15c8c87b3ee68f08bc03f8a60f2796c59c Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:58:31 +0800
Subject: [PATCH 021/194] fix en_us.yaml

---
 i18n/en_US.yaml | 176 ++++++++++++++++++++++++------------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 0e658fd3..04102618 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -20,103 +20,103 @@ backend:
   email_or_password_wrong_error: &email_or_password_wrong
     other: "Email and password do not match."
 
-    error:
-      admin:
-        email_or_password_wrong: *email_or_password_wrong
-      answer:
-        not_found:
-          other: "Answer do not found."
-        cannot_deleted:
-          other: "No permission to delete."
-      cannot_update:
-        other: "No permission to update."
-      comment:
-        edit_without_permission:
-          other: "Comment are not allowed to edit."
-        not_found:
-          other: "Comment not found."
-      email:
-        duplicate:
-          other: "Email already exists."
-        need_to_be_verified:
-          other: "Email should be verified."
-        verify_url_expired:
-          other: "Email verified URL has expired, please resend the email."
-      lang:
-        not_found:
-          other: "Language file not found."
-      object:
-        captcha_verification_failed:
-          other: "Captcha wrong."
-        disallow_follow:
-          other: "You are not allowed to follow."
-        disallow_vote:
-          other: "You are not allowed to vote."
-        disallow_vote_your_self:
-          other: "You can't vote for your own post."
-        not_found:
-          other: "Object not found."
-        verification_failed:
-          other: "Verification failed."
-        email_or_password_incorrect:
-          other: "Email and password do not match."
-        old_password_verification_failed:
-          other: "The old password verification failed"
-        new_password_same_as_previous_setting:
-          other: "The new password is the same as the previous one."
-      question:
-        not_found:
-          other: "Question not found."
-        cannot_deleted:
-          other: "No permission to delete."
+  error:
+    admin:
+      email_or_password_wrong: *email_or_password_wrong
+    answer:
+      not_found:
+        other: "Answer do not found."
+      cannot_deleted:
+        other: "No permission to delete."
+    cannot_update:
+      other: "No permission to update."
+    comment:
+      edit_without_permission:
+        other: "Comment are not allowed to edit."
+      not_found:
+        other: "Comment not found."
+    email:
+      duplicate:
+        other: "Email already exists."
+      need_to_be_verified:
+        other: "Email should be verified."
+      verify_url_expired:
+        other: "Email verified URL has expired, please resend the email."
+    lang:
+      not_found:
+        other: "Language file not found."
+    object:
+      captcha_verification_failed:
+        other: "Captcha wrong."
+      disallow_follow:
+        other: "You are not allowed to follow."
+      disallow_vote:
+        other: "You are not allowed to vote."
+      disallow_vote_your_self:
+        other: "You can't vote for your own post."
+      not_found:
+        other: "Object not found."
+      verification_failed:
+        other: "Verification failed."
+      email_or_password_incorrect:
+        other: "Email and password do not match."
+      old_password_verification_failed:
+        other: "The old password verification failed"
+      new_password_same_as_previous_setting:
+        other: "The new password is the same as the previous one."
+    question:
+      not_found:
+        other: "Question not found."
+      cannot_deleted:
+        other: "No permission to delete."
       cannot_close:
         other: "No permission to close."
       cannot_update:
         other: "No permission to update."
-      rank:
-        fail_to_meet_the_condition:
-          other: "Rank fail to meet the condition."
-      report:
-        handle_failed:
-          other: "Report handle failed."
-        not_found:
-          other: "Report not found."
-      tag:
-        not_found:
-          other: "Tag not found."
-        recommend_tag_not_found:
+    rank:
+      fail_to_meet_the_condition:
+        other: "Rank fail to meet the condition."
+    report:
+      handle_failed:
+        other: "Report handle failed."
+      not_found:
+        other: "Report not found."
+    tag:
+      not_found:
+        other: "Tag not found."
+      recommend_tag_not_found:
         other: "Recommend Tag is not exist."
       recommend_tag_enter:
         other: "Please enter at least one required tag."
       not_contain_synonym_tags:
-          other: "Should not contain synonym tags."
+        other: "Should not contain synonym tags."
     theme:
-        not_found:
-          other: "Theme not found."
-      user:
-        email_or_password_wrong:
-          other: *email_or_password_wrong
-        not_found:
-          other: "User not found."
-        suspended:
-          other: "User has been suspended."
-        username_invalid:
-          other: "Username is invalid."
-        username_duplicate:
-          other: "Username is already in use."
-        set_avatar:
-          other: "Avatar set failed."
-        config:
-          read_config_failed:
-            other: "Read config failed"
-        database:
-          connection_failed:
-            other: "Database connection failed"
-          create_table_failed:
-            other: "Create table failed"
-        install:
-          create_config_failed:
-            other: "Can’t create the config.yaml file."
+      not_found:
+        other: "Theme not found."
+    user:
+      email_or_password_wrong:
+        other: *email_or_password_wrong
+      not_found:
+        other: "User not found."
+      suspended:
+        other: "User has been suspended."
+      username_invalid:
+        other: "Username is invalid."
+      username_duplicate:
+        other: "Username is already in use."
+      set_avatar:
+        other: "Avatar set failed."
+      config:
+        read_config_failed:
+          other: "Read config failed"
+      database:
+        connection_failed:
+          other: "Database connection failed"
+        create_table_failed:
+          other: "Create table failed"
+      install:
+        create_config_failed:
+          other: "Can’t create the config.yaml file."
   report:
     spam:
       name:

From 0fac38860f12d98760ab3f78fa11fb7eece53118 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 17:06:15 +0800
Subject: [PATCH 022/194] en_US.yaml

---
 i18n/en_US.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 1cd93624..04102618 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -28,8 +28,8 @@ backend:
         other: "Answer do not found."
       cannot_deleted:
         other: "No permission to delete."
-      cannot_update:
-        other: "No permission to update."
+    cannot_update:
+      other: "No permission to update."
     comment:
       edit_without_permission:
         other: "Comment are not allowed to edit."
@@ -84,6 +84,12 @@ backend:
     tag:
       not_found:
         other: "Tag not found."
+      recommend_tag_not_found:
+        other: "Recommend Tag is not exist."
+      recommend_tag_enter:
+        other: "Please enter at least one required tag."
+      not_contain_synonym_tags:
+        other: "Should not contain synonym tags."
     theme:
       not_found:
         other: "Theme not found."
@@ -100,7 +106,6 @@ backend:
         other: "Username is already in use."
       set_avatar:
         other: "Avatar set failed."
-
       config:
         read_config_failed:
           other: "Read config failed"

From d9d4e6a2046c24495a4dc2b8024e74043696b60f Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 22 Nov 2022 17:35:40 +0800
Subject: [PATCH 023/194] ci(linting):  remove unnecessary `git add` command
 during linting

---
 ui/.lintstagedrc.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/.lintstagedrc.json b/ui/.lintstagedrc.json
index 573dc381..a456fe58 100644
--- a/ui/.lintstagedrc.json
+++ b/ui/.lintstagedrc.json
@@ -1,5 +1,5 @@
 {
-  "*.{js,jsx,ts,tsx}": ["eslint --cache --fix", "git add"],
-  "*.{js,jsx,scss,md,json}": ["prettier --write", "git add"],
-  "*.ts?(x)": ["prettier --parser=typescript --write", "git add"]
+  "*.{js,jsx,ts,tsx}": ["eslint --cache --fix"],
+  "*.{js,jsx,scss,md,json}": ["prettier --write"],
+  "*.ts?(x)": ["prettier --parser=typescript --write"]
 }

From 6ec9dbec87da79cd8ed3cc4e16b7a6e2edb9c64f Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 17:35:41 +0800
Subject: [PATCH 024/194] update permission

---
 internal/controller/answer_controller.go      |  2 +
 internal/controller/question_controller.go    |  3 +-
 internal/schema/answer_schema.go              |  1 +
 internal/service/answer_service.go            |  6 +-
 internal/service/comment/comment_service.go   |  6 +-
 .../service/permission/comment_permission.go  | 55 +++++++++++--------
 internal/service/question_service.go          | 10 ++--
 internal/service/tag/tag_service.go           |  2 +-
 8 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index ff0b3ff2..00f61280 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -193,6 +193,8 @@ func (ac *AnswerController) AnswerList(ctx *gin.Context) {
 		return
 	}
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
 	list, count, err := ac.answerService.SearchList(ctx, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 4d7e2366..bdb39b89 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -89,7 +89,8 @@ func (qc *QuestionController) GetQuestion(c *gin.Context) {
 	id := c.Query("id")
 	ctx := context.Background()
 	userID := middleware.GetLoginUserIDFromContext(c)
-	info, err := qc.questionService.GetQuestion(ctx, id, userID, true)
+	userinfo := middleware.GetUserInfoFromContext(c)
+	info, err := qc.questionService.GetQuestion(ctx, id, userID, true, userinfo.IsAdmin)
 	if err != nil {
 		handler.HandleResponse(c, err, nil)
 		return
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 390f90dc..fb523164 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -38,6 +38,7 @@ type AnswerList struct {
 	Page        int    `json:"page" form:"page"`               // Query number of pages
 	PageSize    int    `json:"page_size" form:"page_size"`     // Search page size
 	LoginUserID string `json:"-" `
+	IsAdmin     bool   `json:"-"`
 }
 
 type AnswerInfo struct {
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 3fd37a3d..56167a2b 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -392,14 +392,14 @@ func (as *AnswerService) SearchList(ctx context.Context, search *schema.AnswerLi
 	if err != nil {
 		return list, count, err
 	}
-	AnswerList, err := as.SearchFormatInfo(ctx, dblist, search.LoginUserID)
+	AnswerList, err := as.SearchFormatInfo(ctx, dblist, search.LoginUserID, search.IsAdmin)
 	if err != nil {
 		return AnswerList, count, err
 	}
 	return AnswerList, count, nil
 }
 
-func (as *AnswerService) SearchFormatInfo(ctx context.Context, dblist []*entity.Answer, loginUserID string) ([]*schema.AnswerInfo, error) {
+func (as *AnswerService) SearchFormatInfo(ctx context.Context, dblist []*entity.Answer, loginUserID string, isAdmin bool) ([]*schema.AnswerInfo, error) {
 	list := make([]*schema.AnswerInfo, 0)
 	objectIds := make([]string, 0)
 	userIds := make([]string, 0)
@@ -442,7 +442,7 @@ func (as *AnswerService) SearchFormatInfo(ctx context.Context, dblist []*entity.
 	}
 
 	for _, item := range list {
-		item.MemberActions = permission.GetAnswerPermission(loginUserID, item.UserID)
+		item.MemberActions = permission.GetAnswerPermission(ctx, loginUserID, item.UserID, isAdmin)
 	}
 
 	return list, nil
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index a7156c76..0d4235ab 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -121,7 +121,7 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 
 	resp = &schema.GetCommentResp{}
 	resp.SetFromComment(comment)
-	resp.MemberActions = permission.GetCommentPermission(req.UserID, resp.UserID)
+	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID)
 
 	// get reply user info
 	if len(resp.ReplyUserID) > 0 {
@@ -222,7 +222,7 @@ func (cs *CommentService) GetComment(ctx context.Context, req *schema.GetComment
 	// check if current user vote this comment
 	resp.IsVote = cs.checkIsVote(ctx, req.UserID, resp.CommentID)
 
-	resp.MemberActions = permission.GetCommentPermission(req.UserID, resp.UserID)
+	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID)
 	return resp, nil
 }
 
@@ -282,7 +282,7 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 		// check if current user vote this comment
 		commentResp.IsVote = cs.checkIsVote(ctx, req.UserID, commentResp.CommentID)
 
-		commentResp.MemberActions = permission.GetCommentPermission(req.UserID, commentResp.UserID)
+		commentResp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, commentResp.UserID)
 		resp = append(resp, commentResp)
 	}
 	return pager.NewPageModel(total, resp), nil
diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go
index ba04e0c3..b73dab9f 100644
--- a/internal/service/permission/comment_permission.go
+++ b/internal/service/permission/comment_permission.go
@@ -1,9 +1,13 @@
 package permission
 
-import "github.com/answerdev/answer/internal/schema"
+import (
+	"context"
+
+	"github.com/answerdev/answer/internal/schema"
+)
 
 // TODO: There is currently no permission management
-func GetCommentPermission(userID string, commentCreatorUserID string) (
+func GetCommentPermission(ctx context.Context, userID string, commentCreatorUserID string) (
 	actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
 	if len(userID) > 0 {
@@ -31,7 +35,7 @@ func GetCommentPermission(userID string, commentCreatorUserID string) (
 	return actions
 }
 
-func GetTagPermission(userID string, tagCreatorUserID string) (
+func GetTagPermission(ctx context.Context, userID string, tagCreatorUserID string) (
 	actions []*schema.PermissionMemberAction) {
 	if userID != tagCreatorUserID {
 		return []*schema.PermissionMemberAction{}
@@ -50,18 +54,20 @@ func GetTagPermission(userID string, tagCreatorUserID string) (
 	}
 }
 
-func GetAnswerPermission(userID string, answerAuthID string) (
+func GetAnswerPermission(ctx context.Context, userID string, answerAuthID string, isAdmin bool) (
 	actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
-	if len(userID) > 0 {
-		actions = append(actions, &schema.PermissionMemberAction{
-			Action: "report",
-			Name:   "Flag",
-			Type:   "reason",
-		})
-	}
-	if userID != answerAuthID {
-		return actions
+	if !isAdmin {
+		if len(userID) > 0 {
+			actions = append(actions, &schema.PermissionMemberAction{
+				Action: "report",
+				Name:   "Flag",
+				Type:   "reason",
+			})
+		}
+		if userID != answerAuthID {
+			return actions
+		}
 	}
 	actions = append(actions, []*schema.PermissionMemberAction{
 		{
@@ -78,18 +84,19 @@ func GetAnswerPermission(userID string, answerAuthID string) (
 	return actions
 }
 
-func GetQuestionPermission(userID string, questionAuthID string) (
-	actions []*schema.PermissionMemberAction) {
+func GetQuestionPermission(ctx context.Context, userID string, questionAuthID string, isAdmin bool) (actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
-	if len(userID) > 0 {
-		actions = append(actions, &schema.PermissionMemberAction{
-			Action: "report",
-			Name:   "Flag",
-			Type:   "reason",
-		})
-	}
-	if userID != questionAuthID {
-		return actions
+	if !isAdmin {
+		if len(userID) > 0 {
+			actions = append(actions, &schema.PermissionMemberAction{
+				Action: "report",
+				Name:   "Flag",
+				Type:   "reason",
+			})
+		}
+		if userID != questionAuthID {
+			return actions
+		}
 	}
 	actions = append(actions, []*schema.PermissionMemberAction{
 		{
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 0409ff2d..f13dee2c 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -167,7 +167,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		log.Error("user IncreaseQuestionCount error", err.Error())
 	}
 
-	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
+	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false, false)
 	return
 }
 
@@ -299,12 +299,12 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 
-	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
+	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false, false)
 	return
 }
 
 // GetQuestion get question one
-func (qs *QuestionService) GetQuestion(ctx context.Context, id, loginUserID string, addpv bool) (resp *schema.QuestionInfo, err error) {
+func (qs *QuestionService) GetQuestion(ctx context.Context, id, loginUserID string, addpv bool, isAdmin bool) (resp *schema.QuestionInfo, err error) {
 	question, err := qs.questioncommon.Info(ctx, id, loginUserID)
 	if err != nil {
 		return
@@ -316,7 +316,7 @@ func (qs *QuestionService) GetQuestion(ctx context.Context, id, loginUserID stri
 		}
 	}
 
-	question.MemberActions = permission.GetQuestionPermission(loginUserID, question.UserID)
+	question.MemberActions = permission.GetQuestionPermission(ctx, loginUserID, question.UserID, isAdmin)
 	return question, nil
 }
 
@@ -543,7 +543,7 @@ func (qs *QuestionService) SearchByTitleLike(ctx context.Context, title string,
 // SimilarQuestion
 func (qs *QuestionService) SimilarQuestion(ctx context.Context, questionID string, loginUserID string) ([]*schema.QuestionInfo, int64, error) {
 	list := make([]*schema.QuestionInfo, 0)
-	questionInfo, err := qs.GetQuestion(ctx, questionID, loginUserID, false)
+	questionInfo, err := qs.GetQuestion(ctx, questionID, loginUserID, false, false)
 	if err != nil {
 		return list, 0, err
 	}
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index dcf02029..d7b5736e 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -154,7 +154,7 @@ func (ts *TagService) GetTagInfo(ctx context.Context, req *schema.GetTagInfoReq)
 	resp.Recommend = tagInfo.Recommend
 	resp.Reserved = tagInfo.Reserved
 	resp.IsFollower = ts.checkTagIsFollow(ctx, req.UserID, tagInfo.ID)
-	resp.MemberActions = permission.GetTagPermission(req.UserID, req.UserID)
+	resp.MemberActions = permission.GetTagPermission(ctx, req.UserID, req.UserID)
 	resp.GetExcerpt()
 	return resp, nil
 }

From b7e6d3ee35c86aa5a3797958b261628a2f6b0906 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:03:18 +0800
Subject: [PATCH 025/194] fix delete question

---
 internal/controller/question_controller.go | 2 +-
 internal/service/question_service.go       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index bdb39b89..203fbcf8 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -43,7 +43,7 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionDeleteRank); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
 	userinfo := middleware.GetUserInfoFromContext(ctx)
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index f13dee2c..e5012427 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -188,7 +188,7 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 		if questionInfo.AcceptedAnswerID != "0" {
 			return errors.BadRequest(reason.QuestionCannotDeleted)
 		}
-		if questionInfo.AnswerCount > 0 {
+		if questionInfo.AnswerCount > 1 {
 			return errors.BadRequest(reason.QuestionCannotDeleted)
 		}
 

From 0df1ab82facd597d04c42cc5eb75e4caae484710 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:10:44 +0800
Subject: [PATCH 026/194] fix question tags  update error

---
 internal/service/question_service.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 3811c8ae..d3726eba 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/base/translator"
+	"github.com/answerdev/answer/internal/base/validator"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity"
@@ -206,7 +207,7 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 }
 
 // UpdateQuestion update question
-func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo *schema.QuestionInfo, err error) {
+func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
 	questionInfo = &schema.QuestionInfo{}
 	now := time.Now()
 	question := &entity.Question{}
@@ -252,9 +253,15 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 
 	CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
 	if !CheckTag {
-		err = errors.BadRequest(reason.RequestFormatError).WithMsg(fmt.Sprintf("The reserved tag \"%s\" must be present.",
-			strings.Join(CheckTaglist, ",")))
-		return
+		errMsg := fmt.Sprintf(`The reserved tag %s must be present.`,
+			strings.Join(CheckTaglist, ","))
+		errorlist := make([]*validator.FormErrorField, 0)
+		errorlist = append(errorlist, &validator.FormErrorField{
+			ErrorField: "tags",
+			ErrorMsg:   errMsg,
+		})
+		err = errors.BadRequest(reason.RequestFormatError).WithMsg(errMsg)
+		return errorlist, err
 	}
 
 	//update question to db

From dcf28bf20444db87fe6425e524e5be3ad8816f0b Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:14:32 +0800
Subject: [PATCH 027/194] fix RecommendTagEnter

---
 internal/service/question_service.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 0e9eb95c..75e143dd 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -258,8 +258,13 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 	if !recommendExist {
-		err = errors.BadRequest(reason.RecommendTagEnter).WithError(err).WithStack()
-		return
+		errorlist := make([]*validator.FormErrorField, 0)
+		errorlist = append(errorlist, &validator.FormErrorField{
+			ErrorField: "tags",
+			ErrorMsg:   reason.RecommendTagEnter,
+		})
+		err = errors.BadRequest(reason.RecommendTagEnter)
+		return errorlist, err
 	}
 
 	//CheckChangeTag

From e27121f871c643109a154b353690d1305d5b0c28 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:15:10 +0800
Subject: [PATCH 028/194] fix

---
 internal/service/question_service.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index d3726eba..affb08a0 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -233,8 +233,13 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 	if !recommendExist {
-		err = errors.BadRequest(reason.RecommendTagEnter).WithError(err).WithStack()
-		return
+		errorlist := make([]*validator.FormErrorField, 0)
+		errorlist = append(errorlist, &validator.FormErrorField{
+			ErrorField: "tags",
+			ErrorMsg:   reason.RecommendTagEnter,
+		})
+		err = errors.BadRequest(reason.RecommendTagEnter)
+		return errorlist, err
 	}
 
 	//CheckChangeTag

From cd961eafc29315025a22fafae2381c6fcee020a7 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 22 Nov 2022 19:48:27 +0800
Subject: [PATCH 029/194] feat: add timeline api interface

---
 cmd/answer/wire_gen.go                        |   5 +-
 internal/base/constant/acticity.go            |  15 ---
 internal/controller/activity_controller.go    |  27 ++++
 internal/entity/activity_entity.go            |  24 ++--
 internal/entity/question_entity.go            |   6 +-
 internal/entity/revision_entity.go            |   2 +-
 internal/install/install_controller.go        |   2 +-
 internal/migrations/init.go                   |  20 +++
 internal/migrations/migrations.go             |   1 +
 internal/migrations/v3.go                     |  19 +++
 internal/repo/activity/activity_repo.go       |  35 +++++
 internal/repo/activity/answer_repo.go         |  35 ++---
 internal/repo/activity/follow_repo.go         |  13 +-
 internal/repo/activity/user_active_repo.go    |  11 +-
 internal/repo/activity/vote_repo.go           |  17 +--
 internal/repo/provider.go                     |   1 +
 internal/repo/question/question_repo.go       |   4 +-
 internal/router/answer_api_router.go          |   3 +
 internal/schema/activity.go                   |  48 ++++++-
 internal/service/activity/activity.go         | 127 +++++++++++++++++-
 internal/service/activity/answer_activity.go  |  12 +-
 internal/service/activity_common/activity.go  |  17 ++-
 internal/service/answer_service.go            |  34 +++--
 internal/service/auth/auth.go                 |   2 +-
 internal/service/comment/comment_service.go   |   7 +-
 internal/service/question_common/question.go  |  12 +-
 internal/service/question_service.go          |  59 +++++---
 .../revision_common/revision_service.go       |   7 +-
 internal/service/tag/tag_service.go           |  20 ++-
 internal/service/tag_common/tag_common.go     |  11 +-
 30 files changed, 472 insertions(+), 124 deletions(-)
 create mode 100644 internal/migrations/v3.go
 create mode 100644 internal/repo/activity/activity_repo.go

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 4549ab1f..8ec81bf1 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -46,6 +46,7 @@ import (
 	auth2 "github.com/answerdev/answer/internal/service/auth"
 	"github.com/answerdev/answer/internal/service/collection_common"
 	comment2 "github.com/answerdev/answer/internal/service/comment"
+	"github.com/answerdev/answer/internal/service/comment_common"
 	"github.com/answerdev/answer/internal/service/dashboard"
 	export2 "github.com/answerdev/answer/internal/service/export"
 	"github.com/answerdev/answer/internal/service/follow"
@@ -186,7 +187,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	dashboardController := controller.NewDashboardController(dashboardService)
 	uploadController := controller.NewUploadController(uploaderService)
 	activityCommon := activity_common2.NewActivityCommon(activityRepo)
-	activityService := activity2.NewActivityService()
+	activityActivityRepo := activity.NewActivityRepo(dataData)
+	commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)
+	activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService)
 	activityController := controller.NewActivityController(activityCommon, activityService)
 	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index 9c9ba596..e1b0a1d8 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -1,20 +1,5 @@
 package constant
 
-// | 问题 回答 标签 | undeleted | 操作者        |              | 恢复删除的内容                                               |
-// | 问题 回答 标签 | deleted   | 操作者        |              | 删除内容                                                     |
-// | 问题 回答 标签 | rollback | 编辑者        | 显示编辑理由 | 回滚版本编辑记录； 点击 Type 显示最近的版本比较              |
-// | 问题 回答 标签 | edit     | 编辑者        | 显示编辑理由 | 编辑记录； 点击 Type 显示最近的版本比较                      |
-// | 问题 回答     | downvote  | 投票者 or N/A |              | 内容点踩，名字仅管理员可见； 取消时显示已取消和取消时间      |
-// | 问题 回答     | upvote    | 投票者        |              | 内容点赞； 取消时显示已取消和取消时间                        |
-// | 问题 回答     | accept    | 提问者        |              | 采纳答案，Type 链接到对应的回答； 取消时显示已取消和取消时间 |
-// | 问题 回答     | commented | 评论者        | 显示评论内容 | 添加评论，Type 链接到对应的评论                              |
-// | 问题         | answered  | 回答者        |              | 添加回答，Type 链接到对应的回答                              |
-// | 问题         | reopened  | 操作者        |              | 重新开启问题                                                 |
-// | 问题         | closed    | 操作者        | 显示关闭理由 | 关闭问题                                                     |
-// | 问题         | asked    | 提问者        |              | 初始提问版本，点击展开无需比较                               |
-// | 回答         | answered | 回答者        |              | 初始回答版本，点击展开无需比较                               |
-// | 标签         | created  | 创建者        |              | 初始标签版本，点击展开无需比较                               |
-
 // question activity
 
 type ActivityTypeKey string
diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go
index 0d7f0652..7ce56f82 100644
--- a/internal/controller/activity_controller.go
+++ b/internal/controller/activity_controller.go
@@ -1,8 +1,12 @@
 package controller
 
 import (
+	"github.com/answerdev/answer/internal/base/handler"
+	"github.com/answerdev/answer/internal/base/middleware"
+	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity"
 	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/gin-gonic/gin"
 )
 
 type ActivityController struct {
@@ -16,3 +20,26 @@ func NewActivityController(
 	activityService *activity.ActivityService) *ActivityController {
 	return &ActivityController{activityCommonService: activityCommonService, activityService: activityService}
 }
+
+// GetObjectTimeline get object timeline
+// @Summary get object timeline
+// @Description get object timeline
+// @Tags Comment
+// @Produce json
+// @Param object_id query string false "object id"
+// @Param tag_slug_name query string false "tag slug name"
+// @Param object_type query string false "object type" Enums(question, answer, tag)
+// @Param show_vote bool false "is show vote"
+// @Success 200 {object} handler.RespBody{data=schema.GetObjectTimelineResp}
+// @Router /answer/api/v1/activity/timeline [get]
+func (ac *ActivityController) GetObjectTimeline(ctx *gin.Context) {
+	req := &schema.GetObjectTimelineReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+
+	resp, err := ac.activityService.GetObjectTimeline(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
+}
diff --git a/internal/entity/activity_entity.go b/internal/entity/activity_entity.go
index b1e5fc4b..4db4eadd 100644
--- a/internal/entity/activity_entity.go
+++ b/internal/entity/activity_entity.go
@@ -9,17 +9,19 @@ const (
 
 // Activity activity
 type Activity struct {
-	ID            string    `xorm:"not null pk autoincr BIGINT(20) id"`
-	CreatedAt     time.Time `xorm:"created TIMESTAMP created_at"`
-	UpdatedAt     time.Time `xorm:"updated TIMESTAMP updated_at"`
-	CancelledAt   time.Time `xorm:"TIMESTAMP cancelled_at"`
-	UserID        string    `xorm:"not null index BIGINT(20) user_id"`
-	TriggerUserID int64     `xorm:"not null default 0 index BIGINT(20) trigger_user_id"`
-	ObjectID      string    `xorm:"not null default 0 index BIGINT(20) object_id"`
-	ActivityType  int       `xorm:"not null INT(11) activity_type"`
-	Cancelled     int       `xorm:"not null default 0 TINYINT(4) cancelled"`
-	Rank          int       `xorm:"not null default 0 INT(11) rank"`
-	HasRank       int       `xorm:"not null default 0 TINYINT(4) has_rank"`
+	ID               string    `xorm:"not null pk autoincr BIGINT(20) id"`
+	CreatedAt        time.Time `xorm:"created TIMESTAMP created_at"`
+	UpdatedAt        time.Time `xorm:"updated TIMESTAMP updated_at"`
+	CancelledAt      time.Time `xorm:"TIMESTAMP cancelled_at"`
+	UserID           string    `xorm:"not null index BIGINT(20) user_id"`
+	TriggerUserID    int64     `xorm:"not null default 0 index BIGINT(20) trigger_user_id"`
+	ObjectID         string    `xorm:"not null default 0 index BIGINT(20) object_id"`
+	OriginalObjectID string    `xorm:"not null default 0 BIGINT(20) original_object_id"`
+	ActivityType     int       `xorm:"not null INT(11) activity_type"`
+	Cancelled        int       `xorm:"not null default 0 TINYINT(4) cancelled"`
+	Rank             int       `xorm:"not null default 0 INT(11) rank"`
+	HasRank          int       `xorm:"not null default 0 TINYINT(4) has_rank"`
+	RevisionID       int64     `xorm:"not null default 0 BIGINT(20) revision_id"`
 }
 
 type ActivityRankSum struct {
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index 64c982ed..fd459e71 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -6,19 +6,19 @@ import (
 
 const (
 	QuestionStatusAvailable = 1
-	QuestionStatusclosed    = 2
+	QuestionStatusClosed    = 2
 	QuestionStatusDeleted   = 10
 )
 
 var CmsQuestionSearchStatus = map[string]int{
 	"available": QuestionStatusAvailable,
-	"closed":    QuestionStatusclosed,
+	"closed":    QuestionStatusClosed,
 	"deleted":   QuestionStatusDeleted,
 }
 
 var CmsQuestionSearchStatusIntToString = map[int]string{
 	QuestionStatusAvailable: "available",
-	QuestionStatusclosed:    "closed",
+	QuestionStatusClosed:    "closed",
 	QuestionStatusDeleted:   "deleted",
 }
 
diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index e439dcb2..f2e91514 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -23,7 +23,7 @@ type Revision struct {
 	Content      string    `xorm:"not null TEXT content"`
 	Log          string    `xorm:"VARCHAR(255) log"`
 	Status       int       `xorm:"not null default 1 INT(11) status"`
-	ReviewUserID string    `xorm:"not null default 0 BIGINT(20) review_user_id"`
+	ReviewUserID int64     `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
 // TableName revision table name
diff --git a/internal/install/install_controller.go b/internal/install/install_controller.go
index 6963e44b..62cbdf87 100644
--- a/internal/install/install_controller.go
+++ b/internal/install/install_controller.go
@@ -163,7 +163,7 @@ func InitBaseInfo(ctx *gin.Context) {
 	}
 
 	if cli.CheckDBTableExist(c.Data.Database) {
-		log.Warnf("database is already initialized")
+		log.Warn("database is already initialized")
 		handler.HandleResponse(ctx, nil, nil)
 		return
 	}
diff --git a/internal/migrations/init.go b/internal/migrations/init.go
index cebdc1c7..46261da5 100644
--- a/internal/migrations/init.go
+++ b/internal/migrations/init.go
@@ -242,6 +242,26 @@ func initConfigTable(engine *xorm.Engine) error {
 		{ID: 84, Key: "question.review.reasons", Value: `["reason.looks_ok","reason.needs_edit","reason.needs_close","reason.needs_delete"]`},
 		{ID: 85, Key: "answer.review.reasons", Value: `["reason.looks_ok","reason.needs_edit","reason.needs_delete"]`},
 		{ID: 86, Key: "comment.review.reasons", Value: `["reason.looks_ok","reason.needs_edit","reason.needs_delete"]`},
+		{ID: 87, Key: "question.asked", Value: `0`},
+		{ID: 88, Key: "question.closed", Value: `0`},
+		{ID: 89, Key: "question.reopened", Value: `0`},
+		{ID: 90, Key: "question.answered", Value: `0`},
+		{ID: 91, Key: "question.commented", Value: `0`},
+		{ID: 92, Key: "question.accept", Value: `0`},
+		{ID: 93, Key: "question.edit", Value: `0`},
+		{ID: 94, Key: "question.rollback", Value: `0`},
+		{ID: 95, Key: "question.deleted", Value: `0`},
+		{ID: 96, Key: "question.undeleted", Value: `0`},
+		{ID: 97, Key: "answer.answered", Value: `0`},
+		{ID: 98, Key: "answer.commented", Value: `0`},
+		{ID: 99, Key: "answer.edit", Value: `0`},
+		{ID: 100, Key: "answer.rollback", Value: `0`},
+		{ID: 101, Key: "answer.undeleted", Value: `0`},
+		{ID: 102, Key: "tag.created", Value: `0`},
+		{ID: 103, Key: "tag.edit", Value: `0`},
+		{ID: 104, Key: "tag.rollback", Value: `0`},
+		{ID: 105, Key: "tag.deleted", Value: `0`},
+		{ID: 106, Key: "tag.undeleted", Value: `0`},
 	}
 	_, err := engine.Insert(defaultConfigTable)
 	return err
diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go
index da34800c..0e74d1d4 100644
--- a/internal/migrations/migrations.go
+++ b/internal/migrations/migrations.go
@@ -44,6 +44,7 @@ var migrations = []Migration{
 	NewMigration("this is first version, no operation", noopMigration),
 	NewMigration("add user language", addUserLanguage),
 	NewMigration("add recommend and reserved tag fields", addTagRecommendedAndReserved),
+	NewMigration("add activity timeline", addActivityTimeline),
 }
 
 // GetCurrentDBVersion returns the current db version
diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
new file mode 100644
index 00000000..e47b2d5a
--- /dev/null
+++ b/internal/migrations/v3.go
@@ -0,0 +1,19 @@
+package migrations
+
+import (
+	"time"
+
+	"xorm.io/xorm"
+)
+
+func addActivityTimeline(x *xorm.Engine) error {
+	type Reversion struct {
+		ReviewUserID int64 `xorm:"not null default 0 BIGINT(20) review_user_id"`
+	}
+	type Activity struct {
+		CancelledAt      time.Time `xorm:"TIMESTAMP cancelled_at"`
+		RevisionID       int64     `xorm:"not null default 0 BIGINT(20) revision_id"`
+		OriginalObjectID string    `xorm:"not null default 0 BIGINT(20) original_object_id"`
+	}
+	return x.Sync(new(Activity), new(Reversion))
+}
diff --git a/internal/repo/activity/activity_repo.go b/internal/repo/activity/activity_repo.go
new file mode 100644
index 00000000..e192bd16
--- /dev/null
+++ b/internal/repo/activity/activity_repo.go
@@ -0,0 +1,35 @@
+package activity
+
+import (
+	"context"
+
+	"github.com/answerdev/answer/internal/base/data"
+	"github.com/answerdev/answer/internal/base/reason"
+	"github.com/answerdev/answer/internal/entity"
+	"github.com/answerdev/answer/internal/service/activity"
+	"github.com/segmentfault/pacman/errors"
+)
+
+// activityRepo activity repository
+type activityRepo struct {
+	data *data.Data
+}
+
+// NewActivityRepo new repository
+func NewActivityRepo(
+	data *data.Data,
+) activity.ActivityRepo {
+	return &activityRepo{
+		data: data,
+	}
+}
+
+func (ar *activityRepo) GetObjectAllActivity(ctx context.Context, objectID string, showVote bool) (
+	activityList []*entity.Activity, err error) {
+	activityList = make([]*entity.Activity, 0)
+	err = ar.data.DB.Find(&activityList, &entity.Activity{OriginalObjectID: objectID})
+	if err != nil {
+		return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return activityList, nil
+}
diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go
index 01602b1e..1c47c8e1 100644
--- a/internal/repo/activity/answer_repo.go
+++ b/internal/repo/activity/answer_repo.go
@@ -2,6 +2,7 @@ package activity
 
 import (
 	"context"
+	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/data"
@@ -96,8 +97,8 @@ func (ar *AnswerActivityRepo) DeleteQuestion(ctx context.Context, questionID str
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 
-			if _, e := session.Where("id = ?", act.ID).Cols("`cancelled`").
-				Update(&entity.Activity{Cancelled: entity.ActivityCancelled}); e != nil {
+			if _, e := session.Where("id = ?", act.ID).Cols("cancelled", "cancelled_at").
+				Update(&entity.Activity{Cancelled: entity.ActivityCancelled, CancelledAt: time.Now()}); e != nil {
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 		}
@@ -124,7 +125,7 @@ func (ar *AnswerActivityRepo) DeleteQuestion(ctx context.Context, questionID str
 
 // AcceptAnswer accept other answer
 func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
-	answerObjID, questionUserID, answerUserID string, isSelf bool,
+	answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool,
 ) (err error) {
 	addActivityList := make([]*entity.Activity, 0)
 	for _, action := range acceptActionList {
@@ -134,10 +135,11 @@ func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
 			return errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 		}
 		addActivity := &entity.Activity{
-			ObjectID:     answerObjID,
-			ActivityType: activityType,
-			Rank:         deltaRank,
-			HasRank:      hasRank,
+			ObjectID:         answerObjID,
+			OriginalObjectID: questionObjID,
+			ActivityType:     activityType,
+			Rank:             deltaRank,
+			HasRank:          hasRank,
 		}
 		if action == acceptAction {
 			addActivity.UserID = questionUserID
@@ -222,7 +224,7 @@ func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
 
 // CancelAcceptAnswer accept other answer
 func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
-	answerObjID, questionUserID, answerUserID string,
+	answerObjID, questionObjID, questionUserID, answerUserID string,
 ) (err error) {
 	addActivityList := make([]*entity.Activity, 0)
 	for _, action := range acceptActionList {
@@ -232,10 +234,11 @@ func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
 			return errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 		}
 		addActivity := &entity.Activity{
-			ObjectID:     answerObjID,
-			ActivityType: activityType,
-			Rank:         -deltaRank,
-			HasRank:      hasRank,
+			ObjectID:         answerObjID,
+			OriginalObjectID: questionObjID,
+			ActivityType:     activityType,
+			Rank:             -deltaRank,
+			HasRank:          hasRank,
 		}
 		if action == acceptAction {
 			addActivity.UserID = questionUserID
@@ -265,8 +268,8 @@ func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 
-			if _, e := session.Where("id = ?", existsActivity.ID).Cols("`cancelled`").
-				Update(&entity.Activity{Cancelled: entity.ActivityCancelled}); e != nil {
+			if _, e := session.Where("id = ?", existsActivity.ID).Cols("cancelled", "cancelled_at").
+				Update(&entity.Activity{Cancelled: entity.ActivityCancelled, CancelledAt: time.Now()}); e != nil {
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 		}
@@ -326,8 +329,8 @@ func (ar *AnswerActivityRepo) DeleteAnswer(ctx context.Context, answerID string)
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 
-			if _, e := session.Where("id = ?", act.ID).Cols("`cancelled`").
-				Update(&entity.Activity{Cancelled: entity.ActivityCancelled}); e != nil {
+			if _, e := session.Where("id = ?", act.ID).Cols("cancelled", "cancelled_at").
+				Update(&entity.Activity{Cancelled: entity.ActivityCancelled, CancelledAt: time.Now()}); e != nil {
 				return nil, errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 			}
 		}
diff --git a/internal/repo/activity/follow_repo.go b/internal/repo/activity/follow_repo.go
index c8bae7b5..bb1a0a0c 100644
--- a/internal/repo/activity/follow_repo.go
+++ b/internal/repo/activity/follow_repo.go
@@ -73,12 +73,13 @@ func (ar *FollowRepo) Follow(ctx context.Context, objectID, userID string) error
 		} else {
 			// update existing activity with new user id and u object id
 			_, err = session.Insert(&entity.Activity{
-				UserID:       userID,
-				ObjectID:     objectID,
-				ActivityType: activityType,
-				Cancelled:    entity.ActivityAvailable,
-				Rank:         0,
-				HasRank:      0,
+				UserID:           userID,
+				ObjectID:         objectID,
+				OriginalObjectID: objectID,
+				ActivityType:     activityType,
+				Cancelled:        entity.ActivityAvailable,
+				Rank:             0,
+				HasRank:          0,
 			})
 		}
 
diff --git a/internal/repo/activity/user_active_repo.go b/internal/repo/activity/user_active_repo.go
index 27f6c5a6..1b75adac 100644
--- a/internal/repo/activity/user_active_repo.go
+++ b/internal/repo/activity/user_active_repo.go
@@ -55,11 +55,12 @@ func (ar *UserActiveActivityRepo) UserActive(ctx context.Context, userID string)
 		}
 
 		addActivity := &entity.Activity{
-			UserID:       userID,
-			ObjectID:     "0",
-			ActivityType: activityType,
-			Rank:         deltaRank,
-			HasRank:      1,
+			UserID:           userID,
+			ObjectID:         "0",
+			OriginalObjectID: "0",
+			ActivityType:     activityType,
+			Rank:             deltaRank,
+			HasRank:          1,
 		}
 		_, exists, err := ar.activityRepo.GetActivity(ctx, session, "0", addActivity.UserID, activityType)
 		if err != nil {
diff --git a/internal/repo/activity/vote_repo.go b/internal/repo/activity/vote_repo.go
index b42ab467..f934329f 100644
--- a/internal/repo/activity/vote_repo.go
+++ b/internal/repo/activity/vote_repo.go
@@ -106,13 +106,14 @@ func (vr *VoteRepo) vote(ctx context.Context, objectID string, userID, objectUse
 			}
 
 			insertActivity = entity.Activity{
-				ObjectID:      objectID,
-				UserID:        activityUserID,
-				TriggerUserID: converter.StringToInt64(triggerUserID),
-				ActivityType:  activityType,
-				Rank:          deltaRank,
-				HasRank:       hasRank,
-				Cancelled:     entity.ActivityAvailable,
+				ObjectID:         objectID,
+				OriginalObjectID: objectID,
+				UserID:           activityUserID,
+				TriggerUserID:    converter.StringToInt64(triggerUserID),
+				ActivityType:     activityType,
+				Rank:             deltaRank,
+				HasRank:          hasRank,
+				Cancelled:        entity.ActivityAvailable,
 			}
 
 			// trigger user rank and send notification
@@ -206,7 +207,7 @@ func (vr *VoteRepo) voteCancel(ctx context.Context, objectID string, userID, obj
 				return
 			}
 
-			if _, err = session.Where("id = ?", existsActivity.ID).Cols("`cancelled`").
+			if _, err = session.Where("id = ?", existsActivity.ID).Cols("cancelled", "cancelled_at").
 				Update(&entity.Activity{
 					Cancelled:   entity.ActivityCancelled,
 					CancelledAt: time.Now(),
diff --git a/internal/repo/provider.go b/internal/repo/provider.go
index dca7a595..9b078dae 100644
--- a/internal/repo/provider.go
+++ b/internal/repo/provider.go
@@ -53,6 +53,7 @@ var ProviderSetRepo = wire.NewSet(
 	activity.NewAnswerActivityRepo,
 	activity.NewQuestionActivityRepo,
 	activity.NewUserActiveActivityRepo,
+	activity.NewActivityRepo,
 	tag.NewTagRepo,
 	tag_common.NewTagCommonRepo,
 	tag.NewTagRelRepo,
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index 4d90a09e..18da5594 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -166,7 +166,7 @@ func (qr *questionRepo) GetQuestionList(ctx context.Context, question *entity.Qu
 func (qr *questionRepo) GetQuestionCount(ctx context.Context) (count int64, err error) {
 	questionList := make([]*entity.Question, 0)
 
-	count, err = qr.data.DB.In("question.status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusclosed}).FindAndCount(&questionList)
+	count, err = qr.data.DB.In("question.status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed}).FindAndCount(&questionList)
 	if err != nil {
 		return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -210,7 +210,7 @@ func (qr *questionRepo) SearchList(ctx context.Context, search *schema.QuestionS
 		session = session.And("question.user_id = ?", search.UserID)
 	}
 
-	session = session.In("question.status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusclosed})
+	session = session.In("question.status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed})
 	// if search.Status > 0 {
 	// 	session = session.And("question.status = ?", search.Status)
 	// }
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 21ee9195..90e938ea 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -203,6 +203,9 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 
 	// upload file
 	r.POST("/file", a.uploadController.UploadFile)
+
+	// activity
+	r.GET("/activity/timeline", a.activityController.GetObjectTimeline)
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerCmsAPIRouter(r *gin.RouterGroup) {
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index 0284bda4..c871bf9e 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -4,8 +4,48 @@ import "github.com/answerdev/answer/internal/base/constant"
 
 // ActivityMsg activity message
 type ActivityMsg struct {
-	UserID          string                   `json:"user_id"`
-	TriggerUserID   int64                    `json:"trigger_user_id"`
-	ObjectID        string                   `json:"object_id"`
-	ActivityTypeKey constant.ActivityTypeKey `json:"activity_type_key"`
+	UserID           string                   `json:"user_id"`
+	TriggerUserID    int64                    `json:"trigger_user_id"`
+	ObjectID         string                   `json:"object_id"`
+	OriginalObjectID string                   `json:"original_object_id"`
+	ActivityTypeKey  constant.ActivityTypeKey `json:"activity_type_key"`
+	RevisionID       string                   `json:"revision_id"`
+}
+
+// GetObjectTimelineReq get object timeline request
+type GetObjectTimelineReq struct {
+	ObjectId    string `validate:"omitempty,gt=0,lte=100" form:"object_id"`
+	TagSlugName string `validate:"omitempty,gt=0,lte=35" form:"slug_name"`
+	ObjectType  string `validate:"required,oneof=question answer tag" form:"object_type"`
+	ShowVote    bool   `validate:"omitempty" form:"show_vote"`
+	UserID      string `json:"-"`
+}
+
+// GetObjectTimelineResp get object timeline response
+type GetObjectTimelineResp struct {
+	ObjectInfo *ActObjectInfo       `json:"object_info"`
+	Timeline   []*ActObjectTimeline `json:"timeline"`
+}
+
+// ActObjectTimeline act object timeline
+type ActObjectTimeline struct {
+	ActivityID      string `json:"activity_id"`
+	RevisionID      string `json:"revision_id"`
+	CreatedAt       int64  `json:"created_at"`
+	ActivityType    string `json:"activity_type"`
+	Username        string `json:"username"`
+	UserDisplayName string `json:"user_display_name"`
+	Comment         string `json:"comment"`
+	ObjectID        string `json:"object_id"`
+	ObjectType      string `json:"object_type"`
+	Cancelled       bool   `json:"cancelled"`
+	CancelledAt     int64  `json:"cancelled_at"`
+}
+
+// ActObjectInfo act object info
+type ActObjectInfo struct {
+	Title      string `json:"title"`
+	ObjectType string `json:"object_type"`
+	QuestionID string `json:"question_id"`
+	AnswerID   string `json:"answer_id"`
 }
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index 16bafffe..f60db0e4 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -1,9 +1,132 @@
 package activity
 
+import (
+	"context"
+	"strings"
+
+	"github.com/answerdev/answer/internal/base/constant"
+	"github.com/answerdev/answer/internal/entity"
+	"github.com/answerdev/answer/internal/repo/config"
+	"github.com/answerdev/answer/internal/schema"
+	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/answerdev/answer/internal/service/comment_common"
+	"github.com/answerdev/answer/internal/service/object_info"
+	"github.com/answerdev/answer/internal/service/tag_common"
+	usercommon "github.com/answerdev/answer/internal/service/user_common"
+	"github.com/answerdev/answer/pkg/converter"
+	"github.com/segmentfault/pacman/log"
+)
+
+// ActivityRepo activity repository
+type ActivityRepo interface {
+	GetObjectAllActivity(ctx context.Context, objectID string, showVote bool) (activityList []*entity.Activity, err error)
+}
+
 // ActivityService activity service
 type ActivityService struct {
+	activityRepo          ActivityRepo
+	userCommon            *usercommon.UserCommon
+	activityCommonService *activity_common.ActivityCommon
+	tagCommonService      *tag_common.TagCommonService
+	objectInfoService     *object_info.ObjService
+	commentCommonService  *comment_common.CommentCommonService
 }
 
-func NewActivityService() *ActivityService {
-	return &ActivityService{}
+// NewActivityService new activity service
+func NewActivityService(
+	activityRepo ActivityRepo,
+	userCommon *usercommon.UserCommon,
+	activityCommonService *activity_common.ActivityCommon,
+	tagCommonService *tag_common.TagCommonService,
+	objectInfoService *object_info.ObjService,
+	commentCommonService *comment_common.CommentCommonService,
+) *ActivityService {
+	return &ActivityService{
+		objectInfoService:     objectInfoService,
+		activityRepo:          activityRepo,
+		userCommon:            userCommon,
+		activityCommonService: activityCommonService,
+		tagCommonService:      tagCommonService,
+		commentCommonService:  commentCommonService,
+	}
+}
+
+// GetObjectTimeline get object timeline
+func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.GetObjectTimelineReq) (
+	resp *schema.GetObjectTimelineResp, err error) {
+	resp = &schema.GetObjectTimelineResp{
+		ObjectInfo: &schema.ActObjectInfo{},
+		Timeline:   make([]*schema.ActObjectTimeline, 0),
+	}
+
+	objInfo, err := as.objectInfoService.GetInfo(ctx, req.ObjectId)
+	if err != nil {
+		return nil, err
+	}
+	resp.ObjectInfo.Title = objInfo.Title
+	resp.ObjectInfo.ObjectType = objInfo.ObjectType
+	resp.ObjectInfo.QuestionID = objInfo.QuestionID
+	resp.ObjectInfo.AnswerID = objInfo.AnswerID
+
+	activityList, err := as.activityRepo.GetObjectAllActivity(ctx, req.ObjectId, req.ShowVote)
+	if err != nil {
+		return nil, err
+	}
+	for _, act := range activityList {
+		item := &schema.ActObjectTimeline{
+			ActivityID: act.ID,
+			RevisionID: converter.IntToString(act.RevisionID),
+			CreatedAt:  act.CreatedAt.Unix(),
+			Cancelled:  act.Cancelled == entity.ActivityCancelled,
+			ObjectID:   act.ObjectID,
+		}
+		if item.Cancelled {
+			item.CancelledAt = act.CancelledAt.Unix()
+		}
+
+		// database save activity type is number, change to activity type string is like "question.asked".
+		// so we need to cut the front part of '.'
+		item.ObjectType, item.ActivityType, _ = strings.Cut(config.ID2KeyMapping[act.ActivityType], ".")
+
+		isHidden, formattedActivityType := formatActivity(item.ActivityType)
+		if isHidden {
+			continue
+		}
+		item.ActivityType = formattedActivityType
+
+		// get user info
+		userBasicInfo, exist, err := as.userCommon.GetUserBasicInfoByID(ctx, act.UserID)
+		if err != nil {
+			return nil, err
+		}
+		if exist {
+			item.Username = userBasicInfo.Username
+			item.UserDisplayName = userBasicInfo.DisplayName
+		}
+
+		if item.ObjectType == constant.CommentObjectType {
+			comment, err := as.commentCommonService.GetComment(ctx, item.ObjectID)
+			if err != nil {
+				log.Error(err)
+			} else {
+				item.Comment = comment.ParsedText
+			}
+		}
+
+		resp.Timeline = append(resp.Timeline, item)
+	}
+	return
+}
+
+func formatActivity(activityType string) (isHidden bool, formattedActivityType string) {
+	if activityType == "voted_up" || activityType == "voted_down" || activityType == "accepted" {
+		return true, ""
+	}
+	if activityType == "vote_up" {
+		return false, "upvote"
+	}
+	if activityType == "vote_down" {
+		return false, "downvote"
+	}
+	return false, activityType
 }
diff --git a/internal/service/activity/answer_activity.go b/internal/service/activity/answer_activity.go
index 30933f08..2a8e51d8 100644
--- a/internal/service/activity/answer_activity.go
+++ b/internal/service/activity/answer_activity.go
@@ -10,9 +10,9 @@ import (
 // AnswerActivityRepo answer activity
 type AnswerActivityRepo interface {
 	AcceptAnswer(ctx context.Context,
-		answerObjID, questionUserID, answerUserID string, isSelf bool) (err error)
+		answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error)
 	CancelAcceptAnswer(ctx context.Context,
-		answerObjID, questionUserID, answerUserID string) (err error)
+		answerObjID, questionObjID, questionUserID, answerUserID string) (err error)
 	DeleteAnswer(ctx context.Context, answerID string) (err error)
 }
 
@@ -38,14 +38,14 @@ func NewAnswerActivityService(
 
 // AcceptAnswer accept answer change activity
 func (as *AnswerActivityService) AcceptAnswer(ctx context.Context,
-	answerObjID, questionUserID, answerUserID string, isSelf bool) (err error) {
-	return as.answerActivityRepo.AcceptAnswer(ctx, answerObjID, questionUserID, answerUserID, isSelf)
+	answerObjID, questionObjID, questionUserID, answerUserID string, isSelf bool) (err error) {
+	return as.answerActivityRepo.AcceptAnswer(ctx, answerObjID, questionObjID, questionUserID, answerUserID, isSelf)
 }
 
 // CancelAcceptAnswer cancel accept answer change activity
 func (as *AnswerActivityService) CancelAcceptAnswer(ctx context.Context,
-	answerObjID, questionUserID, answerUserID string) (err error) {
-	return as.answerActivityRepo.CancelAcceptAnswer(ctx, answerObjID, questionUserID, answerUserID)
+	answerObjID, questionObjID, questionUserID, answerUserID string) (err error) {
+	return as.answerActivityRepo.CancelAcceptAnswer(ctx, answerObjID, questionObjID, questionUserID, answerUserID)
 }
 
 // DeleteAnswer delete answer change activity
diff --git a/internal/service/activity_common/activity.go b/internal/service/activity_common/activity.go
index 83adf2be..8d76ac2c 100644
--- a/internal/service/activity_common/activity.go
+++ b/internal/service/activity_common/activity.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/service/activity_queue"
+	"github.com/answerdev/answer/pkg/converter"
 	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
 )
@@ -48,15 +49,19 @@ func (ac *ActivityCommon) HandleActivity() {
 
 			activityType, err := ac.activityRepo.GetActivityTypeByConfigKey(context.Background(), string(msg.ActivityTypeKey))
 			if err != nil {
-				log.Errorf("error getting activity type %s, activity type is %s", err, activityType)
+				log.Errorf("error getting activity type %s, activity type is %d", err, activityType)
 			}
 
 			act := &entity.Activity{
-				UserID:        msg.UserID,
-				TriggerUserID: msg.TriggerUserID,
-				ObjectID:      msg.ObjectID,
-				ActivityType:  activityType,
-				Cancelled:     entity.ActivityAvailable,
+				UserID:           msg.UserID,
+				TriggerUserID:    msg.TriggerUserID,
+				ObjectID:         msg.ObjectID,
+				OriginalObjectID: msg.OriginalObjectID,
+				ActivityType:     activityType,
+				Cancelled:        entity.ActivityAvailable,
+			}
+			if len(msg.RevisionID) > 0 {
+				act.RevisionID = converter.StringToInt64(msg.RevisionID)
 			}
 			if err := ac.activityRepo.AddActivity(context.TODO(), act); err != nil {
 				log.Error(err)
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index e3fcac98..c326721e 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -165,21 +165,25 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	}
 	infoJSON, _ := json.Marshal(insertData)
 	revisionDTO.Content = string(infoJSON)
-	err = as.revisionService.AddRevision(ctx, revisionDTO, true)
+	revisionID, err := as.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return insertData.ID, err
 	}
 	as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, insertData.ID, req.UserID)
 
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          insertData.UserID,
-		ObjectID:        insertData.ID,
-		ActivityTypeKey: constant.ActAnswerAnswered,
+		UserID:           insertData.UserID,
+		ObjectID:         insertData.ID,
+		OriginalObjectID: insertData.ID,
+		ActivityTypeKey:  constant.ActAnswerAnswered,
+		RevisionID:       revisionID,
 	})
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          insertData.UserID,
-		ObjectID:        insertData.ID,
-		ActivityTypeKey: constant.ActQuestionAnswered,
+		UserID:           insertData.UserID,
+		ObjectID:         insertData.ID,
+		OriginalObjectID: questionInfo.ID,
+		ActivityTypeKey:  constant.ActQuestionAnswered,
+		RevisionID:       revisionID,
 	})
 	return insertData.ID, nil
 }
@@ -215,11 +219,19 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	}
 	infoJSON, _ := json.Marshal(insertData)
 	revisionDTO.Content = string(infoJSON)
-	err = as.revisionService.AddRevision(ctx, revisionDTO, true)
+	revisionID, err := as.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return insertData.ID, err
 	}
 	as.notificationUpdateAnswer(ctx, questionInfo.UserID, insertData.ID, req.UserID)
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           insertData.UserID,
+		ObjectID:         insertData.ID,
+		OriginalObjectID: insertData.ID,
+		ActivityTypeKey:  constant.ActAnswerEdit,
+		RevisionID:       revisionID,
+	})
 	return insertData.ID, nil
 }
 
@@ -288,14 +300,14 @@ func (as *AnswerService) updateAnswerRank(ctx context.Context, userID string,
 	// if this question is already been answered, should cancel old answer rank
 	if oldAnswerInfo != nil {
 		err := as.answerActivityService.CancelAcceptAnswer(
-			ctx, questionInfo.AcceptedAnswerID, questionInfo.UserID, oldAnswerInfo.UserID)
+			ctx, questionInfo.AcceptedAnswerID, questionInfo.ID, questionInfo.UserID, oldAnswerInfo.UserID)
 		if err != nil {
 			log.Error(err)
 		}
 	}
 	if newAnswerInfo.ID != "" {
 		err := as.answerActivityService.AcceptAnswer(
-			ctx, newAnswerInfo.ID, questionInfo.UserID, newAnswerInfo.UserID, newAnswerInfo.UserID == userID)
+			ctx, newAnswerInfo.ID, questionInfo.ID, questionInfo.UserID, newAnswerInfo.UserID, newAnswerInfo.UserID == userID)
 		if err != nil {
 			log.Error(err)
 		}
@@ -360,7 +372,7 @@ func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, answerID stri
 	}
 
 	if setStatus == entity.AnswerStatusDeleted {
-		err = as.answerActivityService.DeleteQuestion(ctx, answerInfo.ID, answerInfo.CreatedAt, answerInfo.VoteCount)
+		err = as.answerActivityService.DeleteAnswer(ctx, answerInfo.ID, answerInfo.CreatedAt, answerInfo.VoteCount)
 		if err != nil {
 			log.Errorf("admin delete question then rank rollback error %s", err.Error())
 		}
diff --git a/internal/service/auth/auth.go b/internal/service/auth/auth.go
index 23f4c010..1f77d174 100644
--- a/internal/service/auth/auth.go
+++ b/internal/service/auth/auth.go
@@ -40,7 +40,7 @@ func (as *AuthService) GetUserCacheInfo(ctx context.Context, accessToken string)
 	}
 	cacheInfo, _ := as.authRepo.GetUserStatus(ctx, userCacheInfo.UserID)
 	if cacheInfo != nil {
-		log.Infof("user status updated: %+v", cacheInfo)
+		log.Debugf("user status updated: %+v", cacheInfo)
 		userCacheInfo.UserStatus = cacheInfo.UserStatus
 		userCacheInfo.EmailStatus = cacheInfo.EmailStatus
 		userCacheInfo.IsAdmin = cacheInfo.IsAdmin
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index 99087816..236862be 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -151,9 +151,10 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 	}
 
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          comment.UserID,
-		ObjectID:        comment.ID,
-		ActivityTypeKey: constant.ActQuestionCommented,
+		UserID:           comment.UserID,
+		ObjectID:         comment.ID,
+		OriginalObjectID: req.ObjectID,
+		ActivityTypeKey:  constant.ActQuestionCommented,
 	})
 	return resp, nil
 }
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index e8b97e18..78190756 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"time"
 
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/config"
 	"github.com/answerdev/answer/internal/service/meta"
 	"github.com/segmentfault/pacman/errors"
@@ -308,7 +310,7 @@ func (qs *QuestionCommon) CloseQuestion(ctx context.Context, req *schema.CloseQu
 	if !has {
 		return nil
 	}
-	questionInfo.Status = entity.QuestionStatusclosed
+	questionInfo.Status = entity.QuestionStatusClosed
 	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
 	if err != nil {
 		return err
@@ -322,6 +324,14 @@ func (qs *QuestionCommon) CloseQuestion(ctx context.Context, req *schema.CloseQu
 	if err != nil {
 		return err
 	}
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           questionInfo.UserID,
+		ObjectID:         questionInfo.ID,
+		OriginalObjectID: questionInfo.ID,
+		ActivityTypeKey:  constant.ActQuestionClosed,
+		RevisionID:       questionInfo.RevisionID,
+	})
 	return nil
 }
 
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index e35b102a..32cebb77 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -72,7 +72,7 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 	if !has {
 		return nil
 	}
-	questionInfo.Status = entity.QuestionStatusclosed
+	questionInfo.Status = entity.QuestionStatusClosed
 	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
 	if err != nil {
 		return err
@@ -88,9 +88,11 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 	}
 
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          req.UserID,
-		ObjectID:        questionInfo.ID,
-		ActivityTypeKey: constant.ActQuestionClosed,
+		UserID:           req.UserID,
+		ObjectID:         questionInfo.ID,
+		OriginalObjectID: questionInfo.ID,
+		ActivityTypeKey:  constant.ActQuestionClosed,
+		RevisionID:       questionInfo.RevisionID,
 	})
 	return nil
 }
@@ -160,7 +162,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	}
 	infoJSON, _ := json.Marshal(questionWithTagsRevision)
 	revisionDTO.Content = string(infoJSON)
-	err = qs.revisionService.AddRevision(ctx, revisionDTO, true)
+	revisionID, err := qs.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return
 	}
@@ -172,9 +174,11 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	}
 
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          question.UserID,
-		ObjectID:        question.ID,
-		ActivityTypeKey: constant.ActQuestionAsked,
+		UserID:           question.UserID,
+		ObjectID:         question.ID,
+		OriginalObjectID: question.ID,
+		ActivityTypeKey:  constant.ActQuestionAsked,
+		RevisionID:       revisionID,
 	})
 
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
@@ -217,7 +221,13 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 	if err != nil {
 		log.Errorf("user DeleteQuestion rank rollback error %s", err.Error())
 	}
-
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           questionInfo.UserID,
+		ObjectID:         questionInfo.ID,
+		OriginalObjectID: questionInfo.ID,
+		ActivityTypeKey:  constant.ActQuestionDeleted,
+		RevisionID:       questionInfo.RevisionID,
+	})
 	return nil
 }
 
@@ -285,14 +295,16 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	}
 	infoJSON, _ := json.Marshal(question)
 	revisionDTO.Content = string(infoJSON)
-	err = qs.revisionService.AddRevision(ctx, revisionDTO, true)
+	revisionID, err := qs.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return
 	}
 	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:          req.UserID,
-		ObjectID:        question.ID,
-		ActivityTypeKey: constant.ActQuestionEdit,
+		UserID:           req.UserID,
+		ObjectID:         question.ID,
+		ActivityTypeKey:  constant.ActQuestionEdit,
+		RevisionID:       revisionID,
+		OriginalObjectID: question.ID,
 	})
 
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false)
@@ -602,8 +614,7 @@ func (qs *QuestionService) AdminSetQuestionStatus(ctx context.Context, questionI
 	if !exist {
 		return errors.BadRequest(reason.QuestionNotFound)
 	}
-	questionInfo.Status = setStatus
-	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
+	err = qs.questionRepo.UpdateQuestionStatus(ctx, &entity.Question{ID: questionInfo.ID, Status: setStatus})
 	if err != nil {
 		return err
 	}
@@ -614,6 +625,24 @@ func (qs *QuestionService) AdminSetQuestionStatus(ctx context.Context, questionI
 			log.Errorf("admin delete question then rank rollback error %s", err.Error())
 		}
 	}
+	if setStatus == entity.QuestionStatusAvailable && questionInfo.Status == entity.QuestionStatusClosed {
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           questionInfo.UserID,
+			ObjectID:         questionInfo.ID,
+			OriginalObjectID: questionInfo.ID,
+			ActivityTypeKey:  constant.ActQuestionDeleted,
+			RevisionID:       questionInfo.RevisionID,
+		})
+	}
+	if setStatus == entity.QuestionStatusClosed && questionInfo.Status != entity.QuestionStatusClosed {
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           questionInfo.UserID,
+			ObjectID:         questionInfo.ID,
+			OriginalObjectID: questionInfo.ID,
+			ActivityTypeKey:  constant.ActQuestionClosed,
+			RevisionID:       questionInfo.RevisionID,
+		})
+	}
 	msg := &schema.NotificationMsg{}
 	msg.ObjectID = questionInfo.ID
 	msg.Type = schema.NotificationTypeInbox
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index cee53710..ea425733 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -29,12 +29,13 @@ func NewRevisionService(revisionRepo revision.RevisionRepo, userRepo usercommon.
 // autoUpdateRevisionID bool : if autoUpdateRevisionID is true , the object.revision_id will be updated,
 // if not need auto update object.revision_id, it must be false.
 // example: user can edit the object, but need audit, the revision_id will be updated when admin approved
-func (rs *RevisionService) AddRevision(ctx context.Context, req *schema.AddRevisionDTO, autoUpdateRevisionID bool) (err error) {
+func (rs *RevisionService) AddRevision(ctx context.Context, req *schema.AddRevisionDTO, autoUpdateRevisionID bool) (
+	revisionID string, err error) {
 	rev := &entity.Revision{}
 	_ = copier.Copy(rev, req)
 	err = rs.revisionRepo.AddRevision(ctx, rev, autoUpdateRevisionID)
 	if err != nil {
-		return err
+		return "", err
 	}
-	return nil
+	return rev.ID, nil
 }
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index dcf02029..3845ebc6 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/answerdev/answer/internal/base/constant"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
 	"github.com/answerdev/answer/internal/service/tag_common"
@@ -105,10 +107,17 @@ func (ts *TagService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (
 	}
 	tagInfoJson, _ := json.Marshal(tagInfo)
 	revisionDTO.Content = string(tagInfoJson)
-	err = ts.revisionService.AddRevision(ctx, revisionDTO, true)
+	revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return err
 	}
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           req.UserID,
+		ObjectID:         tag.ID,
+		OriginalObjectID: tag.ID,
+		ActivityTypeKey:  constant.ActTagEdit,
+		RevisionID:       revisionID,
+	})
 	return
 }
 
@@ -299,10 +308,17 @@ func (ts *TagService) UpdateTagSynonym(ctx context.Context, req *schema.UpdateTa
 			}
 			tagInfoJson, _ := json.Marshal(tag)
 			revisionDTO.Content = string(tagInfoJson)
-			err = ts.revisionService.AddRevision(ctx, revisionDTO, true)
+			revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
 			if err != nil {
 				return err
 			}
+			activity_queue.AddActivity(&schema.ActivityMsg{
+				UserID:           req.UserID,
+				ObjectID:         tag.ID,
+				OriginalObjectID: tag.ID,
+				ActivityTypeKey:  constant.ActTagCreated,
+				RevisionID:       revisionID,
+			})
 		}
 	}
 
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 42a156a7..ef04c06b 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -7,10 +7,12 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/base/validator"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
 	"github.com/segmentfault/pacman/errors"
@@ -480,10 +482,17 @@ func (ts *TagCommonService) ObjectChangeTag(ctx context.Context, objectTagData *
 			}
 			tagInfoJson, _ := json.Marshal(tag)
 			revisionDTO.Content = string(tagInfoJson)
-			err = ts.revisionService.AddRevision(ctx, revisionDTO, true)
+			revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
 			if err != nil {
 				return err
 			}
+			activity_queue.AddActivity(&schema.ActivityMsg{
+				UserID:           objectTagData.UserID,
+				ObjectID:         tag.ID,
+				OriginalObjectID: tag.ID,
+				ActivityTypeKey:  constant.ActTagCreated,
+				RevisionID:       revisionID,
+			})
 		}
 	}
 

From 9c2e05d280d7a8111baa06d020817eda642e2201 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Wed, 23 Nov 2022 10:49:00 +0800
Subject: [PATCH 030/194] fix(router): remove unnecessary guard for
 `password-reset` @github: #92

---
 ui/src/router/routes.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index be7e61ac..7c56db23 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -160,20 +160,10 @@ const routes: RouteNode[] = [
       {
         path: 'users/password-reset',
         page: 'pages/Users/PasswordReset',
-        guard: async () => {
-          return guard.activated();
-        },
       },
       {
         path: 'users/account-activation',
         page: 'pages/Users/ActiveEmail',
-        // guard: async () => {
-        //   const notActivated = guard.notActivated();
-        //   if (notActivated.ok) {
-        //     return notActivated;
-        //   }
-        //   return guard.notLogged();
-        // },
       },
       {
         path: 'users/account-activation/success',

From 982d0342527a197b8430695fbbb116012485d1f1 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 11:07:28 +0800
Subject: [PATCH 031/194] feat: add timeline detail api

---
 cmd/answer/wire_gen.go                        |  2 +-
 internal/base/constant/acticity.go            |  6 +-
 internal/controller/activity_controller.go    | 20 ++++++
 internal/migrations/init.go                   |  6 +-
 internal/migrations/v3.go                     |  4 +-
 internal/repo/revision/revision_repo.go       | 11 +++
 internal/router/answer_api_router.go          |  1 +
 internal/schema/activity.go                   | 28 ++++++--
 internal/service/activity/activity.go         | 72 ++++++++++++++++++-
 internal/service/answer_service.go            |  3 +-
 internal/service/question_common/question.go  |  1 -
 internal/service/question_service.go          | 12 ++--
 internal/service/revision/revision.go         |  2 +
 .../revision_common/revision_service.go       | 15 ++++
 internal/service/tag/tag_service.go           |  2 +-
 15 files changed, 159 insertions(+), 26 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 8ec81bf1..21b1022e 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -189,7 +189,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	activityCommon := activity_common2.NewActivityCommon(activityRepo)
 	activityActivityRepo := activity.NewActivityRepo(dataData)
 	commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)
-	activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService)
+	activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService)
 	activityController := controller.NewActivityController(activityCommon, activityService)
 	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index e1b0a1d8..befa016b 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -13,7 +13,7 @@ const (
 	ActQuestionAccept    ActivityTypeKey = "question.accept"
 	ActQuestionUpvote    ActivityTypeKey = "question.upvote"
 	ActQuestionDownvote  ActivityTypeKey = "question.downvote"
-	ActQuestionEdit      ActivityTypeKey = "question.edit"
+	ActQuestionEdited    ActivityTypeKey = "question.edited"
 	ActQuestionRollback  ActivityTypeKey = "question.rollback"
 	ActQuestionDeleted   ActivityTypeKey = "question.deleted"
 	ActQuestionUndeleted ActivityTypeKey = "question.undeleted"
@@ -27,7 +27,7 @@ const (
 	ActAnswerAccept    ActivityTypeKey = "answer.accept"
 	ActAnswerUpvote    ActivityTypeKey = "answer.upvote"
 	ActAnswerDownvote  ActivityTypeKey = "answer.downvote"
-	ActAnswerEdit      ActivityTypeKey = "answer.edit"
+	ActAnswerEdited    ActivityTypeKey = "answer.edited"
 	ActAnswerRollback  ActivityTypeKey = "answer.rollback"
 	ActAnswerDeleted   ActivityTypeKey = "answer.deleted"
 	ActAnswerUndeleted ActivityTypeKey = "answer.undeleted"
@@ -37,7 +37,7 @@ const (
 
 const (
 	ActTagCreated   ActivityTypeKey = "tag.created"
-	ActTagEdit      ActivityTypeKey = "tag.edit"
+	ActTagEdited    ActivityTypeKey = "tag.edited"
 	ActTagRollback  ActivityTypeKey = "tag.rollback"
 	ActTagDeleted   ActivityTypeKey = "tag.deleted"
 	ActTagUndeleted ActivityTypeKey = "tag.undeleted"
diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go
index 7ce56f82..25a00d6b 100644
--- a/internal/controller/activity_controller.go
+++ b/internal/controller/activity_controller.go
@@ -43,3 +43,23 @@ func (ac *ActivityController) GetObjectTimeline(ctx *gin.Context) {
 	resp, err := ac.activityService.GetObjectTimeline(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
+
+// GetObjectTimelineDetail get object timeline detail
+// @Summary get object timeline detail
+// @Description get object timeline detail
+// @Tags Comment
+// @Produce json
+// @Param revision_id query string true "revision id"
+// @Success 200 {object} handler.RespBody{data=schema.GetObjectTimelineResp}
+// @Router /answer/api/v1/activity/timeline/detail [get]
+func (ac *ActivityController) GetObjectTimelineDetail(ctx *gin.Context) {
+	req := &schema.GetObjectTimelineDetailReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+
+	resp, err := ac.activityService.GetObjectTimelineDetail(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
+}
diff --git a/internal/migrations/init.go b/internal/migrations/init.go
index 46261da5..9c4bb522 100644
--- a/internal/migrations/init.go
+++ b/internal/migrations/init.go
@@ -248,17 +248,17 @@ func initConfigTable(engine *xorm.Engine) error {
 		{ID: 90, Key: "question.answered", Value: `0`},
 		{ID: 91, Key: "question.commented", Value: `0`},
 		{ID: 92, Key: "question.accept", Value: `0`},
-		{ID: 93, Key: "question.edit", Value: `0`},
+		{ID: 93, Key: "question.edited", Value: `0`},
 		{ID: 94, Key: "question.rollback", Value: `0`},
 		{ID: 95, Key: "question.deleted", Value: `0`},
 		{ID: 96, Key: "question.undeleted", Value: `0`},
 		{ID: 97, Key: "answer.answered", Value: `0`},
 		{ID: 98, Key: "answer.commented", Value: `0`},
-		{ID: 99, Key: "answer.edit", Value: `0`},
+		{ID: 99, Key: "answer.edited", Value: `0`},
 		{ID: 100, Key: "answer.rollback", Value: `0`},
 		{ID: 101, Key: "answer.undeleted", Value: `0`},
 		{ID: 102, Key: "tag.created", Value: `0`},
-		{ID: 103, Key: "tag.edit", Value: `0`},
+		{ID: 103, Key: "tag.edited", Value: `0`},
 		{ID: 104, Key: "tag.rollback", Value: `0`},
 		{ID: 105, Key: "tag.deleted", Value: `0`},
 		{ID: 106, Key: "tag.undeleted", Value: `0`},
diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index e47b2d5a..d7e68f10 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -7,7 +7,7 @@ import (
 )
 
 func addActivityTimeline(x *xorm.Engine) error {
-	type Reversion struct {
+	type Revision struct {
 		ReviewUserID int64 `xorm:"not null default 0 BIGINT(20) review_user_id"`
 	}
 	type Activity struct {
@@ -15,5 +15,5 @@ func addActivityTimeline(x *xorm.Engine) error {
 		RevisionID       int64     `xorm:"not null default 0 BIGINT(20) revision_id"`
 		OriginalObjectID string    `xorm:"not null default 0 BIGINT(20) original_object_id"`
 	}
-	return x.Sync(new(Activity), new(Reversion))
+	return x.Sync(new(Activity), new(Revision))
 }
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index 0d1c474a..e997bd8d 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -91,6 +91,17 @@ func (rr *revisionRepo) GetRevision(ctx context.Context, id string) (
 	return
 }
 
+// GetRevisionByID get object's last revision by object TagID
+func (rr *revisionRepo) GetRevisionByID(ctx context.Context, revisionID string) (
+	revision *entity.Revision, exist bool, err error) {
+	revision = &entity.Revision{}
+	exist, err = rr.data.DB.Where("id = ?", revisionID).Get(revision)
+	if err != nil {
+		return nil, false, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
 // GetLastRevisionByObjectID get object's last revision by object TagID
 func (rr *revisionRepo) GetLastRevisionByObjectID(ctx context.Context, objectID string) (
 	revision *entity.Revision, exist bool, err error,
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 90e938ea..9c78c133 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -206,6 +206,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 
 	// activity
 	r.GET("/activity/timeline", a.activityController.GetObjectTimeline)
+	r.GET("/activity/timeline/detail", a.activityController.GetObjectTimelineDetail)
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerCmsAPIRouter(r *gin.RouterGroup) {
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index c871bf9e..196e9198 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -14,11 +14,9 @@ type ActivityMsg struct {
 
 // GetObjectTimelineReq get object timeline request
 type GetObjectTimelineReq struct {
-	ObjectId    string `validate:"omitempty,gt=0,lte=100" form:"object_id"`
-	TagSlugName string `validate:"omitempty,gt=0,lte=35" form:"slug_name"`
-	ObjectType  string `validate:"required,oneof=question answer tag" form:"object_type"`
-	ShowVote    bool   `validate:"omitempty" form:"show_vote"`
-	UserID      string `json:"-"`
+	ObjectID string `validate:"omitempty,gt=0,lte=100" form:"object_id"`
+	ShowVote bool   `validate:"omitempty" form:"show_vote"`
+	UserID   string `json:"-"`
 }
 
 // GetObjectTimelineResp get object timeline response
@@ -49,3 +47,23 @@ type ActObjectInfo struct {
 	QuestionID string `json:"question_id"`
 	AnswerID   string `json:"answer_id"`
 }
+
+// GetObjectTimelineDetailReq get object timeline detail request
+type GetObjectTimelineDetailReq struct {
+	NewRevisionID string `validate:"required,gt=0,lte=100" form:"new_revision_id"`
+	OldRevisionID string `validate:"required,gt=0,lte=100" form:"old_revision_id"`
+	UserID        string `json:"-"`
+}
+
+// GetObjectTimelineDetailResp get object timeline detail response
+type GetObjectTimelineDetailResp struct {
+	NewRevision *ObjectTimelineDetail `json:"new_revision"`
+	OldRevision *ObjectTimelineDetail `json:"old_revision"`
+}
+
+// ObjectTimelineDetail object timeline detail
+type ObjectTimelineDetail struct {
+	Title        string   `json:"title"`
+	Tags         []string `json:"tags"`
+	OriginalText string   `json:"original_text"`
+}
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index f60db0e4..73fce527 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -2,6 +2,7 @@ package activity
 
 import (
 	"context"
+	"encoding/json"
 	"strings"
 
 	"github.com/answerdev/answer/internal/base/constant"
@@ -11,6 +12,7 @@ import (
 	"github.com/answerdev/answer/internal/service/activity_common"
 	"github.com/answerdev/answer/internal/service/comment_common"
 	"github.com/answerdev/answer/internal/service/object_info"
+	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/tag_common"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/answerdev/answer/pkg/converter"
@@ -30,6 +32,7 @@ type ActivityService struct {
 	tagCommonService      *tag_common.TagCommonService
 	objectInfoService     *object_info.ObjService
 	commentCommonService  *comment_common.CommentCommonService
+	revisionService       *revision_common.RevisionService
 }
 
 // NewActivityService new activity service
@@ -40,6 +43,7 @@ func NewActivityService(
 	tagCommonService *tag_common.TagCommonService,
 	objectInfoService *object_info.ObjService,
 	commentCommonService *comment_common.CommentCommonService,
+	revisionService *revision_common.RevisionService,
 ) *ActivityService {
 	return &ActivityService{
 		objectInfoService:     objectInfoService,
@@ -48,6 +52,7 @@ func NewActivityService(
 		activityCommonService: activityCommonService,
 		tagCommonService:      tagCommonService,
 		commentCommonService:  commentCommonService,
+		revisionService:       revisionService,
 	}
 }
 
@@ -59,7 +64,7 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		Timeline:   make([]*schema.ActObjectTimeline, 0),
 	}
 
-	objInfo, err := as.objectInfoService.GetInfo(ctx, req.ObjectId)
+	objInfo, err := as.objectInfoService.GetInfo(ctx, req.ObjectID)
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +73,7 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 	resp.ObjectInfo.QuestionID = objInfo.QuestionID
 	resp.ObjectInfo.AnswerID = objInfo.AnswerID
 
-	activityList, err := as.activityRepo.GetObjectAllActivity(ctx, req.ObjectId, req.ShowVote)
+	activityList, err := as.activityRepo.GetObjectAllActivity(ctx, req.ObjectID, req.ShowVote)
 	if err != nil {
 		return nil, err
 	}
@@ -118,6 +123,69 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 	return
 }
 
+// GetObjectTimelineDetail get object timeline
+func (as *ActivityService) GetObjectTimelineDetail(ctx context.Context, req *schema.GetObjectTimelineDetailReq) (
+	resp *schema.GetObjectTimelineDetailResp, err error) {
+	resp = &schema.GetObjectTimelineDetailResp{}
+	resp.OldRevision, err = as.getOneObjectDetail(ctx, req.OldRevisionID)
+	if err != nil {
+		return nil, err
+	}
+	resp.NewRevision, err = as.getOneObjectDetail(ctx, req.NewRevisionID)
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}
+
+// GetObjectTimelineDetail get object detail
+func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID string) (
+	resp *schema.ObjectTimelineDetail, err error) {
+	resp = &schema.ObjectTimelineDetail{Tags: make([]string, 0)}
+
+	revision, err := as.revisionService.GetRevision(ctx, revisionID)
+	if err != nil {
+		return nil, err
+	}
+	objInfo, err := as.objectInfoService.GetInfo(ctx, revision.ObjectID)
+	if err != nil {
+		return nil, err
+	}
+
+	switch objInfo.ObjectType {
+	case constant.QuestionObjectType:
+		data := &entity.QuestionWithTagsRevision{}
+		if err = json.Unmarshal([]byte(revision.Content), data); err != nil {
+			log.Errorf("revision parsing error %s", err)
+			return resp, nil
+		}
+		for _, tag := range data.Tags {
+			resp.Tags = append(resp.Tags, tag.SlugName)
+		}
+		resp.Title = data.Title
+		resp.OriginalText = data.OriginalText
+	case constant.AnswerObjectType:
+		data := &entity.Answer{}
+		if err = json.Unmarshal([]byte(revision.Content), data); err != nil {
+			log.Errorf("revision parsing error %s", err)
+			return resp, nil
+		}
+		resp.Title = objInfo.Title // answer show question title
+		resp.OriginalText = data.OriginalText
+	case constant.TagObjectType:
+		data := &entity.Tag{}
+		if err = json.Unmarshal([]byte(revision.Content), data); err != nil {
+			log.Errorf("revision parsing error %s", err)
+			return resp, nil
+		}
+		resp.Title = data.SlugName
+		resp.OriginalText = data.OriginalText
+	default:
+		log.Errorf("unknown object type %s", objInfo.ObjectType)
+	}
+	return resp, nil
+}
+
 func formatActivity(activityType string) (isHidden bool, formattedActivityType string) {
 	if activityType == "voted_up" || activityType == "voted_down" || activityType == "accepted" {
 		return true, ""
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index c326721e..5a6470a1 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -183,7 +183,6 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 		ObjectID:         insertData.ID,
 		OriginalObjectID: questionInfo.ID,
 		ActivityTypeKey:  constant.ActQuestionAnswered,
-		RevisionID:       revisionID,
 	})
 	return insertData.ID, nil
 }
@@ -229,7 +228,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 		UserID:           insertData.UserID,
 		ObjectID:         insertData.ID,
 		OriginalObjectID: insertData.ID,
-		ActivityTypeKey:  constant.ActAnswerEdit,
+		ActivityTypeKey:  constant.ActAnswerEdited,
 		RevisionID:       revisionID,
 	})
 	return insertData.ID, nil
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 78190756..9677cb1c 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -330,7 +330,6 @@ func (qs *QuestionCommon) CloseQuestion(ctx context.Context, req *schema.CloseQu
 		ObjectID:         questionInfo.ID,
 		OriginalObjectID: questionInfo.ID,
 		ActivityTypeKey:  constant.ActQuestionClosed,
-		RevisionID:       questionInfo.RevisionID,
 	})
 	return nil
 }
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 32cebb77..09811338 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -92,7 +92,6 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 		ObjectID:         questionInfo.ID,
 		OriginalObjectID: questionInfo.ID,
 		ActivityTypeKey:  constant.ActQuestionClosed,
-		RevisionID:       questionInfo.RevisionID,
 	})
 	return nil
 }
@@ -226,7 +225,6 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 		ObjectID:         questionInfo.ID,
 		OriginalObjectID: questionInfo.ID,
 		ActivityTypeKey:  constant.ActQuestionDeleted,
-		RevisionID:       questionInfo.RevisionID,
 	})
 	return nil
 }
@@ -293,7 +291,11 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		Title:    question.Title,
 		Log:      req.EditSummary,
 	}
-	infoJSON, _ := json.Marshal(question)
+	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question)
+	if err != nil {
+		return nil, err
+	}
+	infoJSON, _ := json.Marshal(questionWithTagsRevision)
 	revisionDTO.Content = string(infoJSON)
 	revisionID, err := qs.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
@@ -302,7 +304,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	activity_queue.AddActivity(&schema.ActivityMsg{
 		UserID:           req.UserID,
 		ObjectID:         question.ID,
-		ActivityTypeKey:  constant.ActQuestionEdit,
+		ActivityTypeKey:  constant.ActQuestionEdited,
 		RevisionID:       revisionID,
 		OriginalObjectID: question.ID,
 	})
@@ -631,7 +633,6 @@ func (qs *QuestionService) AdminSetQuestionStatus(ctx context.Context, questionI
 			ObjectID:         questionInfo.ID,
 			OriginalObjectID: questionInfo.ID,
 			ActivityTypeKey:  constant.ActQuestionDeleted,
-			RevisionID:       questionInfo.RevisionID,
 		})
 	}
 	if setStatus == entity.QuestionStatusClosed && questionInfo.Status != entity.QuestionStatusClosed {
@@ -640,7 +641,6 @@ func (qs *QuestionService) AdminSetQuestionStatus(ctx context.Context, questionI
 			ObjectID:         questionInfo.ID,
 			OriginalObjectID: questionInfo.ID,
 			ActivityTypeKey:  constant.ActQuestionClosed,
-			RevisionID:       questionInfo.RevisionID,
 		})
 	}
 	msg := &schema.NotificationMsg{}
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index 1d5d999c..75aaf8b4 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -2,6 +2,7 @@ package revision
 
 import (
 	"context"
+
 	"github.com/answerdev/answer/internal/entity"
 	"xorm.io/xorm"
 )
@@ -9,6 +10,7 @@ import (
 // RevisionRepo revision repository
 type RevisionRepo interface {
 	AddRevision(ctx context.Context, revision *entity.Revision, autoUpdateRevisionID bool) (err error)
+	GetRevisionByID(ctx context.Context, revisionID string) (revision *entity.Revision, exist bool, err error)
 	GetLastRevisionByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
 	GetRevisionList(ctx context.Context, revision *entity.Revision) (revisionList []entity.Revision, err error)
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index ea425733..d5e08b27 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -3,8 +3,10 @@ package revision_common
 import (
 	"context"
 
+	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/service/revision"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
+	"github.com/segmentfault/pacman/errors"
 
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
@@ -39,3 +41,16 @@ func (rs *RevisionService) AddRevision(ctx context.Context, req *schema.AddRevis
 	}
 	return rev.ID, nil
 }
+
+// GetRevision get revision
+func (rs *RevisionService) GetRevision(ctx context.Context, revisionID string) (
+	revision *entity.Revision, err error) {
+	revisionInfo, exist, err := rs.revisionRepo.GetRevisionByID(ctx, revisionID)
+	if err != nil {
+		return nil, err
+	}
+	if !exist {
+		return nil, errors.BadRequest(reason.ObjectNotFound)
+	}
+	return revisionInfo, nil
+}
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index 3845ebc6..8642f32c 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -115,7 +115,7 @@ func (ts *TagService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (
 		UserID:           req.UserID,
 		ObjectID:         tag.ID,
 		OriginalObjectID: tag.ID,
-		ActivityTypeKey:  constant.ActTagEdit,
+		ActivityTypeKey:  constant.ActTagEdited,
 		RevisionID:       revisionID,
 	})
 	return

From ba46d08e0476d9f9bae4aca0e8298ca4585feaf6 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 11:10:15 +0800
Subject: [PATCH 032/194] swagger

---
 docs/docs.go                               | 132 +++++++++++++++++++++
 docs/swagger.json                          | 132 +++++++++++++++++++++
 docs/swagger.yaml                          |  84 +++++++++++++
 i18n/en_US.yaml                            |   4 +-
 internal/controller/activity_controller.go |   2 +-
 internal/service/question_service.go       |   2 +-
 6 files changed, 352 insertions(+), 4 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 18be2dd5..c37e68ef 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1005,6 +1005,69 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/activity/timeline": {
+            "get": {
+                "description": "get object timeline",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Comment"
+                ],
+                "summary": "get object timeline",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "object id",
+                        "name": "object_id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "tag slug name",
+                        "name": "tag_slug_name",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            "question",
+                            "answer",
+                            "tag"
+                        ],
+                        "type": "string",
+                        "description": "object type",
+                        "name": "object_type",
+                        "in": "query"
+                    },
+                    {
+                        "type": "boolean",
+                        "description": "is show vote",
+                        "name": "show_vote",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/schema.GetObjectTimelineResp"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/answer": {
             "put": {
                 "security": [
@@ -4468,6 +4531,61 @@ const docTemplate = `{
                 "list": {}
             }
         },
+        "schema.ActObjectInfo": {
+            "type": "object",
+            "properties": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                }
+            }
+        },
+        "schema.ActObjectTimeline": {
+            "type": "object",
+            "properties": {
+                "activity_id": {
+                    "type": "string"
+                },
+                "activity_type": {
+                    "type": "string"
+                },
+                "cancelled": {
+                    "type": "boolean"
+                },
+                "cancelled_at": {
+                    "type": "integer"
+                },
+                "comment": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "revision_id": {
+                    "type": "string"
+                },
+                "user_display_name": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
         "schema.ActionRecordResp": {
             "type": "object",
             "properties": {
@@ -4874,6 +4992,20 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.GetObjectTimelineResp": {
+            "type": "object",
+            "properties": {
+                "object_info": {
+                    "$ref": "#/definitions/schema.ActObjectInfo"
+                },
+                "timeline": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.ActObjectTimeline"
+                    }
+                }
+            }
+        },
         "schema.GetOtherUserInfoByUsernameResp": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index e8d96d62..5a1c4c38 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -993,6 +993,69 @@
                 }
             }
         },
+        "/answer/api/v1/activity/timeline": {
+            "get": {
+                "description": "get object timeline",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Comment"
+                ],
+                "summary": "get object timeline",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "object id",
+                        "name": "object_id",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "tag slug name",
+                        "name": "tag_slug_name",
+                        "in": "query"
+                    },
+                    {
+                        "enum": [
+                            "question",
+                            "answer",
+                            "tag"
+                        ],
+                        "type": "string",
+                        "description": "object type",
+                        "name": "object_type",
+                        "in": "query"
+                    },
+                    {
+                        "type": "boolean",
+                        "description": "is show vote",
+                        "name": "show_vote",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/schema.GetObjectTimelineResp"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/answer": {
             "put": {
                 "security": [
@@ -4456,6 +4519,61 @@
                 "list": {}
             }
         },
+        "schema.ActObjectInfo": {
+            "type": "object",
+            "properties": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                }
+            }
+        },
+        "schema.ActObjectTimeline": {
+            "type": "object",
+            "properties": {
+                "activity_id": {
+                    "type": "string"
+                },
+                "activity_type": {
+                    "type": "string"
+                },
+                "cancelled": {
+                    "type": "boolean"
+                },
+                "cancelled_at": {
+                    "type": "integer"
+                },
+                "comment": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "revision_id": {
+                    "type": "string"
+                },
+                "user_display_name": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        },
         "schema.ActionRecordResp": {
             "type": "object",
             "properties": {
@@ -4862,6 +4980,20 @@
                 }
             }
         },
+        "schema.GetObjectTimelineResp": {
+            "type": "object",
+            "properties": {
+                "object_info": {
+                    "$ref": "#/definitions/schema.ActObjectInfo"
+                },
+                "timeline": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.ActObjectTimeline"
+                    }
+                }
+            }
+        },
         "schema.GetOtherUserInfoByUsernameResp": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 0cdd69bf..86ec580d 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -89,6 +89,42 @@ definitions:
         type: integer
       list: {}
     type: object
+  schema.ActObjectInfo:
+    properties:
+      answer_id:
+        type: string
+      object_type:
+        type: string
+      question_id:
+        type: string
+      title:
+        type: string
+    type: object
+  schema.ActObjectTimeline:
+    properties:
+      activity_id:
+        type: string
+      activity_type:
+        type: string
+      cancelled:
+        type: boolean
+      cancelled_at:
+        type: integer
+      comment:
+        type: string
+      created_at:
+        type: integer
+      object_id:
+        type: string
+      object_type:
+        type: string
+      revision_id:
+        type: string
+      user_display_name:
+        type: string
+      username:
+        type: string
+    type: object
   schema.ActionRecordResp:
     properties:
       captcha_id:
@@ -379,6 +415,15 @@ definitions:
         description: tag id
         type: string
     type: object
+  schema.GetObjectTimelineResp:
+    properties:
+      object_info:
+        $ref: '#/definitions/schema.ActObjectInfo'
+      timeline:
+        items:
+          $ref: '#/definitions/schema.ActObjectTimeline'
+        type: array
+    type: object
   schema.GetOtherUserInfoByUsernameResp:
     properties:
       answer_count:
@@ -2189,6 +2234,45 @@ paths:
       summary: get user page
       tags:
       - admin
+  /answer/api/v1/activity/timeline:
+    get:
+      description: get object timeline
+      parameters:
+      - description: object id
+        in: query
+        name: object_id
+        type: string
+      - description: tag slug name
+        in: query
+        name: tag_slug_name
+        type: string
+      - description: object type
+        enum:
+        - question
+        - answer
+        - tag
+        in: query
+        name: object_type
+        type: string
+      - description: is show vote
+        in: query
+        name: show_vote
+        type: boolean
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  $ref: '#/definitions/schema.GetObjectTimelineResp'
+              type: object
+      summary: get object timeline
+      tags:
+      - Comment
   /answer/api/v1/answer:
     delete:
       consumes:
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 04102618..19bc53cf 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -28,8 +28,8 @@ backend:
         other: "Answer do not found."
       cannot_deleted:
         other: "No permission to delete."
-    cannot_update:
-      other: "No permission to update."
+      cannot_update:
+        other: "No permission to update."
     comment:
       edit_without_permission:
         other: "Comment are not allowed to edit."
diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go
index 7ce56f82..3e53a53b 100644
--- a/internal/controller/activity_controller.go
+++ b/internal/controller/activity_controller.go
@@ -29,7 +29,7 @@ func NewActivityController(
 // @Param object_id query string false "object id"
 // @Param tag_slug_name query string false "tag slug name"
 // @Param object_type query string false "object type" Enums(question, answer, tag)
-// @Param show_vote bool false "is show vote"
+// @Param show_vote query boolean false "is show vote"
 // @Success 200 {object} handler.RespBody{data=schema.GetObjectTimelineResp}
 // @Router /answer/api/v1/activity/timeline [get]
 func (ac *ActivityController) GetObjectTimeline(ctx *gin.Context) {
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index f167d2c7..85772f7e 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -79,7 +79,7 @@ func (qs *QuestionService) CloseQuestion(ctx context.Context, req *schema.CloseQ
 			return errors.BadRequest(reason.QuestionCannotClose)
 		}
 	}
-	questionInfo.Status = entity.QuestionStatusclosed
+	questionInfo.Status = entity.QuestionStatusClosed
 	err = qs.questionRepo.UpdateQuestionStatus(ctx, questionInfo)
 	if err != nil {
 		return err

From 191ec2a1306d146689beecedab908e52e48abae8 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 11:19:06 +0800
Subject: [PATCH 033/194] fix: remove unused tag search service

---
 internal/service/search/tag.go | 102 ---------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 internal/service/search/tag.go

diff --git a/internal/service/search/tag.go b/internal/service/search/tag.go
deleted file mode 100644
index 806880f0..00000000
--- a/internal/service/search/tag.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package search
-
-import (
-	"context"
-	"regexp"
-	"strings"
-
-	"github.com/answerdev/answer/internal/entity"
-	"github.com/answerdev/answer/internal/schema"
-	"github.com/answerdev/answer/internal/service/activity_common"
-	"github.com/answerdev/answer/internal/service/search_common"
-	"github.com/answerdev/answer/internal/service/tag_common"
-)
-
-type TagSearch struct {
-	repo             search_common.SearchRepo
-	tagCommonService *tag_common.TagCommonService
-	followCommon     activity_common.FollowRepo
-	page             int
-	size             int
-	exp              string
-	w                string
-	userID           string
-	Extra            schema.GetTagPageResp
-	order            string
-}
-
-func NewTagSearch(repo search_common.SearchRepo,
-	tagCommonService *tag_common.TagCommonService, followCommon activity_common.FollowRepo) *TagSearch {
-	return &TagSearch{
-		repo:             repo,
-		tagCommonService: tagCommonService,
-		followCommon:     followCommon,
-	}
-}
-
-// Parse
-// example: "[tag]hello" -> {exp="tag" w="hello"}
-func (ts *TagSearch) Parse(dto *schema.SearchDTO) (ok bool) {
-	exp := ""
-	w := dto.Query
-	q := w
-	p := `(?m)^\[([a-zA-Z0-9-\+\.#]+)\]`
-
-	re := regexp.MustCompile(p)
-	res := re.FindStringSubmatch(q)
-	if len(res) == 2 {
-		exp = res[1]
-		trimLen := len(res[0])
-		w = q[trimLen:]
-		ok = true
-	}
-	w = strings.TrimSpace(w)
-	ts.exp = exp
-	ts.w = w
-	ts.page = dto.Page
-	ts.size = dto.Size
-	ts.userID = dto.UserID
-	ts.order = dto.Order
-	return ok
-}
-
-func (ts *TagSearch) Search(ctx context.Context) (resp []schema.SearchResp, total int64, err error) {
-	var (
-		words            []string
-		tag              *entity.Tag
-		exists, followed bool
-	)
-	tag, exists, err = ts.tagCommonService.GetTagBySlugName(ctx, ts.exp)
-	if err != nil {
-		return
-	}
-
-	if ts.userID != "" {
-		followed, err = ts.followCommon.IsFollowed(ts.userID, tag.ID)
-	}
-
-	ts.Extra = schema.GetTagPageResp{
-		TagID:         tag.ID,
-		SlugName:      tag.SlugName,
-		DisplayName:   tag.DisplayName,
-		OriginalText:  tag.OriginalText,
-		ParsedText:    tag.ParsedText,
-		QuestionCount: tag.QuestionCount,
-		IsFollower:    followed,
-		Recommend:     tag.Recommend,
-		Reserved:      tag.Reserved,
-	}
-	ts.Extra.GetExcerpt()
-
-	if !exists {
-		return
-	}
-	words = strings.Split(ts.w, " ")
-	if len(words) > 3 {
-		words = words[:4]
-	}
-
-	resp, total, err = ts.repo.SearchContents(ctx, words, tag.ID, "", -1, ts.page, ts.size, ts.order)
-
-	return
-}

From 5b005e652f851614ac2634bab77987573c2a33ba Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 11:38:39 +0800
Subject: [PATCH 034/194] fix admin update question

---
 internal/service/question_service.go | 56 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index b4ce1e03..18a657e9 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -270,13 +270,40 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if !has {
 		return
 	}
+	// If it's not admin
 	if !req.IsAdmin {
 		if dbinfo.UserID != req.UserID {
 			return questionInfo, errors.BadRequest(reason.QuestionCannotUpdate)
 		}
 
-	}
+		//CheckChangeTag
+		oldTags, tagerr := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
+		if err != nil {
+			return questionInfo, tagerr
+		}
+		tagNameList := make([]string, 0)
+		for _, tag := range req.Tags {
+			tagNameList = append(tagNameList, tag.SlugName)
+		}
+		Tags, tagerr := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
+		if err != nil {
+			return questionInfo, tagerr
+		}
 
+		CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
+		if !CheckTag {
+			errMsg := fmt.Sprintf(`The reserved tag %s must be present.`,
+				strings.Join(CheckTaglist, ","))
+			errorlist := make([]*validator.FormErrorField, 0)
+			errorlist = append(errorlist, &validator.FormErrorField{
+				ErrorField: "tags",
+				ErrorMsg:   errMsg,
+			})
+			err = errors.BadRequest(reason.RequestFormatError).WithMsg(errMsg)
+			return errorlist, err
+		}
+	}
+	// Check whether mandatory labels are selected
 	recommendExist, err := qs.tagCommon.ExistRecommend(ctx, req.Tags)
 	if err != nil {
 		return
@@ -291,33 +318,6 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return errorlist, err
 	}
 
-	//CheckChangeTag
-	oldTags, err := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
-	if err != nil {
-		return
-	}
-	tagNameList := make([]string, 0)
-	for _, tag := range req.Tags {
-		tagNameList = append(tagNameList, tag.SlugName)
-	}
-	Tags, err := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
-	if err != nil {
-		return
-	}
-
-	CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
-	if !CheckTag {
-		errMsg := fmt.Sprintf(`The reserved tag %s must be present.`,
-			strings.Join(CheckTaglist, ","))
-		errorlist := make([]*validator.FormErrorField, 0)
-		errorlist = append(errorlist, &validator.FormErrorField{
-			ErrorField: "tags",
-			ErrorMsg:   errMsg,
-		})
-		err = errors.BadRequest(reason.RequestFormatError).WithMsg(errMsg)
-		return errorlist, err
-	}
-
 	//update question to db
 	err = qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
 	if err != nil {

From 1bf0d6365e647b233be0b1eb9b29f0be4a2599e3 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 12:07:06 +0800
Subject: [PATCH 035/194] update question tags

---
 docs/docs.go                         | 41 ++++++++++++++
 docs/swagger.json                    | 41 ++++++++++++++
 docs/swagger.yaml                    | 24 +++++++++
 internal/schema/revision_schema.go   |  2 +
 internal/service/question_service.go | 80 ++++++++++++++++------------
 5 files changed, 155 insertions(+), 33 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index c37e68ef..089ae2b4 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1068,6 +1068,47 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/activity/timeline/detail": {
+            "get": {
+                "description": "get object timeline detail",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Comment"
+                ],
+                "summary": "get object timeline detail",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "revision id",
+                        "name": "revision_id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/schema.GetObjectTimelineResp"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/answer": {
             "put": {
                 "security": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 5a1c4c38..cf368108 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1056,6 +1056,47 @@
                 }
             }
         },
+        "/answer/api/v1/activity/timeline/detail": {
+            "get": {
+                "description": "get object timeline detail",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Comment"
+                ],
+                "summary": "get object timeline detail",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "revision id",
+                        "name": "revision_id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/schema.GetObjectTimelineResp"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/answer": {
             "put": {
                 "security": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 86ec580d..8258a984 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2273,6 +2273,30 @@ paths:
       summary: get object timeline
       tags:
       - Comment
+  /answer/api/v1/activity/timeline/detail:
+    get:
+      description: get object timeline detail
+      parameters:
+      - description: revision id
+        in: query
+        name: revision_id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  $ref: '#/definitions/schema.GetObjectTimelineResp'
+              type: object
+      summary: get object timeline detail
+      tags:
+      - Comment
   /answer/api/v1/answer:
     delete:
       consumes:
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 826b3030..9afe3454 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -16,6 +16,8 @@ type AddRevisionDTO struct {
 	Content string
 	// log
 	Log string
+	// status
+	Status int
 }
 
 // GetRevisionListReq get revision list all request
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 18a657e9..37b78f02 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -162,7 +162,17 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		ObjectID: question.ID,
 		Title:    question.Title,
 	}
-	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question)
+
+	tagNameList := make([]string, 0)
+	for _, tag := range req.Tags {
+		tagNameList = append(tagNameList, tag.SlugName)
+	}
+	Tags, tagerr := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
+	if tagerr != nil {
+		return questionInfo, tagerr
+	}
+
+	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question, Tags)
 	if err != nil {
 		return nil, err
 	}
@@ -270,23 +280,21 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if !has {
 		return
 	}
+
+	tagNameList := make([]string, 0)
+	for _, tag := range req.Tags {
+		tagNameList = append(tagNameList, tag.SlugName)
+	}
+	Tags, tagerr := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
+	if tagerr != nil {
+		return questionInfo, tagerr
+	}
+
 	// If it's not admin
 	if !req.IsAdmin {
-		if dbinfo.UserID != req.UserID {
-			return questionInfo, errors.BadRequest(reason.QuestionCannotUpdate)
-		}
-
 		//CheckChangeTag
 		oldTags, tagerr := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
-		if err != nil {
-			return questionInfo, tagerr
-		}
-		tagNameList := make([]string, 0)
-		for _, tag := range req.Tags {
-			tagNameList = append(tagNameList, tag.SlugName)
-		}
-		Tags, tagerr := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
-		if err != nil {
+		if tagerr != nil {
 			return questionInfo, tagerr
 		}
 
@@ -318,19 +326,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return errorlist, err
 	}
 
-	//update question to db
-	err = qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
-	if err != nil {
-		return
-	}
-	objectTagData := schema.TagChange{}
-	objectTagData.ObjectID = question.ID
-	objectTagData.Tags = req.Tags
-	objectTagData.UserID = req.UserID
-	err = qs.ChangeTag(ctx, &objectTagData)
-	if err != nil {
-		return
-	}
+	//Administrators and themselves do not need to be audited
 
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   question.UserID,
@@ -338,7 +334,29 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		Title:    question.Title,
 		Log:      req.EditSummary,
 	}
-	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question)
+
+	// It's not you or the administrator that needs to be reviewed
+	if dbinfo.UserID != req.UserID && !req.IsAdmin {
+		revisionDTO.Status = entity.RevisionUnreviewedStatus
+	} else {
+		//Direct modification
+		revisionDTO.Status = entity.RevisionReviewPassStatus
+		//update question to db
+		saveerr := qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
+		if saveerr != nil {
+			return questionInfo, saveerr
+		}
+		objectTagData := schema.TagChange{}
+		objectTagData.ObjectID = question.ID
+		objectTagData.Tags = req.Tags
+		objectTagData.UserID = req.UserID
+		tagerr := qs.ChangeTag(ctx, &objectTagData)
+		if err != nil {
+			return questionInfo, tagerr
+		}
+	}
+
+	questionWithTagsRevision, err := qs.changeQuestionToRevision(ctx, question, Tags)
 	if err != nil {
 		return nil, err
 	}
@@ -786,15 +804,11 @@ func (qs *QuestionService) CmsSearchAnswerList(ctx context.Context, search *enti
 	return answerlist, count, nil
 }
 
-func (qs *QuestionService) changeQuestionToRevision(ctx context.Context, questionInfo *entity.Question) (
+func (qs *QuestionService) changeQuestionToRevision(ctx context.Context, questionInfo *entity.Question, tags []*entity.Tag) (
 	questionRevision *entity.QuestionWithTagsRevision, err error) {
 	questionRevision = &entity.QuestionWithTagsRevision{}
 	questionRevision.Question = *questionInfo
 
-	tags, err := qs.tagCommon.GetObjectEntityTag(ctx, questionInfo.ID)
-	if err != nil {
-		return nil, err
-	}
 	for _, tag := range tags {
 		item := &entity.TagSimpleInfoForRevision{}
 		_ = copier.Copy(item, tag)

From f3b00e8f0ff42e276bbd737cc5e3de6af26b03fb Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Wed, 23 Nov 2022 14:13:03 +0800
Subject: [PATCH 036/194] fix(question): add field summary for question edit

---
 i18n/en_US.yaml                      |  5 ++++
 ui/src/pages/Questions/Ask/index.tsx | 38 ++++++++++++++++++++++++++--
 ui/src/services/common.ts            |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 9bbf5d6b..1c218845 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -497,6 +497,11 @@ ui:
           label: Answer
           msg:
             empty: Answer cannot be empty.
+        edit_summary:
+          label: Edit Summary
+          placeholder: >-
+            Briefly explain your changes (corrected spelling, fixed grammar,
+            improved formatting)
     btn_post_question: Post your question
     btn_save_edits: Save edits
     answer_question: Answer your own question
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 79614a49..648eb79c 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -25,6 +25,7 @@ interface FormDataItem {
   tags: Type.FormValue<Type.Tag[]>;
   content: Type.FormValue<string>;
   answer: Type.FormValue<string>;
+  edit_summary: Type.FormValue<string>;
 }
 const initFormData = {
   title: {
@@ -47,9 +48,15 @@ const initFormData = {
     isInvalid: false,
     errorMsg: '',
   },
+  edit_summary: {
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  },
 };
 
 const Ask = () => {
+  const { t } = useTranslation('translation', { keyPrefix: 'ask' });
   const [formData, setFormData] = useState<FormDataItem>(initFormData);
   const [checked, setCheckState] = useState(false);
   const [focusType, setForceType] = useState('');
@@ -63,7 +70,6 @@ const Ask = () => {
 
   const { qid } = useParams();
   const navigate = useNavigate();
-  const { t } = useTranslation('translation', { keyPrefix: 'ask' });
 
   const isEdit = qid !== undefined;
   const { data: similarQuestions = { list: [] } } = useQueryQuestionByTitle(
@@ -114,6 +120,15 @@ const Ask = () => {
       answer: { ...formData.answer, value },
     });
 
+  const handleSummaryChange = (evt: React.ChangeEvent<HTMLInputElement>) =>
+    setFormData({
+      ...formData,
+      edit_summary: {
+        ...formData.edit_summary,
+        value: evt.currentTarget.value,
+      },
+    });
+
   const checkValidated = (): boolean => {
     let bol = true;
     const { title, content, tags, answer } = formData;
@@ -205,7 +220,11 @@ const Ask = () => {
       tags: formData.tags.value,
     };
     if (isEdit) {
-      modifyQuestion({ ...params, id: qid })
+      modifyQuestion({
+        ...params,
+        id: qid,
+        edit_summary: formData.edit_summary.value,
+      })
         .then(() => {
           navigate(`/questions/${qid}`);
         })
@@ -354,6 +373,21 @@ const Ask = () => {
                   {formData.tags.errorMsg}
                 </Form.Control.Feedback>
               </Form.Group>
+              {isEdit && (
+                <Form.Group controlId="edit_summary" className="my-3">
+                  <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
+                  <Form.Control
+                    type="text"
+                    defaultValue={formData.edit_summary.value}
+                    isInvalid={formData.edit_summary.isInvalid}
+                    placeholder={t('form.fields.edit_summary.placeholder')}
+                    onChange={handleSummaryChange}
+                  />
+                  <Form.Control.Feedback type="invalid">
+                    {formData.edit_summary.errorMsg}
+                  </Form.Control.Feedback>
+                </Form.Group>
+              )}
               {!checked && (
                 <div className="mt-3">
                   <Button type="submit" className="me-2">
diff --git a/ui/src/services/common.ts b/ui/src/services/common.ts
index 8a541f03..43437d6e 100644
--- a/ui/src/services/common.ts
+++ b/ui/src/services/common.ts
@@ -73,7 +73,7 @@ export const useQueryAnswerInfo = (id: string) => {
 };
 
 export const modifyQuestion = (
-  params: Type.QuestionParams & { id: string },
+  params: Type.QuestionParams & { id: string; edit_summary: string },
 ) => {
   return request.put(`/answer/api/v1/question`, params);
 };

From d399b9756ff5eca9dc99d295c6aa921752d41ba5 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 14:21:11 +0800
Subject: [PATCH 037/194] feat: activity timeline revision add tag detail

---
 cmd/answer/wire_gen.go                        |  2 +-
 internal/base/constant/acticity.go            |  9 ++--
 internal/entity/question_entity.go            | 15 ++++---
 internal/repo/activity/activity_repo.go       |  3 +-
 internal/schema/activity.go                   | 15 +++++--
 internal/service/activity/activity.go         | 43 +++++++++++++------
 .../revision_common/revision_service.go       |  2 +
 7 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 21b1022e..3bab5d81 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -189,7 +189,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	activityCommon := activity_common2.NewActivityCommon(activityRepo)
 	activityActivityRepo := activity.NewActivityRepo(dataData)
 	commentCommonService := comment_common.NewCommentCommonService(commentCommonRepo)
-	activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService)
+	activityService := activity2.NewActivityService(activityActivityRepo, userCommon, activityCommon, tagCommonService, objService, commentCommonService, revisionService, metaService)
 	activityController := controller.NewActivityController(activityCommon, activityService)
 	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_backyardReportController, userBackyardController, reasonController, themeController, siteInfoController, siteinfoController, notificationController, dashboardController, uploadController, activityController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index befa016b..128659c4 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -4,6 +4,11 @@ package constant
 
 type ActivityTypeKey string
 
+const (
+	ActEdited = "edited"
+	ActClosed = "closed"
+)
+
 const (
 	ActQuestionAsked     ActivityTypeKey = "question.asked"
 	ActQuestionClosed    ActivityTypeKey = "question.closed"
@@ -19,8 +24,6 @@ const (
 	ActQuestionUndeleted ActivityTypeKey = "question.undeleted"
 )
 
-// answer activity
-
 const (
 	ActAnswerAnswered  ActivityTypeKey = "answer.answered"
 	ActAnswerCommented ActivityTypeKey = "answer.commented"
@@ -33,8 +36,6 @@ const (
 	ActAnswerUndeleted ActivityTypeKey = "answer.undeleted"
 )
 
-// tag activity
-
 const (
 	ActTagCreated   ActivityTypeKey = "tag.created"
 	ActTagEdited    ActivityTypeKey = "tag.edited"
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index fd459e71..7d1fd167 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -62,11 +62,12 @@ type QuestionWithTagsRevision struct {
 
 // TagSimpleInfoForRevision tag simple info for revision
 type TagSimpleInfoForRevision struct {
-	ID          string `xorm:"not null pk comment('tag_id') BIGINT(20) id"`
-	MainTagID   int64  `xorm:"not null default 0 BIGINT(20) main_tag_id"`
-	SlugName    string `xorm:"not null default '' unique VARCHAR(35) slug_name"`
-	DisplayName string `xorm:"not null default '' VARCHAR(35) display_name"`
-	Recommend   bool   `xorm:"not null default false BOOL recommend"`
-	Reserved    bool   `xorm:"not null default false BOOL reserved"`
-	RevisionID  string `xorm:"not null default 0 BIGINT(20) revision_id"`
+	ID              string `xorm:"not null pk comment('tag_id') BIGINT(20) id"`
+	MainTagID       int64  `xorm:"not null default 0 BIGINT(20) main_tag_id"`
+	MainTagSlugName string `xorm:"not null default '' VARCHAR(35) main_tag_slug_name"`
+	SlugName        string `xorm:"not null default '' unique VARCHAR(35) slug_name"`
+	DisplayName     string `xorm:"not null default '' VARCHAR(35) display_name"`
+	Recommend       bool   `xorm:"not null default false BOOL recommend"`
+	Reserved        bool   `xorm:"not null default false BOOL reserved"`
+	RevisionID      string `xorm:"not null default 0 BIGINT(20) revision_id"`
 }
diff --git a/internal/repo/activity/activity_repo.go b/internal/repo/activity/activity_repo.go
index e192bd16..ddd09d1b 100644
--- a/internal/repo/activity/activity_repo.go
+++ b/internal/repo/activity/activity_repo.go
@@ -27,7 +27,8 @@ func NewActivityRepo(
 func (ar *activityRepo) GetObjectAllActivity(ctx context.Context, objectID string, showVote bool) (
 	activityList []*entity.Activity, err error) {
 	activityList = make([]*entity.Activity, 0)
-	err = ar.data.DB.Find(&activityList, &entity.Activity{OriginalObjectID: objectID})
+	session := ar.data.DB.Desc("created_at") // TODO: if showVote is false do not show vote activity
+	err = session.Find(&activityList, &entity.Activity{OriginalObjectID: objectID})
 	if err != nil {
 		return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index 196e9198..c0598c30 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -63,7 +63,16 @@ type GetObjectTimelineDetailResp struct {
 
 // ObjectTimelineDetail object timeline detail
 type ObjectTimelineDetail struct {
-	Title        string   `json:"title"`
-	Tags         []string `json:"tags"`
-	OriginalText string   `json:"original_text"`
+	Title        string               `json:"title"`
+	Tags         []*ObjectTimelineTag `json:"tags"`
+	OriginalText string               `json:"original_text"`
+}
+
+// ObjectTimelineTag object timeline tags
+type ObjectTimelineTag struct {
+	SlugName        string `json:"slug_name"`
+	DisplayName     string `json:"display_name"`
+	MainTagSlugName string `json:"main_tag_slug_name"`
+	Recommend       bool   `json:"recommend"`
+	Reserved        bool   `json:"reserved"`
 }
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index 73fce527..b5af4c9e 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -11,6 +11,7 @@ import (
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity_common"
 	"github.com/answerdev/answer/internal/service/comment_common"
+	"github.com/answerdev/answer/internal/service/meta"
 	"github.com/answerdev/answer/internal/service/object_info"
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/tag_common"
@@ -33,6 +34,7 @@ type ActivityService struct {
 	objectInfoService     *object_info.ObjService
 	commentCommonService  *comment_common.CommentCommonService
 	revisionService       *revision_common.RevisionService
+	metaService           *meta.MetaService
 }
 
 // NewActivityService new activity service
@@ -44,6 +46,7 @@ func NewActivityService(
 	objectInfoService *object_info.ObjService,
 	commentCommonService *comment_common.CommentCommonService,
 	revisionService *revision_common.RevisionService,
+	metaService *meta.MetaService,
 ) *ActivityService {
 	return &ActivityService{
 		objectInfoService:     objectInfoService,
@@ -53,6 +56,7 @@ func NewActivityService(
 		tagCommonService:      tagCommonService,
 		commentCommonService:  commentCommonService,
 		revisionService:       revisionService,
+		metaService:           metaService,
 	}
 }
 
@@ -116,8 +120,23 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 			} else {
 				item.Comment = comment.ParsedText
 			}
+		} else if item.ActivityType == constant.ActEdited {
+			revision, err := as.revisionService.GetRevision(ctx, item.RevisionID)
+			if err != nil {
+				log.Error(err)
+			}
+			item.Comment = revision.Log
+		} else if item.ActivityType == constant.ActClosed {
+			metaInfo, err := as.metaService.GetMetaByObjectIdAndKey(ctx, item.ObjectID, entity.QuestionCloseReasonKey)
+			if err != nil {
+				log.Error(err)
+			} else {
+				closeMsg := &schema.CloseQuestionMeta{}
+				if err := json.Unmarshal([]byte(metaInfo.Value), closeMsg); err != nil {
+					item.Comment = closeMsg.CloseMsg
+				}
+			}
 		}
-
 		resp.Timeline = append(resp.Timeline, item)
 	}
 	return
@@ -127,25 +146,19 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 func (as *ActivityService) GetObjectTimelineDetail(ctx context.Context, req *schema.GetObjectTimelineDetailReq) (
 	resp *schema.GetObjectTimelineDetailResp, err error) {
 	resp = &schema.GetObjectTimelineDetailResp{}
-	resp.OldRevision, err = as.getOneObjectDetail(ctx, req.OldRevisionID)
-	if err != nil {
-		return nil, err
-	}
-	resp.NewRevision, err = as.getOneObjectDetail(ctx, req.NewRevisionID)
-	if err != nil {
-		return nil, err
-	}
+	resp.OldRevision, _ = as.getOneObjectDetail(ctx, req.OldRevisionID)
+	resp.NewRevision, _ = as.getOneObjectDetail(ctx, req.NewRevisionID)
 	return resp, nil
 }
 
 // GetObjectTimelineDetail get object detail
 func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID string) (
 	resp *schema.ObjectTimelineDetail, err error) {
-	resp = &schema.ObjectTimelineDetail{Tags: make([]string, 0)}
+	resp = &schema.ObjectTimelineDetail{Tags: make([]*schema.ObjectTimelineTag, 0)}
 
 	revision, err := as.revisionService.GetRevision(ctx, revisionID)
 	if err != nil {
-		return nil, err
+		return nil, nil
 	}
 	objInfo, err := as.objectInfoService.GetInfo(ctx, revision.ObjectID)
 	if err != nil {
@@ -160,7 +173,13 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 			return resp, nil
 		}
 		for _, tag := range data.Tags {
-			resp.Tags = append(resp.Tags, tag.SlugName)
+			resp.Tags = append(resp.Tags, &schema.ObjectTimelineTag{
+				SlugName:        tag.SlugName,
+				DisplayName:     tag.DisplayName,
+				MainTagSlugName: tag.MainTagSlugName,
+				Recommend:       tag.Recommend,
+				Reserved:        tag.Reserved,
+			})
 		}
 		resp.Title = data.Title
 		resp.OriginalText = data.OriginalText
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index d5e08b27..4d85ca98 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -7,6 +7,7 @@ import (
 	"github.com/answerdev/answer/internal/service/revision"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/segmentfault/pacman/errors"
+	"github.com/segmentfault/pacman/log"
 
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
@@ -47,6 +48,7 @@ func (rs *RevisionService) GetRevision(ctx context.Context, revisionID string) (
 	revision *entity.Revision, err error) {
 	revisionInfo, exist, err := rs.revisionRepo.GetRevisionByID(ctx, revisionID)
 	if err != nil {
+		log.Error(err)
 		return nil, err
 	}
 	if !exist {

From a6809441685a6069c3ef39c01c8a6b70cb8f626d Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:19:17 +0800
Subject: [PATCH 038/194] CheckCanUpdateQuestion

---
 docs/docs.go                                  | 38 +++++++++++++++++++
 docs/swagger.json                             | 38 +++++++++++++++++++
 docs/swagger.yaml                             | 24 ++++++++++++
 internal/controller/question_controller.go    | 28 ++++++++++++++
 internal/repo/revision/revision_repo.go       | 10 +++++
 internal/router/answer_api_router.go          |  1 +
 internal/schema/question_schema.go            |  8 ++++
 internal/service/question_service.go          | 19 ++++++++++
 internal/service/revision/revision.go         |  1 +
 .../revision_common/revision_service.go       |  6 +++
 10 files changed, 173 insertions(+)

diff --git a/docs/docs.go b/docs/docs.go
index 089ae2b4..017b0a49 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -2575,6 +2575,44 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/question/edit/check": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "check can update question",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "api-question"
+                ],
+                "summary": "check can update question",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "default": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/question/info": {
             "get": {
                 "security": [
diff --git a/docs/swagger.json b/docs/swagger.json
index cf368108..7d0ba920 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -2563,6 +2563,44 @@
                 }
             }
         },
+        "/answer/api/v1/question/edit/check": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "check can update question",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "api-question"
+                ],
+                "summary": "check can update question",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "default": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/question/info": {
             "get": {
                 "security": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 8258a984..8b644499 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3185,6 +3185,30 @@ paths:
       summary: close question msg list
       tags:
       - api-question
+  /answer/api/v1/question/edit/check:
+    get:
+      consumes:
+      - application/json
+      description: check can update question
+      parameters:
+      - default: string
+        description: id
+        in: query
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RespBody'
+      security:
+      - ApiKeyAuth: []
+      summary: check can update question
+      tags:
+      - api-question
   /answer/api/v1/question/info:
     get:
       consumes:
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 203fbcf8..940f8c4e 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -229,6 +229,34 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 	handler.HandleResponse(ctx, err, resp)
 }
 
+// CheckCanUpdateQuestion check can update question
+// @Summary check can update question
+// @Description check can update question
+// @Tags api-question
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param id query string true "id"  default(string)
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/question/edit/check [get]
+func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
+	id := ctx.Query("id")
+	req := &schema.CheckCanQuestionUpdate{}
+	req.ID = id
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	req.IsAdmin = userinfo.IsAdmin
+	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
+		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+		return
+	}
+
+	resp, err := qc.questionService.CheckCanUpdateQuestion(ctx, req)
+	handler.HandleResponse(ctx, err, gin.H{
+		"unreviewed": resp,
+	})
+}
+
 // CloseMsgList close question msg list
 // @Summary close question msg list
 // @Description close question msg list
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index e997bd8d..1545d7fa 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -102,6 +102,16 @@ func (rr *revisionRepo) GetRevisionByID(ctx context.Context, revisionID string)
 	return
 }
 
+func (rr *revisionRepo) ExistUnreviewedByObjectID(ctx context.Context, objectID string) (
+	revision *entity.Revision, exist bool, err error) {
+	revision = &entity.Revision{}
+	exist, err = rr.data.DB.Where("object_id = ?", objectID).And("status = ?", entity.RevisionUnreviewedStatus).Get(revision)
+	if err != nil {
+		return nil, false, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
 // GetLastRevisionByObjectID get object's last revision by object TagID
 func (rr *revisionRepo) GetLastRevisionByObjectID(ctx context.Context, objectID string) (
 	revision *entity.Revision, exist bool, err error,
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 9c78c133..2fa6ccfe 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -172,6 +172,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	// question
 	r.POST("/question", a.questionController.AddQuestion)
 	r.PUT("/question", a.questionController.UpdateQuestion)
+	r.GET("/question/edit/check", a.questionController.CheckCanUpdateQuestion)
 	r.DELETE("/question", a.questionController.RemoveQuestion)
 	r.PUT("/question/status", a.questionController.CloseQuestion)
 	r.GET("/question/similar", a.questionController.SearchByTitleLike)
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 0669a7ec..b6b5d0c0 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -34,6 +34,14 @@ type QuestionAdd struct {
 	UserID string `json:"-"`
 }
 
+type CheckCanQuestionUpdate struct {
+	// question id
+	ID string `validate:"required" json:"id"`
+	// user id
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"-"`
+}
+
 type QuestionUpdate struct {
 	// question id
 	ID string `validate:"required" json:"id"`
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 37b78f02..e9b8a4a9 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -262,9 +262,28 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 	return nil
 }
 
+func (qs *QuestionService) CheckCanUpdateQuestion(ctx context.Context, req *schema.CheckCanQuestionUpdate) (exist bool, err error) {
+	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
+	if err != nil {
+		return false, err
+	}
+	return existUnreviewed, nil
+}
+
 // UpdateQuestion update question
 func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
+
 	questionInfo = &schema.QuestionInfo{}
+
+	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
+	if err != nil {
+		return
+	}
+	if existUnreviewed {
+		err = errors.BadRequest(reason.QuestionCannotUpdate)
+		return
+	}
+
 	now := time.Now()
 	question := &entity.Question{}
 	question.UserID = req.UserID
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index 75aaf8b4..cbac464f 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -14,4 +14,5 @@ type RevisionRepo interface {
 	GetLastRevisionByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
 	GetRevisionList(ctx context.Context, revision *entity.Revision) (revisionList []entity.Revision, err error)
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
+	ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
 }
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index d5e08b27..4383d94c 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -54,3 +54,9 @@ func (rs *RevisionService) GetRevision(ctx context.Context, revisionID string) (
 	}
 	return revisionInfo, nil
 }
+
+// ExistUnreviewedByObjectID
+func (rs *RevisionService) ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error) {
+	revision, exist, err = rs.revisionRepo.ExistUnreviewedByObjectID(ctx, objectID)
+	return revision, exist, err
+}

From f3ec755e928187f9252b8f6d294d6ab5f9ab6689 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 23 Nov 2022 15:21:36 +0800
Subject: [PATCH 039/194] feat: add timeline router

---
 i18n/en_US.yaml                               |   1 +
 ui/.eslintrc.js                               |   1 +
 ui/src/common/constants.ts                    |   2 +
 ui/src/common/interface.ts                    |   4 +-
 ui/src/components/DiffContent/index.tsx       |  81 +++++----
 ui/src/components/UserCard/index.tsx          |  24 ++-
 .../Detail/components/Answer/index.tsx        |  15 ++
 .../Detail/components/Question/index.tsx      |  15 +-
 ui/src/pages/Questions/Detail/index.tsx       |   3 +
 ui/src/pages/Tags/Info/index.tsx              |  10 ++
 .../pages/Timeline/components/Item/index.tsx  | 158 ++++++------------
 ui/src/pages/Timeline/index.tsx               | 137 ++++++---------
 ui/src/router/routes.ts                       |  16 +-
 ui/src/services/client/timeline.ts            |  11 ++
 ui/src/utils/common.ts                        |   2 +-
 15 files changed, 238 insertions(+), 242 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 9fdce111..fbe1fafc 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -380,6 +380,7 @@ ui:
   tag_info:
     created_at: Created
     edited_at: Edited
+    history: History
     synonyms:
       title: Synonyms
       text: The following tags will be remapped to
diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
index 7013efbc..032c2103 100644
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@@ -51,6 +51,7 @@ module.exports = {
     'react-hooks/exhaustive-deps': 'off',
     'react/jsx-props-no-spreading': 'off',
     '@typescript-eslint/default-param-last': 'off',
+    'no-nested-ternary': 'off',
     'import/order': [
       'error',
       {
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index b9ce8e86..f0a282ba 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -563,4 +563,6 @@ export const TIMELINE_NORMAL_ACTIVITY_TYPE = [
   'deleted',
   'downvote',
   'upvote',
+  'reopened',
+  'closed',
 ];
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index a8e3e894..98d3e041 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -376,10 +376,8 @@ export interface AdminDashboard {
 }
 
 export interface TimelineReq {
-  object_type: string;
   show_vote: boolean;
-  object_id?: string;
-  tag_slug_name?: string;
+  object_id: string;
 }
 
 export interface TimelineItem {
diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 28dced85..432fbc9e 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -4,28 +4,27 @@ import { Tag } from '@/components';
 import { diffText } from '@/utils';
 
 interface Props {
-  currentData: Record<string, any>;
-  prevData?: Record<string, any>;
+  objectType: string;
+  newData: Record<string, any>;
+  oldData?: Record<string, any>;
   className?: string;
 }
 
-const Index: FC<Props> = ({ currentData, prevData, className = '' }) => {
-  if (!currentData?.content) return null;
+const Index: FC<Props> = ({ objectType, newData, oldData, className = '' }) => {
+  if (!newData?.original_text) return null;
 
-  let tag;
-  if (prevData?.tags) {
-    const addTags = currentData.tags.filter(
-      (c) => !prevData?.tags?.find((p) => p.slug_name === c.slug_name),
+  let tag = newData.tags;
+  if (objectType === 'question' && oldData?.tags) {
+    const addTags = newData.tags.filter(
+      (c) => !oldData?.tags?.find((p) => p.slug_name === c.slug_name),
     );
 
-    let deleteTags = prevData?.tags
-      .filter(
-        (c) => !currentData?.tags.find((p) => p.slug_name === c.slug_name),
-      )
+    let deleteTags = oldData?.tags
+      .filter((c) => !newData?.tags.find((p) => p.slug_name === c.slug_name))
       .map((v) => ({ ...v, state: 'delete' }));
 
     deleteTags = deleteTags?.map((v) => {
-      const index = prevData?.tags?.findIndex(
+      const index = oldData?.tags?.findIndex(
         (c) => c.slug_name === v.slug_name,
       );
       return {
@@ -34,7 +33,7 @@ const Index: FC<Props> = ({ currentData, prevData, className = '' }) => {
       };
     });
 
-    tag = currentData.tags.map((item) => {
+    tag = newData.tags.map((item) => {
       const find = addTags.find((c) => c.slug_name === item.slug_name);
       if (find) {
         return {
@@ -52,27 +51,43 @@ const Index: FC<Props> = ({ currentData, prevData, className = '' }) => {
 
   return (
     <div className={className}>
-      <h5
-        dangerouslySetInnerHTML={{
-          __html: diffText(currentData.title, prevData?.title),
-        }}
-        className="mb-3"
-      />
-      <div className="mb-4">
-        {tag.map((item) => {
-          return (
-            <Tag
-              key={item.slug_name}
-              className="me-1"
-              data={item}
-              textClassName={`d-inline-block review-text-${item.state}`}
-            />
-          );
-        })}
-      </div>
+      {objectType !== 'answer' && (
+        <h5
+          dangerouslySetInnerHTML={{
+            __html: diffText(newData.title, oldData?.title),
+          }}
+          className="mb-3"
+        />
+      )}
+      {objectType === 'question' && (
+        <div className="mb-4">
+          {tag.map((item) => {
+            return (
+              <Tag
+                key={item.slug_name}
+                className="me-1"
+                data={item}
+                textClassName={`d-inline-block review-text-${item.state}`}
+              />
+            );
+          })}
+        </div>
+      )}
+      {objectType === 'tag' && (
+        <div className="mb-4">
+          {`/tags/${
+            newData?.main_tag_slug_name
+              ? diffText(
+                  newData.main_tag_slug_name,
+                  oldData?.main_tag_slug_name,
+                )
+              : diffText(newData.slug_name, oldData?.slug_name)
+          }`}
+        </div>
+      )}
       <div
         dangerouslySetInnerHTML={{
-          __html: diffText(currentData.content, prevData?.content),
+          __html: diffText(newData.original_text, oldData?.original_text),
         }}
         className="pre-line"
       />
diff --git a/ui/src/components/UserCard/index.tsx b/ui/src/components/UserCard/index.tsx
index 169354ec..6f4ffd68 100644
--- a/ui/src/components/UserCard/index.tsx
+++ b/ui/src/components/UserCard/index.tsx
@@ -10,10 +10,19 @@ interface Props {
   data: any;
   time: number;
   preFix: string;
+  isLogged: boolean;
+  timelinePath: string;
   className?: string;
 }
 
-const Index: FC<Props> = ({ data, time, preFix, className = '' }) => {
+const Index: FC<Props> = ({
+  data,
+  time,
+  preFix,
+  isLogged,
+  timelinePath,
+  className = '',
+}) => {
   return (
     <div className={classnames('d-flex', className)}>
       {data?.status !== 'deleted' ? (
@@ -62,7 +71,18 @@ const Index: FC<Props> = ({ data, time, preFix, className = '' }) => {
             {formatCount(data?.rank)}
           </span>
         </div>
-        {time && <FormatTime time={time} preFix={preFix} />}
+        {time &&
+          (isLogged ? (
+            <Link to={timelinePath}>
+              <FormatTime
+                time={time}
+                preFix={preFix}
+                className="link-secondary"
+              />
+            </Link>
+          ) : (
+            <FormatTime time={time} preFix={preFix} />
+          ))}
       </div>
     </div>
   );
diff --git a/ui/src/pages/Questions/Detail/components/Answer/index.tsx b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
index 2fe87d1c..43e8627b 100644
--- a/ui/src/pages/Questions/Detail/components/Answer/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
@@ -1,6 +1,7 @@
 import { memo, FC, useEffect, useRef } from 'react';
 import { Row, Col, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import {
   Actions,
@@ -22,12 +23,14 @@ interface Props {
   /** is author */
   isAuthor: boolean;
   questionTitle: string;
+  isLogged: boolean;
   callback: (type: string) => void;
 }
 const Index: FC<Props> = ({
   aid,
   data,
   isAuthor,
+  isLogged,
   questionTitle = '',
   callback,
 }) => {
@@ -119,7 +122,17 @@ const Index: FC<Props> = ({
               data={data?.update_user_info}
               time={Number(data.update_time)}
               preFix={t('edit')}
+              isLogged={isLogged}
+              timelinePath={`/posts/${data.question_id}/${data.id}/timeline`}
             />
+          ) : isLogged ? (
+            <Link to={`/posts/${data.question_id}/${data.id}/timeline`}>
+              <FormatTime
+                time={Number(data.update_time)}
+                preFix={t('edit')}
+                className="link-secondary fs-14"
+              />
+            </Link>
           ) : (
             <FormatTime
               time={Number(data.update_time)}
@@ -133,6 +146,8 @@ const Index: FC<Props> = ({
             data={data?.user_info}
             time={Number(data.create_time)}
             preFix={t('answered')}
+            isLogged={isLogged}
+            timelinePath={`/posts/${data.question_id}/${data.id}/timeline`}
           />
         </Col>
       </Row>
diff --git a/ui/src/pages/Questions/Detail/components/Question/index.tsx b/ui/src/pages/Questions/Detail/components/Question/index.tsx
index 685c0486..812cb306 100644
--- a/ui/src/pages/Questions/Detail/components/Question/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Question/index.tsx
@@ -18,10 +18,11 @@ import { following } from '@/services';
 interface Props {
   data: any;
   hasAnswer: boolean;
+  isLogged: boolean;
   initPage: (type: string) => void;
 }
 
-const Index: FC<Props> = ({ data, initPage, hasAnswer }) => {
+const Index: FC<Props> = ({ data, initPage, hasAnswer, isLogged }) => {
   const { t } = useTranslation('translation', {
     keyPrefix: 'question_detail',
   });
@@ -133,7 +134,17 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer }) => {
               data={data?.user_info}
               time={data.edit_time}
               preFix={t('edit')}
+              isLogged={isLogged}
+              timelinePath={`/posts/${data.id}/timeline`}
             />
+          ) : isLogged ? (
+            <Link to={`/posts/${data.id}/timeline`}>
+              <FormatTime
+                time={data.edit_time}
+                preFix={t('edit')}
+                className="link-secondary fs-14"
+              />
+            </Link>
           ) : (
             <FormatTime
               time={data.edit_time}
@@ -147,6 +158,8 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer }) => {
             data={data?.user_info}
             time={data.create_time}
             preFix={t('asked')}
+            isLogged={isLogged}
+            timelinePath={`/posts/${data.id}/timeline`}
           />
         </Col>
       </Row>
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index cc19a719..36546cb3 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -39,6 +39,7 @@ const Index = () => {
   const { setUsers } = usePageUsers();
   const userInfo = loggedUserInfoStore((state) => state.user);
   const isAuthor = userInfo?.username === question?.user_info?.username;
+  const isLogged = Boolean(userInfo?.access_token);
   const requestAnswers = async () => {
     const res = await getAnswers({
       order: order === 'updated' ? order : 'default',
@@ -126,6 +127,7 @@ const Index = () => {
               data={question}
               initPage={initPage}
               hasAnswer={answers.count > 0}
+              isLogged={isLogged}
             />
             {answers.count > 0 && (
               <>
@@ -139,6 +141,7 @@ const Index = () => {
                       questionTitle={question?.title || ''}
                       isAuthor={isAuthor}
                       callback={initPage}
+                      isLogged={isLogged}
                     />
                   );
                 })}
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index 4f1ef3f7..6477030a 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -12,8 +12,11 @@ import {
   saveSynonymsTags,
   deleteTag,
 } from '@/services';
+import { loggedUserInfoStore } from '@/stores';
 
 const TagIntroduction = () => {
+  const userInfo = loggedUserInfoStore((state) => state.user);
+  const isLogged = Boolean(userInfo?.access_token);
   const [isEdit, setEditState] = useState(false);
   const { tagName } = useParams();
   const { data: tagInfo } = useTagInfo({ name: tagName });
@@ -125,6 +128,13 @@ const TagIntroduction = () => {
                   </Button>
                 );
               })}
+              {isLogged && (
+                <Link
+                  to={`/tags/${tagInfo?.tag_id}/timeline`}
+                  className="link-secondary btn-no-border p-0 fs-14 ms-3">
+                  {t('history')}
+                </Link>
+              )}
             </div>
           </Col>
           <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
diff --git a/ui/src/pages/Timeline/components/Item/index.tsx b/ui/src/pages/Timeline/components/Item/index.tsx
index eccfd808..c25adba9 100644
--- a/ui/src/pages/Timeline/components/Item/index.tsx
+++ b/ui/src/pages/Timeline/components/Item/index.tsx
@@ -6,113 +6,43 @@ import { useTranslation } from 'react-i18next';
 import { Icon, BaseUserCard, DiffContent, FormatTime } from '@/components';
 import { TIMELINE_NORMAL_ACTIVITY_TYPE } from '@/common/constants';
 import * as Type from '@/common/interface';
-
-const data1 = {
-  title: '不是管理员，提一个问题看看能不能编辑resserved tag?',
-  tags: [
-    {
-      display_name: 'bug',
-      slug_name: 'bug',
-      recommend: true,
-      reserved: false,
-    },
-    {
-      display_name: '黄马甲',
-      slug_name: '黄马甲',
-      recommend: false,
-      reserved: true,
-    },
-    {
-      display_name: 'go',
-      slug_name: 'go',
-      recommend: false,
-      reserved: false,
-    },
-  ],
-  content: `# 前言
-  手写 Promise 是面试的时候大家都逃避的送命题，在学些了解后发现通过实现源码更能将新一代的异步方案理解的通透，知其然知其所以然的运用。
-
-  如果直接将源码贴到此处势必不能有更大的收获，下面就按实现版本来看做简要分析。
-
-  ## 回顾 Promise
-  Promise 是 CommonJS 提出来的这一种规范，有多个版本，在 ES6 当中已经纳入规范，原生支持 Promise 对象，非 ES6 环境可以用类似 Bluebird、Q 这类库来支持。
-
-  Promise 可以将回调变成链式调用写法，流程更加清晰，代码更加优雅，还可以批量处理异步任务。
-
-  简单归纳下 Promise：三个状态、两个过程、一个方法，快速记忆方法：3-2-1
-
-  三个状态：pending、fulfilled、rejected
-
-  两个过程：
-
-  * pending → fulfilled（resolve）
-  * pending → rejected（reject）
-  一个方法：then
-
-  当然还有其他概念，如 catch、 Promise.all/race/allSettled。`,
-};
-
-const data2 = {
-  title: '提一个问题看看能不能编辑 resserved tag?',
-  tags: [
-    {
-      display_name: 'discussion',
-      slug_name: 'discussion',
-      recommend: true,
-      reserved: false,
-    },
-    {
-      display_name: '黄马甲',
-      slug_name: '黄马甲',
-      recommend: false,
-      reserved: true,
-    },
-    {
-      display_name: 'go',
-      slug_name: 'go',
-      recommend: false,
-      reserved: false,
-    },
-  ],
-  content: `# 前言
-  手写 Promise 是面试的时候大家都逃避的送命题，在学些了解后发现通过实现源码更能将新一代的异步方案理解的通透，知用。
-
-  ## 增加的titlte
-
-  如果直接将源码贴到此处势必不能有更大的收获。
-
-  ## 回顾 Promise
-  Promise 是 CommonJS 规范，并且有多个版本，在 ES6 当中已经纳入规范，原生支持 Promise 对象，非 ES6 环境可以用类似 Bluebird、Q 这类库来支持。
-
-  Promise 可以将回调变成链式调用写法，流程更加清晰，代码更加优雅，还可以批量处理异步任务。
-
-  简单归纳下 Promise：三个状态、两个过程、一个方法，快速记忆方法：3-2-1
-
-  两个过程：
-
-  * pending → fulfilled（resolve）
-  * pending → rejected（reject）
-  一个方法：then
-  `,
-};
+import { getTimelineDetail } from '@/services';
 
 interface Props {
   data: Type.TimelineItem;
   objectInfo: Type.TimelineObject;
-  source: 'question' | 'answer' | 'tag';
   isAdmin: boolean;
+  revisionList: Type.TimelineItem[];
 }
-const Index: FC<Props> = ({
-  data,
-  isAdmin,
-  source = 'question',
-  objectInfo,
-}) => {
+const Index: FC<Props> = ({ data, isAdmin, objectInfo, revisionList }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'timeline' });
   const [isOpen, setIsOpen] = useState(false);
-  const handleItemClick = () => {
+  const [detailData, setDetailData] = useState({
+    new_revision: {},
+    old_revision: {},
+  });
+
+  const handleItemClick = async (id) => {
+    if (!isOpen) {
+      const revisionItem = revisionList?.find((v) => v.revision_id === id);
+      let oldId;
+      if (revisionList?.length > 0 && revisionItem) {
+        const idIndex = revisionList.indexOf(revisionItem) || 0;
+        if (idIndex === revisionList.length - 1) {
+          oldId = 0;
+        } else {
+          oldId = revisionList[idIndex + 1].revision_id;
+        }
+      }
+      const res = await getTimelineDetail({
+        new_revision_id: id,
+        old_revision_id: oldId,
+      });
+      setDetailData(res);
+    }
     setIsOpen(!isOpen);
   };
+
   return (
     <>
       <tr>
@@ -126,9 +56,10 @@ const Index: FC<Props> = ({
             data.activity_type === 'edited' ||
             data.activity_type === 'asked' ||
             data.activity_type === 'created' ||
-            (source === 'answer' && data.activity_type === 'answered')) && (
+            (objectInfo.object_type === 'answer' &&
+              data.activity_type === 'answered')) && (
             <Button
-              onClick={handleItemClick}
+              onClick={() => handleItemClick(data.revision_id)}
               variant="link"
               className="text-body p-0 btn-no-border">
               <Icon
@@ -139,24 +70,25 @@ const Index: FC<Props> = ({
             </Button>
           )}
           {data.activity_type === 'accept' && (
-            <Link to={`/question/${objectInfo.question_id}`}>
+            <Link to={`/questions/${objectInfo.question_id}`}>
               {t(data.activity_type)}
             </Link>
           )}
 
-          {source === 'question' && data.activity_type === 'answered' && (
-            <Link
-              to={`/question/${objectInfo.question_id}/${objectInfo.answer_id}`}>
-              {t(data.activity_type)}
-            </Link>
-          )}
+          {data.object_type === 'question' &&
+            data.activity_type === 'answered' && (
+              <Link
+                to={`/questions/${objectInfo.question_id}/${data.object_id}`}>
+                {t(data.activity_type)}
+              </Link>
+            )}
 
           {data.activity_type === 'commented' && (
             <Link
               to={
-                data.object_type === 'answer'
-                  ? `/question/${objectInfo.question_id}/${objectInfo.answer_id}?commentId=${data.object_id}`
-                  : `/question/${objectInfo.question_id}?commentId=${data.object_id}`
+                objectInfo.object_type === 'answer'
+                  ? `/questions/${objectInfo.question_id}/${objectInfo.answer_id}?commentId=${data.object_id}`
+                  : `/questions/${objectInfo.question_id}?commentId=${data.object_id}`
               }>
               {t(data.activity_type)}
             </Link>
@@ -167,7 +99,7 @@ const Index: FC<Props> = ({
           )}
 
           {data.cancelled && (
-            <div className="text-danger"> {t('cancelled')}</div>
+            <div className="text-danger">{t('cancelled')}</div>
           )}
         </td>
         <td>
@@ -192,7 +124,11 @@ const Index: FC<Props> = ({
         <td colSpan={5} className="p-0 py-5">
           <Row className="justify-content-center">
             <Col xxl={8}>
-              <DiffContent currentData={data1} prevData={data2} />
+              <DiffContent
+                objectType={objectInfo.object_type}
+                newData={detailData?.new_revision}
+                oldData={detailData?.old_revision}
+              />
             </Col>
           </Row>
         </td>
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 9913ba74..74129723 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -1,113 +1,70 @@
-import { FC } from 'react';
+import { FC, useState } from 'react';
 import { Container, Row, Col, Form, Table } from 'react-bootstrap';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import { loggedUserInfoStore } from '@/stores';
 import { useTimelineData } from '@/services';
+import { PageTitle } from '@/components';
 
 import HistoryItem from './components/Item';
 
-// const list = [
-//   {
-//     activity_id: 1,
-//     revision_id: 1,
-//     created_at: 1669084579,
-//     activity_type: 'deleted',
-//     username: 'John Doe',
-//     user_display_name: 'John Doe',
-//     comment: '啊撒旦法师打发房管局挥洒过短发合计干哈就撒刚发几哈',
-//     object_id: '1',
-//     object_type: 'question',
-//     cancelled: false,
-//     cancelled_at: null,
-//   },
-//   {
-//     activity_id: 2,
-//     revision_id: 2,
-//     created_at: 1669084579,
-//     activity_type: 'undeleted',
-//     username: 'John Doe2',
-//     user_display_name: 'John Doe2',
-//     comment: '啊撒旦法师打发房管局挥洒过短发合计干哈就撒刚发几哈',
-//     object_id: '2',
-//     object_type: 'question',
-//     cancelled: false,
-//     cancelled_at: null,
-//   },
-//   {
-//     activity_id: 3,
-//     revision_id: 3,
-//     created_at: 1669084579,
-//     activity_type: 'downvote',
-//     username: 'johndoe3',
-//     user_display_name: 'John Doe3',
-//     comment: '啊撒旦法师打发房管局挥洒过短发合计干哈就撒刚发几哈',
-//     object_id: '3',
-//     object_type: 'question',
-//     cancelled: true,
-//     cancelled_at: 1637021579,
-//   },
-//   {
-//     activity_id: 4,
-//     revision_id: 4,
-//     created_at: 1669084579,
-//     activity_type: 'rollback',
-//     username: 'johndoe4',
-//     user_display_name: 'John Doe4',
-//     comment: '啊撒旦法师打发房管局挥洒过短发合计干哈就撒刚发几哈',
-//     object_id: '4',
-//     object_type: 'question',
-//     cancelled: false,
-//     cancelled_at: null,
-//   },
-//   {
-//     activity_id: 5,
-//     revision_id: 5,
-//     created_at: 1669084579,
-//     activity_type: 'edited',
-//     username: 'johndoe4',
-//     user_display_name: 'John Doe4',
-//     object_id: '5',
-//     object_type: 'question',
-//     comment: '啊撒旦法师打发房管局挥洒过短发合计干哈就撒刚发几哈',
-//     cancelled: false,
-//     cancelled_at: null,
-//   },
-// ];
-
-// const object_info = {
-//   title: '问题标题，当回答时也是问题标题，当为 tag 时是 slug_name',
-//   object_type: 'question', // question/answer/tag
-//   question_id: 'xxxxxxxxxxxxxxxxxxx',
-//   answer_id: 'xxxxxxxxxxxxxxxx',
-// };
-
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'timeline' });
+  const { qid = '', aid = '', tid = '' } = useParams();
   const { is_admin } = loggedUserInfoStore((state) => state.user);
+  const [showVotes, setShowVotes] = useState(false);
 
   const { data: timelineData } = useTimelineData({
-    object_id: '10010000000000001',
-    object_type: 'question',
-    show_vote: false,
+    object_id: tid || aid || qid,
+    show_vote: showVotes,
   });
 
-  console.log('timelineData=', timelineData);
+  const handleSwitch = (bol: boolean) => {
+    setShowVotes(bol);
+  };
+
+  let linkUrl = '';
+  if (timelineData?.object_info.object_type === 'question') {
+    linkUrl = `/questions/${timelineData?.object_info.question_id}`;
+  }
+
+  if (timelineData?.object_info.object_type === 'answer') {
+    linkUrl = `/questions/${timelineData?.object_info.question_id}/${timelineData?.object_info.answer_id}`;
+  }
+
+  if (timelineData?.object_info.object_type === 'tag') {
+    linkUrl = `/tags/${timelineData?.object_info.title}`;
+  }
+
+  const revisionList =
+    timelineData?.timeline?.filter((item) => item.revision_id > 0) || [];
 
   return (
     <Container className="py-3">
+      <PageTitle
+        title={
+          timelineData?.object_info.object_type === 'tag'
+            ? `Timeline for tag ${timelineData?.object_info.title}`
+            : `Timeline for ${timelineData?.object_info.title}`
+        }
+      />
       <Row className="py-3 justify-content-center">
         <Col xxl={10}>
           <h5 className="mb-4">
-            {t('title')} <Link to="/">{timelineData?.object_info?.title}</Link>
+            {t('title')}{' '}
+            <Link to={linkUrl}>{timelineData?.object_info?.title}</Link>
           </h5>
-          <Form.Check
-            className="mb-4"
-            type="switch"
-            id="custom-switch"
-            label={t('show_votes')}
-          />
+          {timelineData?.object_info.object_type !== 'tag' && (
+            <Form.Check
+              className="mb-4"
+              type="switch"
+              id="custom-switch"
+              label={t('show_votes')}
+              checked={showVotes}
+              onChange={(e) => handleSwitch(e.target.checked)}
+            />
+          )}
           <Table hover>
             <thead>
               <tr>
@@ -123,9 +80,9 @@ const Index: FC = () => {
                   <HistoryItem
                     data={item}
                     objectInfo={timelineData?.object_info}
-                    key={item.revision_id}
+                    key={item.activity_id}
                     isAdmin={is_admin}
-                    source="question"
+                    revisionList={revisionList}
                   />
                 );
               })}
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index 4fe6c6da..d797be8b 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -202,7 +202,21 @@ const routes: RouteNode[] = [
         },
       },
       {
-        path: '/history',
+        path: '/posts/:qid/timeline',
+        page: 'pages/Timeline',
+        guard: async () => {
+          return guard.logged();
+        },
+      },
+      {
+        path: '/posts/:qid/:aid/timeline',
+        page: 'pages/Timeline',
+        guard: async () => {
+          return guard.logged();
+        },
+      },
+      {
+        path: '/tags/:tid/timeline',
         page: 'pages/Timeline',
         guard: async () => {
           return guard.logged();
diff --git a/ui/src/services/client/timeline.ts b/ui/src/services/client/timeline.ts
index 551a99ca..2c6efed7 100644
--- a/ui/src/services/client/timeline.ts
+++ b/ui/src/services/client/timeline.ts
@@ -17,3 +17,14 @@ export const useTimelineData = (params: Type.TimelineReq) => {
     mutate,
   };
 };
+
+export const getTimelineDetail = (params: {
+  new_revision_id: string;
+  old_revision_id: string;
+}) => {
+  return request.get(
+    `/answer/api/v1/activity/timeline/detail?${qs.stringify(params, {
+      skipNulls: true,
+    })}`,
+  );
+};
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index d9816e56..9b2eee69 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -176,7 +176,7 @@ function diffText(newText: string, oldText: string): string {
       ?.replace(/<iframe/gi, '&lt;iframe')
       ?.replace(/<input/gi, '&lt;input');
   }
-  const diff = Diff.diffChars(newText, oldText);
+  const diff = Diff.diffChars(oldText, newText);
   const result = diff.map((part) => {
     if (part.added) {
       return `<span class="review-text-add">${part.value}</span>`;

From da20711a6dcb8e8420c7c57c58c3741da969a70e Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 23 Nov 2022 15:29:28 +0800
Subject: [PATCH 040/194] fix: timeline for tag url add mian tag slug-name

---
 ui/src/common/interface.ts      | 1 +
 ui/src/pages/Timeline/index.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 98d3e041..4d0d9bb3 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -399,6 +399,7 @@ export interface TimelineObject {
   object_type: string;
   question_id: string;
   answer_id: string;
+  main_tag_slug_name?: string;
 }
 
 export interface TimelineRes {
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 74129723..09a344e4 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -34,7 +34,10 @@ const Index: FC = () => {
   }
 
   if (timelineData?.object_info.object_type === 'tag') {
-    linkUrl = `/tags/${timelineData?.object_info.title}`;
+    linkUrl = `/tags/${
+      timelineData?.object_info.main_tag_slug_name ||
+      timelineData?.object_info.title
+    }`;
   }
 
   const revisionList =

From ff38dc5a0cf46ec6ec26b951ea589e4bfa79e77a Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 16:12:48 +0800
Subject: [PATCH 041/194] feat: activity timeline show vote activity

---
 internal/base/constant/acticity.go         | 15 ++++--
 internal/controller/activity_controller.go |  3 ++
 internal/repo/activity/activity_repo.go    | 20 +++++++-
 internal/repo/activity/answer_repo.go      | 13 ++++--
 internal/schema/activity.go                | 18 +++++---
 internal/service/activity/activity.go      | 53 ++++++++++++++++------
 6 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index 128659c4..a1513338 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -5,8 +5,15 @@ package constant
 type ActivityTypeKey string
 
 const (
-	ActEdited = "edited"
-	ActClosed = "closed"
+	ActEdited    = "edited"
+	ActClosed    = "closed"
+	ActAccepted  = "accepted"
+	ActVotedDown = "voted_down"
+	ActVotedUp   = "voted_up"
+	ActVoteDown  = "vote_down"
+	ActVoteUp    = "vote_up"
+	ActUpVote    = "upvote"
+	ActDownVote  = "downvote"
 )
 
 const (
@@ -17,7 +24,7 @@ const (
 	ActQuestionCommented ActivityTypeKey = "question.commented"
 	ActQuestionAccept    ActivityTypeKey = "question.accept"
 	ActQuestionUpvote    ActivityTypeKey = "question.upvote"
-	ActQuestionDownvote  ActivityTypeKey = "question.downvote"
+	ActQuestionDownVote  ActivityTypeKey = "question.downvote"
 	ActQuestionEdited    ActivityTypeKey = "question.edited"
 	ActQuestionRollback  ActivityTypeKey = "question.rollback"
 	ActQuestionDeleted   ActivityTypeKey = "question.deleted"
@@ -29,7 +36,7 @@ const (
 	ActAnswerCommented ActivityTypeKey = "answer.commented"
 	ActAnswerAccept    ActivityTypeKey = "answer.accept"
 	ActAnswerUpvote    ActivityTypeKey = "answer.upvote"
-	ActAnswerDownvote  ActivityTypeKey = "answer.downvote"
+	ActAnswerDownVote  ActivityTypeKey = "answer.downvote"
 	ActAnswerEdited    ActivityTypeKey = "answer.edited"
 	ActAnswerRollback  ActivityTypeKey = "answer.rollback"
 	ActAnswerDeleted   ActivityTypeKey = "answer.deleted"
diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go
index 25a00d6b..ed33a56f 100644
--- a/internal/controller/activity_controller.go
+++ b/internal/controller/activity_controller.go
@@ -39,6 +39,9 @@ func (ac *ActivityController) GetObjectTimeline(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	if userInfo := middleware.GetUserInfoFromContext(ctx); userInfo != nil {
+		req.IsAdmin = userInfo.IsAdmin
+	}
 
 	resp, err := ac.activityService.GetObjectTimeline(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
diff --git a/internal/repo/activity/activity_repo.go b/internal/repo/activity/activity_repo.go
index ddd09d1b..3f8ad4b2 100644
--- a/internal/repo/activity/activity_repo.go
+++ b/internal/repo/activity/activity_repo.go
@@ -2,10 +2,13 @@ package activity
 
 import (
 	"context"
+	"fmt"
 
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/data"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
+	"github.com/answerdev/answer/internal/repo/config"
 	"github.com/answerdev/answer/internal/service/activity"
 	"github.com/segmentfault/pacman/errors"
 )
@@ -27,7 +30,22 @@ func NewActivityRepo(
 func (ar *activityRepo) GetObjectAllActivity(ctx context.Context, objectID string, showVote bool) (
 	activityList []*entity.Activity, err error) {
 	activityList = make([]*entity.Activity, 0)
-	session := ar.data.DB.Desc("created_at") // TODO: if showVote is false do not show vote activity
+	session := ar.data.DB.Desc("created_at")
+
+	if !showVote {
+		var activityTypeNotShown []int
+		for _, obj := range []string{constant.AnswerObjectType, constant.QuestionObjectType, constant.CommentObjectType} {
+			for _, act := range []string{
+				constant.ActVotedDown,
+				constant.ActVotedUp,
+				constant.ActVoteDown,
+				constant.ActVoteUp,
+			} {
+				activityTypeNotShown = append(activityTypeNotShown, config.Key2IDMapping[fmt.Sprintf("%s.%s", obj, act)])
+			}
+		}
+		session.NotIn("activity_type", activityTypeNotShown)
+	}
 	err = session.Find(&activityList, &entity.Activity{OriginalObjectID: objectID})
 	if err != nil {
 		return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go
index 1c47c8e1..74d9136d 100644
--- a/internal/repo/activity/answer_repo.go
+++ b/internal/repo/activity/answer_repo.go
@@ -144,9 +144,11 @@ func (ar *AnswerActivityRepo) AcceptAnswer(ctx context.Context,
 		if action == acceptAction {
 			addActivity.UserID = questionUserID
 			addActivity.TriggerUserID = converter.StringToInt64(answerUserID)
+			addActivity.OriginalObjectID = questionObjID // if activity is 'accept' means this question is accept the answer.
 		} else {
 			addActivity.UserID = answerUserID
 			addActivity.TriggerUserID = converter.StringToInt64(answerUserID)
+			addActivity.OriginalObjectID = answerObjID // if activity is 'accepted' means this answer was accepted.
 		}
 		if isSelf {
 			addActivity.Rank = 0
@@ -234,16 +236,17 @@ func (ar *AnswerActivityRepo) CancelAcceptAnswer(ctx context.Context,
 			return errors.InternalServer(reason.DatabaseError).WithError(e).WithStack()
 		}
 		addActivity := &entity.Activity{
-			ObjectID:         answerObjID,
-			OriginalObjectID: questionObjID,
-			ActivityType:     activityType,
-			Rank:             -deltaRank,
-			HasRank:          hasRank,
+			ObjectID:     answerObjID,
+			ActivityType: activityType,
+			Rank:         -deltaRank,
+			HasRank:      hasRank,
 		}
 		if action == acceptAction {
 			addActivity.UserID = questionUserID
+			addActivity.OriginalObjectID = questionObjID
 		} else {
 			addActivity.UserID = answerUserID
+			addActivity.OriginalObjectID = answerObjID
 		}
 		addActivityList = append(addActivityList, addActivity)
 	}
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index c0598c30..d040b445 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -17,6 +17,7 @@ type GetObjectTimelineReq struct {
 	ObjectID string `validate:"omitempty,gt=0,lte=100" form:"object_id"`
 	ShowVote bool   `validate:"omitempty" form:"show_vote"`
 	UserID   string `json:"-"`
+	IsAdmin  bool   `json:"-"`
 }
 
 // GetObjectTimelineResp get object timeline response
@@ -42,10 +43,11 @@ type ActObjectTimeline struct {
 
 // ActObjectInfo act object info
 type ActObjectInfo struct {
-	Title      string `json:"title"`
-	ObjectType string `json:"object_type"`
-	QuestionID string `json:"question_id"`
-	AnswerID   string `json:"answer_id"`
+	ObjectType      string `json:"object_type"`
+	Title           string `json:"title"`
+	QuestionID      string `json:"question_id"`
+	AnswerID        string `json:"answer_id"`
+	MainTagSlugName string `json:"main_tag_slug_name"`
 }
 
 // GetObjectTimelineDetailReq get object timeline detail request
@@ -63,9 +65,11 @@ type GetObjectTimelineDetailResp struct {
 
 // ObjectTimelineDetail object timeline detail
 type ObjectTimelineDetail struct {
-	Title        string               `json:"title"`
-	Tags         []*ObjectTimelineTag `json:"tags"`
-	OriginalText string               `json:"original_text"`
+	Title           string               `json:"title"`
+	Tags            []*ObjectTimelineTag `json:"tags"`
+	OriginalText    string               `json:"original_text"`
+	SlugName        string               `json:"slug_name"`
+	MainTagSlugName string               `json:"main_tag_slug_name"`
 }
 
 // ObjectTimelineTag object timeline tags
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index b5af4c9e..e8b624bc 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -17,6 +17,7 @@ import (
 	"github.com/answerdev/answer/internal/service/tag_common"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/answerdev/answer/pkg/converter"
+	"github.com/answerdev/answer/pkg/obj"
 	"github.com/segmentfault/pacman/log"
 )
 
@@ -73,6 +74,14 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		return nil, err
 	}
 	resp.ObjectInfo.Title = objInfo.Title
+	if objInfo.ObjectType == constant.TagObjectType {
+		tag, exist, _ := as.tagCommonService.GetTagByID(ctx, objInfo.TagID)
+		if exist {
+			resp.ObjectInfo.Title = tag.SlugName
+			resp.ObjectInfo.MainTagSlugName = tag.MainTagSlugName
+		}
+	}
+
 	resp.ObjectInfo.ObjectType = objInfo.ObjectType
 	resp.ObjectInfo.QuestionID = objInfo.QuestionID
 	resp.ObjectInfo.AnswerID = objInfo.AnswerID
@@ -89,13 +98,14 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 			Cancelled:  act.Cancelled == entity.ActivityCancelled,
 			ObjectID:   act.ObjectID,
 		}
+		item.ObjectType, _ = obj.GetObjectTypeStrByObjectID(act.ObjectID)
 		if item.Cancelled {
 			item.CancelledAt = act.CancelledAt.Unix()
 		}
 
 		// database save activity type is number, change to activity type string is like "question.asked".
 		// so we need to cut the front part of '.'
-		item.ObjectType, item.ActivityType, _ = strings.Cut(config.ID2KeyMapping[act.ActivityType], ".")
+		_, item.ActivityType, _ = strings.Cut(config.ID2KeyMapping[act.ActivityType], ".")
 
 		isHidden, formattedActivityType := formatActivity(item.ActivityType)
 		if isHidden {
@@ -103,14 +113,20 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		}
 		item.ActivityType = formattedActivityType
 
-		// get user info
-		userBasicInfo, exist, err := as.userCommon.GetUserBasicInfoByID(ctx, act.UserID)
-		if err != nil {
-			return nil, err
-		}
-		if exist {
-			item.Username = userBasicInfo.Username
-			item.UserDisplayName = userBasicInfo.DisplayName
+		// if activity is down vote, only admin can see who does it.
+		if item.ActivityType == constant.ActDownVote && !req.IsAdmin {
+			item.Username = "N/A"
+			item.UserDisplayName = "N/A"
+		} else {
+			// get user info
+			userBasicInfo, exist, err := as.userCommon.GetUserBasicInfoByID(ctx, act.UserID)
+			if err != nil {
+				return nil, err
+			}
+			if exist {
+				item.Username = userBasicInfo.Username
+				item.UserDisplayName = userBasicInfo.DisplayName
+			}
 		}
 
 		if item.ObjectType == constant.CommentObjectType {
@@ -156,8 +172,14 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 	resp *schema.ObjectTimelineDetail, err error) {
 	resp = &schema.ObjectTimelineDetail{Tags: make([]*schema.ObjectTimelineTag, 0)}
 
+	// if request revision is 0, return null object detail.
+	if revisionID == "0" {
+		return nil, nil
+	}
+
 	revision, err := as.revisionService.GetRevision(ctx, revisionID)
 	if err != nil {
+		log.Warn(err)
 		return nil, nil
 	}
 	objInfo, err := as.objectInfoService.GetInfo(ctx, revision.ObjectID)
@@ -199,6 +221,8 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 		}
 		resp.Title = data.SlugName
 		resp.OriginalText = data.OriginalText
+		resp.SlugName = data.SlugName
+		resp.MainTagSlugName = data.MainTagSlugName
 	default:
 		log.Errorf("unknown object type %s", objInfo.ObjectType)
 	}
@@ -206,14 +230,15 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 }
 
 func formatActivity(activityType string) (isHidden bool, formattedActivityType string) {
-	if activityType == "voted_up" || activityType == "voted_down" || activityType == "accepted" {
+	if activityType == constant.ActVotedUp ||
+		activityType == constant.ActVotedDown {
 		return true, ""
 	}
-	if activityType == "vote_up" {
-		return false, "upvote"
+	if activityType == constant.ActVoteUp {
+		return false, constant.ActUpVote
 	}
-	if activityType == "vote_down" {
-		return false, "downvote"
+	if activityType == constant.ActVoteDown {
+		return false, constant.ActDownVote
 	}
 	return false, activityType
 }

From 6202877bdc5ace47ee7fa090dae596e39dec91cd Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 16:27:35 +0800
Subject: [PATCH 042/194] GetUnreviewedRevisionList

---
 docs/docs.go                               | 44 ++++++++++++++++++++++
 docs/swagger.json                          | 44 ++++++++++++++++++++++
 docs/swagger.yaml                          | 26 +++++++++++++
 internal/controller/revision_controller.go | 22 +++++++++++
 internal/entity/revision_entity.go         |  4 ++
 internal/repo/revision/revision_repo.go    | 22 +++++++++++
 internal/router/answer_api_router.go       |  1 +
 internal/schema/revision_schema.go         |  4 ++
 internal/service/revision/revision.go      |  1 +
 internal/service/revision_service.go       | 14 +++++++
 10 files changed, 182 insertions(+)

diff --git a/docs/docs.go b/docs/docs.go
index 017b0a49..5a5baf7f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3069,6 +3069,50 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/revisions/unreviewed": {
+            "get": {
+                "description": "get unreviewed revision list",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "get unreviewed revision list",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "page id",
+                        "name": "page",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/schema.GetRevisionResp"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/search": {
             "get": {
                 "security": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 7d0ba920..c4deea23 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3057,6 +3057,50 @@
                 }
             }
         },
+        "/answer/api/v1/revisions/unreviewed": {
+            "get": {
+                "description": "get unreviewed revision list",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "get unreviewed revision list",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "page id",
+                        "name": "page",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/schema.GetRevisionResp"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/search": {
             "get": {
                 "security": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 8b644499..4e1a2898 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3494,6 +3494,32 @@ paths:
       summary: get revision list
       tags:
       - Revision
+  /answer/api/v1/revisions/unreviewed:
+    get:
+      description: get unreviewed revision list
+      parameters:
+      - description: page id
+        in: query
+        name: page
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/schema.GetRevisionResp'
+                  type: array
+              type: object
+      summary: get unreviewed revision list
+      tags:
+      - Revision
   /answer/api/v1/search:
     get:
       description: search object
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 5f30b70e..3c0c6c1b 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -5,6 +5,7 @@ import (
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
+	"github.com/answerdev/answer/pkg/converter"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
 )
@@ -41,3 +42,24 @@ func (rc *RevisionController) GetRevisionList(ctx *gin.Context) {
 	resp, err := rc.revisionListService.GetRevisionList(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
+
+// GetUnreviewedRevisionList godoc
+// @Summary get unreviewed revision list
+// @Description get unreviewed revision list
+// @Tags Revision
+// @Produce json
+// @Param page query string true "page id"
+// @Success 200 {object} handler.RespBody{data=[]schema.GetRevisionResp}
+// @Router /answer/api/v1/revisions/unreviewed [get]
+func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
+	pageStr := ctx.Query("page")
+	page := converter.StringToInt(pageStr)
+	req := &schema.RevisionSearch{
+		Page: page,
+	}
+	resp, count, err := rc.revisionListService.GetUnreviewedRevisionList(ctx, req)
+	handler.HandleResponse(ctx, err, gin.H{
+		"list":  resp,
+		"count": count,
+	})
+}
diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index f2e91514..09c5e815 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -26,6 +26,10 @@ type Revision struct {
 	ReviewUserID int64     `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
+type RevisionSearch struct {
+	Page int `json:"page" form:"page"` // Query number of pages
+}
+
 // TableName revision table name
 func (Revision) TableName() string {
 	return "revision"
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index 1545d7fa..b0d3d5f6 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -149,3 +149,25 @@ func (rr *revisionRepo) allowRecord(objectType int) (ok bool) {
 		return false
 	}
 }
+
+func (rr *revisionRepo) SearchUnreviewedList(ctx context.Context, search *entity.RevisionSearch) ([]*entity.Revision, int64, error) {
+	var count int64
+	var err error
+	rows := make([]*entity.Revision, 0)
+	if search.Page > 0 {
+		search.Page = search.Page - 1
+	} else {
+		search.Page = 0
+	}
+	PageSize := 1
+	offset := search.Page * PageSize
+	session := rr.data.DB.Where("")
+	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
+	session = session.OrderBy("created_at desc")
+	session = session.Limit(PageSize, offset)
+	count, err = session.FindAndCount(&rows)
+	if err != nil {
+		return rows, count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return rows, count, nil
+}
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 2fa6ccfe..d798e4b1 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -123,6 +123,7 @@ func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {
 
 	//revision
 	r.GET("/revisions", a.revisionController.GetRevisionList)
+	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
 
 	// tag
 	r.GET("/tags/page", a.tagController.GetTagWithPage)
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 9afe3454..09ed274b 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -26,6 +26,10 @@ type GetRevisionListReq struct {
 	ObjectID string `validate:"required" comment:"object_id" form:"object_id"`
 }
 
+type RevisionSearch struct {
+	Page int `json:"page" form:"page"` // Query number of pages
+}
+
 // GetRevisionResp get revision response
 type GetRevisionResp struct {
 	// id
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index cbac464f..1bc76fff 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -15,4 +15,5 @@ type RevisionRepo interface {
 	GetRevisionList(ctx context.Context, revision *entity.Revision) (revisionList []entity.Revision, err error)
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
 	ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
+	SearchUnreviewedList(ctx context.Context, search *entity.RevisionSearch) ([]*entity.Revision, int64, error)
 }
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index fe9da647..0102d761 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -10,6 +10,7 @@ import (
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/jinzhu/copier"
 )
 
@@ -34,6 +35,19 @@ func NewRevisionService(
 	}
 }
 
+// SearchUnreviewedList get unreviewed list
+func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []schema.GetRevisionResp, count int64, err error) {
+	resp = []schema.GetRevisionResp{}
+	search := &entity.RevisionSearch{}
+	_ = copier.Copy(search, req)
+	list, count, err := rs.revisionRepo.SearchUnreviewedList(ctx, search)
+	for _, item := range list {
+		spew.Dump(item)
+	}
+
+	return
+}
+
 // GetRevisionList get revision list all
 func (rs *RevisionService) GetRevisionList(ctx context.Context, req *schema.GetRevisionListReq) (resp []schema.GetRevisionResp, err error) {
 	var (

From 98114a6a05561885de5616990e5c3458b29ed16e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 16:32:06 +0800
Subject: [PATCH 043/194] fix en_us

---
 i18n/en_US.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 04102618..19bc53cf 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -28,8 +28,8 @@ backend:
         other: "Answer do not found."
       cannot_deleted:
         other: "No permission to delete."
-    cannot_update:
-      other: "No permission to update."
+      cannot_update:
+        other: "No permission to update."
     comment:
       edit_without_permission:
         other: "Comment are not allowed to edit."

From a923e6f0b4e402bac8e95d4d69fc5cc50c0b1c53 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 16:52:27 +0800
Subject: [PATCH 044/194] GetUnreviewedRevisionList

---
 cmd/answer/wire_gen.go               |  2 +-
 internal/schema/revision_schema.go   |  4 +++
 internal/service/revision_service.go | 40 +++++++++++++++++++---------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 21b1022e..c6bc7999 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -163,7 +163,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon)
 	searchService := service.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService)
-	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService)
+	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService)
 	revisionController := controller.NewRevisionController(serviceRevisionService)
 	rankController := controller.NewRankController(rankService)
 	commonRepo := common.NewCommonRepo(dataData, uniqueIDRepo)
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 09ed274b..2bda608c 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -30,6 +30,10 @@ type RevisionSearch struct {
 	Page int `json:"page" form:"page"` // Query number of pages
 }
 
+type GetUnreviewedRevisionResp struct {
+	Type string `json:"type"`
+}
+
 // GetRevisionResp get revision response
 type GetRevisionResp struct {
 	// id
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 0102d761..64e2d9bf 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -7,6 +7,7 @@ import (
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
+	"github.com/answerdev/answer/internal/service/object_info"
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
@@ -16,33 +17,46 @@ import (
 
 // RevisionService user service
 type RevisionService struct {
-	revisionRepo   revision.RevisionRepo
-	userCommon     *usercommon.UserCommon
-	questionCommon *questioncommon.QuestionCommon
-	answerService  *AnswerService
+	revisionRepo      revision.RevisionRepo
+	userCommon        *usercommon.UserCommon
+	questionCommon    *questioncommon.QuestionCommon
+	answerService     *AnswerService
+	objectInfoService *object_info.ObjService
 }
 
 func NewRevisionService(
 	revisionRepo revision.RevisionRepo,
 	userCommon *usercommon.UserCommon,
 	questionCommon *questioncommon.QuestionCommon,
-	answerService *AnswerService) *RevisionService {
+	answerService *AnswerService,
+	objectInfoService *object_info.ObjService,
+) *RevisionService {
 	return &RevisionService{
-		revisionRepo:   revisionRepo,
-		userCommon:     userCommon,
-		questionCommon: questionCommon,
-		answerService:  answerService,
+		revisionRepo:      revisionRepo,
+		userCommon:        userCommon,
+		questionCommon:    questionCommon,
+		answerService:     answerService,
+		objectInfoService: objectInfoService,
 	}
 }
 
 // SearchUnreviewedList get unreviewed list
-func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []schema.GetRevisionResp, count int64, err error) {
-	resp = []schema.GetRevisionResp{}
+func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []*schema.GetUnreviewedRevisionResp, count int64, err error) {
+	resp = []*schema.GetUnreviewedRevisionResp{}
 	search := &entity.RevisionSearch{}
 	_ = copier.Copy(search, req)
 	list, count, err := rs.revisionRepo.SearchUnreviewedList(ctx, search)
-	for _, item := range list {
-		spew.Dump(item)
+	for _, revision := range list {
+		spew.Dump(revision)
+		item := &schema.GetUnreviewedRevisionResp{}
+		_, ok := constant.ObjectTypeNumberMapping[revision.ObjectType]
+		if !ok {
+			continue
+		}
+		item.Type = constant.ObjectTypeNumberMapping[revision.ObjectType]
+		info, err := rs.objectInfoService.GetInfo(ctx, revision.ObjectID)
+		spew.Dump(info, err)
+		resp = append(resp, item)
 	}
 
 	return

From 60f4264e5840b1fe731320f6da3f6f28d2c85d07 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 17:02:44 +0800
Subject: [PATCH 045/194] feat: answer and tag delete add activity

---
 internal/controller/answer_controller.go    |  5 ++--
 internal/controller/tag_controller.go       |  2 +-
 internal/entity/answer_entity.go            |  5 ----
 internal/schema/answer_schema.go            | 10 +++++--
 internal/service/answer_service.go          | 30 ++++++++++++++-------
 internal/service/comment/comment_service.go | 11 ++++++--
 internal/service/question_service.go        |  8 +++++-
 internal/service/tag/tag_service.go         | 12 ++++++---
 8 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 6db77008..1124584f 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -6,7 +6,6 @@ import (
 	"github.com/answerdev/answer/internal/base/handler"
 	"github.com/answerdev/answer/internal/base/middleware"
 	"github.com/answerdev/answer/internal/base/reason"
-	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
 	"github.com/answerdev/answer/internal/service/dashboard"
@@ -238,10 +237,10 @@ func (ac *AnswerController) Adopted(ctx *gin.Context) {
 // @Router /answer/admin/api/answer/status [put]
 // @Success 200 {object} handler.RespBody
 func (ac *AnswerController) AdminSetAnswerStatus(ctx *gin.Context) {
-	req := &entity.AdminSetAnswerStatusRequest{}
+	req := &schema.AdminSetAnswerStatusRequest{}
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-	err := ac.answerService.AdminSetAnswerStatus(ctx, req.AnswerID, req.StatusStr)
+	err := ac.answerService.AdminSetAnswerStatus(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{})
 }
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index 673a746c..8e88845c 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -69,7 +69,7 @@ func (tc *TagController) RemoveTag(ctx *gin.Context) {
 		return
 	}
 
-	err := tc.tagService.RemoveTag(ctx, req.TagID)
+	err := tc.tagService.RemoveTag(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index c51ae157..33e04d32 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -48,11 +48,6 @@ type CmsAnswerSearch struct {
 	QuestionID string `validate:"omitempty,gt=0,lte=24" json:"question_id" form:"question_id" ` //Query string
 }
 
-type AdminSetAnswerStatusRequest struct {
-	StatusStr string `json:"status" form:"status"`
-	AnswerID  string `json:"answer_id" form:"answer_id"`
-}
-
 // TableName answer table name
 func (Answer) TableName() string {
 	return "answer"
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 0c396865..6eabd6fb 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -74,7 +74,13 @@ type AdminAnswerInfo struct {
 }
 
 type AnswerAdoptedReq struct {
-	QuestionID string `json:"question_id" ` // question_id
-	AnswerID   string `json:"answer_id" `
+	QuestionID string `json:"question_id"`
+	AnswerID   string `json:"answer_id"`
 	UserID     string `json:"-" `
 }
+
+type AdminSetAnswerStatusRequest struct {
+	StatusStr string `json:"status"`
+	AnswerID  string `json:"answer_id"`
+	UserID    string `json:"-" `
+}
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 5a6470a1..d02e3ce7 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -7,19 +7,18 @@ import (
 	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
-	"github.com/answerdev/answer/internal/service/activity"
-	"github.com/answerdev/answer/internal/service/activity_common"
-	"github.com/answerdev/answer/internal/service/activity_queue"
-	"github.com/answerdev/answer/internal/service/notice_queue"
-	"github.com/answerdev/answer/internal/service/revision_common"
-
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
+	"github.com/answerdev/answer/internal/service/activity"
+	"github.com/answerdev/answer/internal/service/activity_common"
+	"github.com/answerdev/answer/internal/service/activity_queue"
 	answercommon "github.com/answerdev/answer/internal/service/answer_common"
 	collectioncommon "github.com/answerdev/answer/internal/service/collection_common"
+	"github.com/answerdev/answer/internal/service/notice_queue"
 	"github.com/answerdev/answer/internal/service/permission"
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
+	"github.com/answerdev/answer/internal/service/revision_common"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
@@ -116,6 +115,12 @@ func (as *AnswerService) RemoveAnswer(ctx context.Context, req *schema.RemoveAns
 	if err != nil {
 		log.Errorf("delete answer activity change failed: %s", err.Error())
 	}
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           req.UserID,
+		ObjectID:         answerInfo.ID,
+		OriginalObjectID: answerInfo.ID,
+		ActivityTypeKey:  constant.ActAnswerDeleted,
+	})
 	return
 }
 
@@ -352,12 +357,12 @@ func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string)
 	return info, questionInfo, has, nil
 }
 
-func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, answerID string, setStatusStr string) error {
-	setStatus, ok := entity.CmsAnswerSearchStatus[setStatusStr]
+func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, req *schema.AdminSetAnswerStatusRequest) error {
+	setStatus, ok := entity.CmsAnswerSearchStatus[req.StatusStr]
 	if !ok {
 		return fmt.Errorf("question status does not exist")
 	}
-	answerInfo, exist, err := as.answerRepo.GetAnswer(ctx, answerID)
+	answerInfo, exist, err := as.answerRepo.GetAnswer(ctx, req.AnswerID)
 	if err != nil {
 		return err
 	}
@@ -374,6 +379,13 @@ func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, answerID stri
 		err = as.answerActivityService.DeleteAnswer(ctx, answerInfo.ID, answerInfo.CreatedAt, answerInfo.VoteCount)
 		if err != nil {
 			log.Errorf("admin delete question then rank rollback error %s", err.Error())
+		} else {
+			activity_queue.AddActivity(&schema.ActivityMsg{
+				UserID:           req.UserID,
+				ObjectID:         answerInfo.ID,
+				OriginalObjectID: answerInfo.ID,
+				ActivityTypeKey:  constant.ActAnswerDeleted,
+			})
 		}
 	}
 
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index 236862be..686aee00 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -150,12 +150,19 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 		resp.UserStatus = userInfo.Status
 	}
 
-	activity_queue.AddActivity(&schema.ActivityMsg{
+	activityMsg := &schema.ActivityMsg{
 		UserID:           comment.UserID,
 		ObjectID:         comment.ID,
 		OriginalObjectID: req.ObjectID,
 		ActivityTypeKey:  constant.ActQuestionCommented,
-	})
+	}
+	switch objInfo.ObjectType {
+	case constant.QuestionObjectType:
+		activityMsg.ActivityTypeKey = constant.ActQuestionCommented
+	case constant.AnswerObjectType:
+		activityMsg.ActivityTypeKey = constant.ActAnswerCommented
+	}
+	activity_queue.AddActivity(activityMsg)
 	return resp, nil
 }
 
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 09811338..01a3876b 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -626,13 +626,19 @@ func (qs *QuestionService) AdminSetQuestionStatus(ctx context.Context, questionI
 		if err != nil {
 			log.Errorf("admin delete question then rank rollback error %s", err.Error())
 		}
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           questionInfo.UserID,
+			ObjectID:         questionInfo.ID,
+			OriginalObjectID: questionInfo.ID,
+			ActivityTypeKey:  constant.ActQuestionDeleted,
+		})
 	}
 	if setStatus == entity.QuestionStatusAvailable && questionInfo.Status == entity.QuestionStatusClosed {
 		activity_queue.AddActivity(&schema.ActivityMsg{
 			UserID:           questionInfo.UserID,
 			ObjectID:         questionInfo.ID,
 			OriginalObjectID: questionInfo.ID,
-			ActivityTypeKey:  constant.ActQuestionDeleted,
+			ActivityTypeKey:  constant.ActQuestionReopened,
 		})
 	}
 	if setStatus == entity.QuestionStatusClosed && questionInfo.Status != entity.QuestionStatusClosed {
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index 8642f32c..99065079 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -56,13 +56,17 @@ func NewTagService(
 }
 
 // RemoveTag delete tag
-func (ts *TagService) RemoveTag(ctx context.Context, tagID string) (err error) {
-	// TODO permission
-
-	err = ts.tagRepo.RemoveTag(ctx, tagID)
+func (ts *TagService) RemoveTag(ctx context.Context, req *schema.RemoveTagReq) (err error) {
+	err = ts.tagRepo.RemoveTag(ctx, req.TagID)
 	if err != nil {
 		return err
 	}
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           req.UserID,
+		ObjectID:         req.TagID,
+		OriginalObjectID: req.TagID,
+		ActivityTypeKey:  constant.ActTagDeleted,
+	})
 	return nil
 }
 

From 45bd739f519c6019c32420a2c452c8ddb465ce0c Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 17:32:59 +0800
Subject: [PATCH 046/194] fix: timeline revision tag detail title is display
 name

---
 internal/base/constant/acticity.go    | 3 ---
 internal/service/activity/activity.go | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index a1513338..d9b9787f 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -1,13 +1,10 @@
 package constant
 
-// question activity
-
 type ActivityTypeKey string
 
 const (
 	ActEdited    = "edited"
 	ActClosed    = "closed"
-	ActAccepted  = "accepted"
 	ActVotedDown = "voted_down"
 	ActVotedUp   = "voted_up"
 	ActVoteDown  = "vote_down"
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index e8b624bc..a7d8f122 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -219,7 +219,7 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 			log.Errorf("revision parsing error %s", err)
 			return resp, nil
 		}
-		resp.Title = data.SlugName
+		resp.Title = data.DisplayName
 		resp.OriginalText = data.OriginalText
 		resp.SlugName = data.SlugName
 		resp.MainTagSlugName = data.MainTagSlugName

From 60d6e18cd459ff715809598feff34884acd72bdc Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 17:58:03 +0800
Subject: [PATCH 047/194] fix: add user id when admin update answer status

---
 internal/controller/answer_controller.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 1124584f..78bacbaf 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -241,6 +241,9 @@ func (ac *AnswerController) AdminSetAnswerStatus(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
+
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+
 	err := ac.answerService.AdminSetAnswerStatus(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{})
 }

From 3cd52758f3d28185747be5b4a3ee3044f8e65d25 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:10:34 +0800
Subject: [PATCH 048/194] update  unreviewed revision

---
 cmd/answer/wire_gen.go                       | 10 +--
 internal/schema/revision_schema.go           |  4 +-
 internal/schema/simple_obj_info_schema.go    |  8 ++
 internal/service/object_info/object_info.go  | 81 +++++++++++++++++++-
 internal/service/question_common/question.go | 14 ++++
 internal/service/revision_service.go         | 18 +++--
 internal/service/tag_common/tag_common.go    | 10 +--
 7 files changed, 126 insertions(+), 19 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index c6bc7999..36e44755 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -120,7 +120,11 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerRepo := answer.NewAnswerRepo(dataData, uniqueIDRepo, userRankRepo, activityRepo)
 	questionRepo := question.NewQuestionRepo(dataData, uniqueIDRepo)
 	tagCommonRepo := tag_common.NewTagCommonRepo(dataData, uniqueIDRepo)
-	objService := object_info.NewObjService(answerRepo, questionRepo, commentCommonRepo, tagCommonRepo)
+	tagRelRepo := tag.NewTagRelRepo(dataData)
+	revisionRepo := revision.NewRevisionRepo(dataData, uniqueIDRepo)
+	revisionService := revision_common.NewRevisionService(revisionRepo, userRepo)
+	tagCommonService := tag_common2.NewTagCommonService(tagCommonRepo, tagRelRepo, revisionService, siteInfoCommonService)
+	objService := object_info.NewObjService(answerRepo, questionRepo, commentCommonRepo, tagCommonRepo, tagCommonService)
 	voteRepo := activity_common.NewVoteRepo(dataData, activityRepo)
 	commentService := comment2.NewCommentService(commentRepo, commentCommonRepo, userCommon, objService, voteRepo)
 	rankService := rank2.NewRankService(userCommon, userRankRepo, objService, configRepo)
@@ -132,10 +136,6 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	voteService := service.NewVoteService(serviceVoteRepo, uniqueIDRepo, configRepo, questionRepo, answerRepo, commentCommonRepo, objService)
 	voteController := controller.NewVoteController(voteService)
 	tagRepo := tag.NewTagRepo(dataData, uniqueIDRepo)
-	tagRelRepo := tag.NewTagRelRepo(dataData)
-	revisionRepo := revision.NewRevisionRepo(dataData, uniqueIDRepo)
-	revisionService := revision_common.NewRevisionService(revisionRepo, userRepo)
-	tagCommonService := tag_common2.NewTagCommonService(tagCommonRepo, tagRelRepo, revisionService, siteInfoCommonService)
 	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
 	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService)
 	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 2bda608c..e4141d65 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -31,7 +31,9 @@ type RevisionSearch struct {
 }
 
 type GetUnreviewedRevisionResp struct {
-	Type string `json:"type"`
+	Type           string                      `json:"type"`
+	Info           *UnreviewedRevisionInfoInfo `json:"info"`
+	UnreviewedInfo *GetRevisionResp            `json:"unreviewed_info"`
 }
 
 // GetRevisionResp get revision response
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 312772db..678ebb6c 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -12,3 +12,11 @@ type SimpleObjectInfo struct {
 	Title         string `json:"title"`
 	Content       string `json:"content"`
 }
+
+type UnreviewedRevisionInfoInfo struct {
+	ObjectID string     `json:"object_id"`
+	Title    string     `json:"title"`
+	Content  string     `json:"content"`
+	Html     string     `json:"html"`
+	Tags     []*TagResp `json:"tags"`
+}
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index aea2208d..b6cf3298 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -20,6 +20,7 @@ type ObjService struct {
 	questionRepo questioncommon.QuestionRepo
 	commentRepo  comment_common.CommentCommonRepo
 	tagRepo      tagcommon.TagCommonRepo
+	tagCommon    *tagcommon.TagCommonService
 }
 
 // NewObjService new object service
@@ -27,14 +28,92 @@ func NewObjService(
 	answerRepo answercommon.AnswerRepo,
 	questionRepo questioncommon.QuestionRepo,
 	commentRepo comment_common.CommentCommonRepo,
-	tagRepo tagcommon.TagCommonRepo) *ObjService {
+	tagRepo tagcommon.TagCommonRepo,
+	tagCommon *tagcommon.TagCommonService,
+) *ObjService {
 	return &ObjService{
 		answerRepo:   answerRepo,
 		questionRepo: questionRepo,
 		commentRepo:  commentRepo,
 		tagRepo:      tagRepo,
+		tagCommon:    tagCommon,
 	}
 }
+func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID string) (objInfo *schema.UnreviewedRevisionInfoInfo, err error) {
+	objInfo = &schema.UnreviewedRevisionInfoInfo{}
+
+	objectType, err := obj.GetObjectTypeStrByObjectID(objectID)
+	if err != nil {
+		return nil, err
+	}
+	switch objectType {
+	case constant.QuestionObjectType:
+		questionInfo, exist, err := os.questionRepo.GetQuestion(ctx, objectID)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			break
+		}
+		taglist, err := os.tagCommon.GetObjectEntityTag(ctx, objectID)
+		if err != nil {
+			return nil, err
+		}
+		os.tagCommon.TagsFormatRecommendAndReserved(ctx, taglist)
+		tags, err := os.tagCommon.TagFormat(ctx, taglist)
+		if err != nil {
+			return nil, err
+		}
+		objInfo = &schema.UnreviewedRevisionInfoInfo{
+			ObjectID: questionInfo.ID,
+			Title:    questionInfo.Title,
+			Content:  questionInfo.OriginalText,
+			Html:     questionInfo.ParsedText,
+			Tags:     tags,
+		}
+	case constant.AnswerObjectType:
+		answerInfo, exist, err := os.answerRepo.GetAnswer(ctx, objectID)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			break
+		}
+
+		questionInfo, exist, err := os.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			break
+		}
+		objInfo = &schema.UnreviewedRevisionInfoInfo{
+			ObjectID: answerInfo.ID,
+			Title:    questionInfo.Title,
+			Content:  answerInfo.OriginalText,
+			Html:     answerInfo.ParsedText,
+		}
+
+	case constant.TagObjectType:
+		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			break
+		}
+		objInfo = &schema.UnreviewedRevisionInfoInfo{
+			ObjectID: tagInfo.ID,
+			Title:    tagInfo.SlugName,
+			Content:  tagInfo.OriginalText,
+			Html:     tagInfo.ParsedText,
+		}
+	}
+	if objInfo == nil {
+		err = errors.BadRequest(reason.ObjectNotFound)
+	}
+	return objInfo, err
+}
 
 // GetInfo get object simple information
 func (os *ObjService) GetInfo(ctx context.Context, objectID string) (objInfo *schema.SimpleObjectInfo, err error) {
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 9677cb1c..479238eb 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -386,3 +386,17 @@ func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question)
 	info.Tags = make([]*schema.TagResp, 0)
 	return &info
 }
+func (qs *QuestionCommon) ShowFormatWithTag(ctx context.Context, data *entity.QuestionWithTagsRevision) *schema.QuestionInfo {
+	info := qs.ShowFormat(ctx, &data.Question)
+	Tags := make([]*schema.TagResp, 0)
+	for _, tag := range data.Tags {
+		item := &schema.TagResp{}
+		item.SlugName = tag.SlugName
+		item.DisplayName = tag.DisplayName
+		item.Recommend = tag.Recommend
+		item.Reserved = tag.Reserved
+		Tags = append(Tags, item)
+	}
+	info.Tags = Tags
+	return info
+}
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 64e2d9bf..d73ad878 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -11,7 +11,6 @@ import (
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
-	"github.com/davecgh/go-spew/spew"
 	"github.com/jinzhu/copier"
 )
 
@@ -47,18 +46,23 @@ func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *s
 	_ = copier.Copy(search, req)
 	list, count, err := rs.revisionRepo.SearchUnreviewedList(ctx, search)
 	for _, revision := range list {
-		spew.Dump(revision)
 		item := &schema.GetUnreviewedRevisionResp{}
 		_, ok := constant.ObjectTypeNumberMapping[revision.ObjectType]
 		if !ok {
 			continue
 		}
 		item.Type = constant.ObjectTypeNumberMapping[revision.ObjectType]
-		info, err := rs.objectInfoService.GetInfo(ctx, revision.ObjectID)
-		spew.Dump(info, err)
+		info, infoerr := rs.objectInfoService.GetUnreviewedRevisionInfo(ctx, revision.ObjectID)
+		if infoerr != nil {
+			return resp, 0, infoerr
+		}
+		item.Info = info
+		revisionitem := &schema.GetRevisionResp{}
+		_ = copier.Copy(revisionitem, revision)
+		rs.parseItem(ctx, revisionitem)
+		item.UnreviewedInfo = revisionitem
 		resp = append(resp, item)
 	}
-
 	return
 }
 
@@ -103,7 +107,7 @@ func (rs *RevisionService) GetRevisionList(ctx context.Context, req *schema.GetR
 func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisionResp) {
 	var (
 		err          error
-		question     entity.Question
+		question     entity.QuestionWithTagsRevision
 		questionInfo *schema.QuestionInfo
 		answer       entity.Answer
 		answerInfo   *schema.AnswerInfo
@@ -117,7 +121,7 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 		if err != nil {
 			break
 		}
-		questionInfo = rs.questionCommon.ShowFormat(ctx, &question)
+		questionInfo = rs.questionCommon.ShowFormatWithTag(ctx, &question)
 		item.ContentParsed = questionInfo
 	case constant.ObjectTypeStrMapping["answer"]:
 		err = json.Unmarshal([]byte(item.Content), &answer)
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index dc5b2c6b..e5dcbf35 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -70,7 +70,7 @@ func (ts *TagCommonService) SearchTagLike(ctx context.Context, req *schema.Searc
 	if err != nil {
 		return
 	}
-	ts.tagsFormatRecommendAndReserved(ctx, tags)
+	ts.TagsFormatRecommendAndReserved(ctx, tags)
 	for _, tag := range tags {
 		item := schema.SearchTagLikeResp{}
 		item.SlugName = tag.SlugName
@@ -168,7 +168,7 @@ func (ts *TagCommonService) GetTagListByNames(ctx context.Context, tagNames []st
 	if err != nil {
 		return nil, err
 	}
-	ts.tagsFormatRecommendAndReserved(ctx, tagList)
+	ts.TagsFormatRecommendAndReserved(ctx, tagList)
 	return tagList, nil
 }
 
@@ -233,7 +233,7 @@ func (ts *TagCommonService) GetTagListByIDs(ctx context.Context, ids []string) (
 	if err != nil {
 		return nil, err
 	}
-	ts.tagsFormatRecommendAndReserved(ctx, tagList)
+	ts.TagsFormatRecommendAndReserved(ctx, tagList)
 	return
 }
 
@@ -244,7 +244,7 @@ func (ts *TagCommonService) GetTagPage(ctx context.Context, page, pageSize int,
 	if err != nil {
 		return nil, 0, err
 	}
-	ts.tagsFormatRecommendAndReserved(ctx, tagList)
+	ts.TagsFormatRecommendAndReserved(ctx, tagList)
 	return
 }
 
@@ -278,7 +278,7 @@ func (ts *TagCommonService) TagFormat(ctx context.Context, tags []*entity.Tag) (
 	return objTags, nil
 }
 
-func (ts *TagCommonService) tagsFormatRecommendAndReserved(ctx context.Context, tagList []*entity.Tag) {
+func (ts *TagCommonService) TagsFormatRecommendAndReserved(ctx context.Context, tagList []*entity.Tag) {
 	if len(tagList) == 0 {
 		return
 	}

From 64a87bafb24d46c71ebbcb2ecaf5b9f6f799ff22 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:17:06 +0800
Subject: [PATCH 049/194] update unreviewed revisions router

---
 internal/router/answer_api_router.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index d798e4b1..4ccf741b 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -123,7 +123,6 @@ func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {
 
 	//revision
 	r.GET("/revisions", a.revisionController.GetRevisionList)
-	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
 
 	// tag
 	r.GET("/tags/page", a.tagController.GetTagWithPage)
@@ -209,6 +208,10 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	// activity
 	r.GET("/activity/timeline", a.activityController.GetObjectTimeline)
 	r.GET("/activity/timeline/detail", a.activityController.GetObjectTimelineDetail)
+
+	//revisions
+	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
+
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerCmsAPIRouter(r *gin.RouterGroup) {

From d1f4793394d444e5fc4a8a8c2c997d663b52d24e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:22:32 +0800
Subject: [PATCH 050/194] update GetUnreviewedRevisionList

---
 internal/controller/revision_controller.go | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 3c0c6c1b..c9331bfa 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -2,9 +2,11 @@ package controller
 
 import (
 	"github.com/answerdev/answer/internal/base/handler"
+	"github.com/answerdev/answer/internal/base/middleware"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
+	"github.com/answerdev/answer/internal/service/rank"
 	"github.com/answerdev/answer/pkg/converter"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
@@ -13,11 +15,18 @@ import (
 // RevisionController revision controller
 type RevisionController struct {
 	revisionListService *service.RevisionService
+	rankService         *rank.RankService
 }
 
 // NewRevisionController new controller
-func NewRevisionController(revisionListService *service.RevisionService) *RevisionController {
-	return &RevisionController{revisionListService: revisionListService}
+func NewRevisionController(
+	revisionListService *service.RevisionService,
+	rankService *rank.RankService,
+) *RevisionController {
+	return &RevisionController{
+		revisionListService: revisionListService,
+		rankService:         rankService,
+	}
 }
 
 // GetRevisionList godoc
@@ -57,6 +66,15 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	req := &schema.RevisionSearch{
 		Page: page,
 	}
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	if !userinfo.IsAdmin {
+		userID := middleware.GetLoginUserIDFromContext(ctx)
+		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.QuestionEditRank); err != nil || !can {
+			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+			return
+		}
+	}
+
 	resp, count, err := rc.revisionListService.GetUnreviewedRevisionList(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{
 		"list":  resp,

From dbc316c40dac531dd386233147a82dd1e5904e8a Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 23 Nov 2022 19:30:38 +0800
Subject: [PATCH 051/194] refactor: activity timeline extract user info and
 comment function

---
 internal/schema/activity.go           |   1 +
 internal/service/activity/activity.go | 143 +++++++++++++++++---------
 2 files changed, 94 insertions(+), 50 deletions(-)

diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index d040b445..5765110f 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -39,6 +39,7 @@ type ActObjectTimeline struct {
 	ObjectType      string `json:"object_type"`
 	Cancelled       bool   `json:"cancelled"`
 	CancelledAt     int64  `json:"cancelled_at"`
+	UserID          string `json:"-"`
 }
 
 // ActObjectInfo act object info
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index a7d8f122..ed399b1c 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -69,22 +69,10 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		Timeline:   make([]*schema.ActObjectTimeline, 0),
 	}
 
-	objInfo, err := as.objectInfoService.GetInfo(ctx, req.ObjectID)
+	resp.ObjectInfo, err = as.getTimelineMainObjInfo(ctx, req.ObjectID)
 	if err != nil {
 		return nil, err
 	}
-	resp.ObjectInfo.Title = objInfo.Title
-	if objInfo.ObjectType == constant.TagObjectType {
-		tag, exist, _ := as.tagCommonService.GetTagByID(ctx, objInfo.TagID)
-		if exist {
-			resp.ObjectInfo.Title = tag.SlugName
-			resp.ObjectInfo.MainTagSlugName = tag.MainTagSlugName
-		}
-	}
-
-	resp.ObjectInfo.ObjectType = objInfo.ObjectType
-	resp.ObjectInfo.QuestionID = objInfo.QuestionID
-	resp.ObjectInfo.AnswerID = objInfo.AnswerID
 
 	activityList, err := as.activityRepo.GetObjectAllActivity(ctx, req.ObjectID, req.ShowVote)
 	if err != nil {
@@ -106,58 +94,113 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		// database save activity type is number, change to activity type string is like "question.asked".
 		// so we need to cut the front part of '.'
 		_, item.ActivityType, _ = strings.Cut(config.ID2KeyMapping[act.ActivityType], ".")
-
-		isHidden, formattedActivityType := formatActivity(item.ActivityType)
-		if isHidden {
+		// format activity type string to show
+		if isHidden, formattedActivityType := formatActivity(item.ActivityType); isHidden {
 			continue
+		} else {
+			item.ActivityType = formattedActivityType
 		}
-		item.ActivityType = formattedActivityType
 
 		// if activity is down vote, only admin can see who does it.
 		if item.ActivityType == constant.ActDownVote && !req.IsAdmin {
 			item.Username = "N/A"
 			item.UserDisplayName = "N/A"
 		} else {
-			// get user info
-			userBasicInfo, exist, err := as.userCommon.GetUserBasicInfoByID(ctx, act.UserID)
-			if err != nil {
-				return nil, err
-			}
-			if exist {
-				item.Username = userBasicInfo.Username
-				item.UserDisplayName = userBasicInfo.DisplayName
-			}
+			item.UserID = act.UserID
 		}
 
-		if item.ObjectType == constant.CommentObjectType {
-			comment, err := as.commentCommonService.GetComment(ctx, item.ObjectID)
-			if err != nil {
-				log.Error(err)
-			} else {
-				item.Comment = comment.ParsedText
-			}
-		} else if item.ActivityType == constant.ActEdited {
-			revision, err := as.revisionService.GetRevision(ctx, item.RevisionID)
-			if err != nil {
-				log.Error(err)
-			}
-			item.Comment = revision.Log
-		} else if item.ActivityType == constant.ActClosed {
-			metaInfo, err := as.metaService.GetMetaByObjectIdAndKey(ctx, item.ObjectID, entity.QuestionCloseReasonKey)
-			if err != nil {
-				log.Error(err)
-			} else {
-				closeMsg := &schema.CloseQuestionMeta{}
-				if err := json.Unmarshal([]byte(metaInfo.Value), closeMsg); err != nil {
-					item.Comment = closeMsg.CloseMsg
-				}
-			}
-		}
+		item.Comment = as.getTimelineActivityComment(ctx, item.ObjectID, item.ObjectType, item.ActivityType, item.RevisionID)
 		resp.Timeline = append(resp.Timeline, item)
 	}
+	as.formatTimelineUserInfo(ctx, resp.Timeline)
 	return
 }
 
+func (as *ActivityService) getTimelineMainObjInfo(ctx context.Context, objectID string) (
+	resp *schema.ActObjectInfo, err error) {
+	resp = &schema.ActObjectInfo{}
+	objInfo, err := as.objectInfoService.GetInfo(ctx, objectID)
+	if err != nil {
+		return nil, err
+	}
+	resp.Title = objInfo.Title
+	if objInfo.ObjectType == constant.TagObjectType {
+		tag, exist, _ := as.tagCommonService.GetTagByID(ctx, objInfo.TagID)
+		if exist {
+			resp.Title = tag.SlugName
+			resp.MainTagSlugName = tag.MainTagSlugName
+		}
+	}
+	resp.ObjectType = objInfo.ObjectType
+	resp.QuestionID = objInfo.QuestionID
+	resp.AnswerID = objInfo.AnswerID
+	return resp, nil
+}
+
+func (as *ActivityService) getTimelineActivityComment(ctx context.Context, objectID, objectType,
+	activityType, revisionID string) (comment string) {
+	if objectType == constant.CommentObjectType {
+		commentInfo, err := as.commentCommonService.GetComment(ctx, objectID)
+		if err != nil {
+			log.Error(err)
+		} else {
+			return commentInfo.ParsedText
+		}
+		return
+	}
+
+	if activityType == constant.ActEdited {
+		revision, err := as.revisionService.GetRevision(ctx, revisionID)
+		if err != nil {
+			log.Error(err)
+		} else {
+			return revision.Log
+		}
+		return
+	}
+	if activityType == constant.ActClosed {
+		// only question can be closed
+		metaInfo, err := as.metaService.GetMetaByObjectIdAndKey(ctx, objectID, entity.QuestionCloseReasonKey)
+		if err != nil {
+			log.Error(err)
+		} else {
+			closeMsg := &schema.CloseQuestionMeta{}
+			if err := json.Unmarshal([]byte(metaInfo.Value), closeMsg); err != nil {
+				return closeMsg.CloseMsg
+			}
+		}
+	}
+	return ""
+}
+
+func (as *ActivityService) formatTimelineUserInfo(ctx context.Context, timeline []*schema.ActObjectTimeline) {
+	userExist := make(map[string]bool)
+	userIDs := make([]string, 0)
+	for _, info := range timeline {
+		if len(info.UserID) == 0 || userExist[info.UserID] {
+			continue
+		}
+		userIDs = append(userIDs, info.UserID)
+	}
+	if len(userIDs) == 0 {
+		return
+	}
+	userInfoMapping, err := as.userCommon.BatchUserBasicInfoByID(ctx, userIDs)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	for _, info := range timeline {
+		if len(info.UserID) == 0 {
+			continue
+		}
+		if userInfo, ok := userInfoMapping[info.UserID]; ok {
+			info.Username = userInfo.Username
+			info.UserDisplayName = userInfo.DisplayName
+		}
+	}
+}
+
 // GetObjectTimelineDetail get object timeline
 func (as *ActivityService) GetObjectTimelineDetail(ctx context.Context, req *schema.GetObjectTimelineDetailReq) (
 	resp *schema.GetObjectTimelineDetailResp, err error) {

From ba5243040e73035d9b667e69cb3cdf51b7bba287 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 09:58:58 +0800
Subject: [PATCH 052/194] feat: upgrade add migration config

---
 internal/migrations/v3.go | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index d7e68f10..d61de936 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -3,10 +3,38 @@ package migrations
 import (
 	"time"
 
+	"github.com/answerdev/answer/internal/entity"
 	"xorm.io/xorm"
 )
 
 func addActivityTimeline(x *xorm.Engine) error {
+	defaultConfigTable := []*entity.Config{
+		{ID: 87, Key: "question.asked", Value: `0`},
+		{ID: 88, Key: "question.closed", Value: `0`},
+		{ID: 89, Key: "question.reopened", Value: `0`},
+		{ID: 90, Key: "question.answered", Value: `0`},
+		{ID: 91, Key: "question.commented", Value: `0`},
+		{ID: 92, Key: "question.accept", Value: `0`},
+		{ID: 93, Key: "question.edited", Value: `0`},
+		{ID: 94, Key: "question.rollback", Value: `0`},
+		{ID: 95, Key: "question.deleted", Value: `0`},
+		{ID: 96, Key: "question.undeleted", Value: `0`},
+		{ID: 97, Key: "answer.answered", Value: `0`},
+		{ID: 98, Key: "answer.commented", Value: `0`},
+		{ID: 99, Key: "answer.edited", Value: `0`},
+		{ID: 100, Key: "answer.rollback", Value: `0`},
+		{ID: 101, Key: "answer.undeleted", Value: `0`},
+		{ID: 102, Key: "tag.created", Value: `0`},
+		{ID: 103, Key: "tag.edited", Value: `0`},
+		{ID: 104, Key: "tag.rollback", Value: `0`},
+		{ID: 105, Key: "tag.deleted", Value: `0`},
+		{ID: 106, Key: "tag.undeleted", Value: `0`},
+	}
+	_, err := x.Insert(defaultConfigTable)
+	if err != nil {
+		return err
+	}
+
 	type Revision struct {
 		ReviewUserID int64 `xorm:"not null default 0 BIGINT(20) review_user_id"`
 	}

From 574b926108dbc2d6c81902d951ac2e661c0784de Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 24 Nov 2022 10:08:02 +0800
Subject: [PATCH 053/194] fix: timeline add i18n

---
 i18n/en_US.yaml                 |  6 ++++++
 ui/src/pages/Timeline/index.tsx | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index a6e4c182..d49bfb96 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1209,3 +1209,9 @@ ui:
     title: "History for"
     show_votes: "Show votes"
     n_or_a: N/A
+    title_for: "Timeline for"
+    title_for_tag: "Title for tag"
+    datetime: Datetime
+    type: Type
+    by: By
+    comment: Comment
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 09a344e4..dd27ebd9 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -48,8 +48,8 @@ const Index: FC = () => {
       <PageTitle
         title={
           timelineData?.object_info.object_type === 'tag'
-            ? `Timeline for tag ${timelineData?.object_info.title}`
-            : `Timeline for ${timelineData?.object_info.title}`
+            ? `${t('title_for_tag')} ${timelineData?.object_info.title}`
+            : `${t('title_for')} ${timelineData?.object_info.title}`
         }
       />
       <Row className="py-3 justify-content-center">
@@ -71,10 +71,10 @@ const Index: FC = () => {
           <Table hover>
             <thead>
               <tr>
-                <th style={{ width: '20%' }}>Datetime</th>
-                <th style={{ width: '15%' }}>Type</th>
-                <th style={{ width: '19%' }}>By</th>
-                <th>Comment</th>
+                <th style={{ width: '20%' }}>{t('datetime')}</th>
+                <th style={{ width: '15%' }}>{t('type')}</th>
+                <th style={{ width: '19%' }}>{t('by')}</th>
+                <th>{t('comment')}</th>
               </tr>
             </thead>
             <tbody>

From 4e1da6acec2bd879d5ab848385091cf4b59bd9df Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 10:12:07 +0800
Subject: [PATCH 054/194] feat: upgrade update migration config

---
 internal/migrations/v3.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index d61de936..47dce2f2 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -30,9 +30,17 @@ func addActivityTimeline(x *xorm.Engine) error {
 		{ID: 105, Key: "tag.deleted", Value: `0`},
 		{ID: 106, Key: "tag.undeleted", Value: `0`},
 	}
-	_, err := x.Insert(defaultConfigTable)
-	if err != nil {
-		return err
+	for _, c := range defaultConfigTable {
+		exist, err := x.Get(&entity.Config{ID: c.ID, Key: c.Key})
+		if err != nil {
+			return err
+		}
+		if exist {
+			continue
+		}
+		if _, err := x.Insert(&entity.Config{ID: c.ID, Key: c.Key, Value: c.Value}); err != nil {
+			return err
+		}
 	}
 
 	type Revision struct {

From fdc08606c457bbdbcfa9e9b4af2e2d15a9777afb Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 24 Nov 2022 10:21:19 +0800
Subject: [PATCH 055/194] fix: comment rendered as html

---
 ui/src/pages/Timeline/components/Item/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Timeline/components/Item/index.tsx b/ui/src/pages/Timeline/components/Item/index.tsx
index c25adba9..ed96e137 100644
--- a/ui/src/pages/Timeline/components/Item/index.tsx
+++ b/ui/src/pages/Timeline/components/Item/index.tsx
@@ -117,7 +117,9 @@ const Index: FC<Props> = ({ data, isAdmin, objectInfo, revisionList }) => {
             />
           )}
         </td>
-        <td>{data.comment}</td>
+        <td>
+          <div dangerouslySetInnerHTML={{ __html: data.comment }} />
+        </td>
       </tr>
       <tr className={isOpen ? '' : 'd-none'}>
         {/* <td /> */}

From db592bfc01b6c02d581cfc9bcf19760245112d9c Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 24 Nov 2022 10:34:01 +0800
Subject: [PATCH 056/194] fix: timeline for question show answered as link

---
 ui/src/pages/Timeline/components/Item/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/pages/Timeline/components/Item/index.tsx b/ui/src/pages/Timeline/components/Item/index.tsx
index ed96e137..bdc637f3 100644
--- a/ui/src/pages/Timeline/components/Item/index.tsx
+++ b/ui/src/pages/Timeline/components/Item/index.tsx
@@ -75,7 +75,7 @@ const Index: FC<Props> = ({ data, isAdmin, objectInfo, revisionList }) => {
             </Link>
           )}
 
-          {data.object_type === 'question' &&
+          {objectInfo.object_type === 'question' &&
             data.activity_type === 'answered' && (
               <Link
                 to={`/questions/${objectInfo.question_id}/${data.object_id}`}>

From 4e8283eac9e03adc53c4fc4acdb50f9df88849c6 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 10:48:30 +0800
Subject: [PATCH 057/194] fix: timeline accept answer activity type format,
 parse the close problem correctly

---
 internal/base/constant/acticity.go    | 3 +++
 internal/service/activity/activity.go | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/internal/base/constant/acticity.go b/internal/base/constant/acticity.go
index d9b9787f..8300147b 100644
--- a/internal/base/constant/acticity.go
+++ b/internal/base/constant/acticity.go
@@ -11,6 +11,9 @@ const (
 	ActVoteUp    = "vote_up"
 	ActUpVote    = "upvote"
 	ActDownVote  = "downvote"
+	ActFollow    = "follow"
+	ActAccepted  = "accepted"
+	ActAccept    = "accept"
 )
 
 const (
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index ed399b1c..6169a2b6 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -165,7 +165,7 @@ func (as *ActivityService) getTimelineActivityComment(ctx context.Context, objec
 			log.Error(err)
 		} else {
 			closeMsg := &schema.CloseQuestionMeta{}
-			if err := json.Unmarshal([]byte(metaInfo.Value), closeMsg); err != nil {
+			if err := json.Unmarshal([]byte(metaInfo.Value), closeMsg); err == nil {
 				return closeMsg.CloseMsg
 			}
 		}
@@ -274,7 +274,8 @@ func (as *ActivityService) getOneObjectDetail(ctx context.Context, revisionID st
 
 func formatActivity(activityType string) (isHidden bool, formattedActivityType string) {
 	if activityType == constant.ActVotedUp ||
-		activityType == constant.ActVotedDown {
+		activityType == constant.ActVotedDown ||
+		activityType == constant.ActFollow {
 		return true, ""
 	}
 	if activityType == constant.ActVoteUp {
@@ -283,5 +284,8 @@ func formatActivity(activityType string) (isHidden bool, formattedActivityType s
 	if activityType == constant.ActVoteDown {
 		return false, constant.ActDownVote
 	}
+	if activityType == constant.ActAccepted {
+		return false, constant.ActAccept
+	}
 	return false, activityType
 }

From bc2012a35924a1a342cf0b565064c6fc2cd19077 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 10:56:55 +0800
Subject: [PATCH 058/194] fix: timeline main object info that label information
 exists

---
 internal/repo/repo_test/tag_repo_test.go    | 8 ++++----
 internal/repo/tag_common/tag_common_repo.go | 6 ++++--
 internal/service/object_info/object_info.go | 2 +-
 internal/service/tag_common/tag_common.go   | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/internal/repo/repo_test/tag_repo_test.go b/internal/repo/repo_test/tag_repo_test.go
index d659651c..d7b5e71c 100644
--- a/internal/repo/repo_test/tag_repo_test.go
+++ b/internal/repo/repo_test/tag_repo_test.go
@@ -54,7 +54,7 @@ func Test_tagRepo_GetTagByID(t *testing.T) {
 	tagOnce.Do(addTagList)
 	tagCommonRepo := tag_common.NewTagCommonRepo(testDataSource, unique.NewUniqueIDRepo(testDataSource))
 
-	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID)
+	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID, true)
 	assert.NoError(t, err)
 	assert.True(t, exist)
 	assert.Equal(t, testTagList[0].SlugName, gotTag.SlugName)
@@ -139,7 +139,7 @@ func Test_tagRepo_UpdateTag(t *testing.T) {
 
 	tagCommonRepo := tag_common.NewTagCommonRepo(testDataSource, unique.NewUniqueIDRepo(testDataSource))
 
-	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID)
+	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID, true)
 	assert.NoError(t, err)
 	assert.True(t, exist)
 	assert.Equal(t, testTagList[0].DisplayName, gotTag.DisplayName)
@@ -152,7 +152,7 @@ func Test_tagRepo_UpdateTagQuestionCount(t *testing.T) {
 	err := tagCommonRepo.UpdateTagQuestionCount(context.TODO(), testTagList[0].ID, 100)
 	assert.NoError(t, err)
 
-	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID)
+	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[0].ID, true)
 	assert.NoError(t, err)
 	assert.True(t, exist)
 	assert.Equal(t, 100, gotTag.QuestionCount)
@@ -172,7 +172,7 @@ func Test_tagRepo_UpdateTagSynonym(t *testing.T) {
 
 	tagCommonRepo := tag_common.NewTagCommonRepo(testDataSource, unique.NewUniqueIDRepo(testDataSource))
 
-	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[2].ID)
+	gotTag, exist, err := tagCommonRepo.GetTagByID(context.TODO(), testTagList[2].ID, true)
 	assert.NoError(t, err)
 	assert.True(t, exist)
 	assert.Equal(t, testTagList[0].ID, fmt.Sprintf("%d", gotTag.MainTagID))
diff --git a/internal/repo/tag_common/tag_common_repo.go b/internal/repo/tag_common/tag_common_repo.go
index 50f8517f..99f16cc4 100644
--- a/internal/repo/tag_common/tag_common_repo.go
+++ b/internal/repo/tag_common/tag_common_repo.go
@@ -122,12 +122,14 @@ func (tr *tagCommonRepo) GetTagListByNames(ctx context.Context, names []string)
 }
 
 // GetTagByID get tag one
-func (tr *tagCommonRepo) GetTagByID(ctx context.Context, tagID string) (
+func (tr *tagCommonRepo) GetTagByID(ctx context.Context, tagID string, includeDeleted bool) (
 	tag *entity.Tag, exist bool, err error,
 ) {
 	tag = &entity.Tag{}
 	session := tr.data.DB.Where(builder.Eq{"id": tagID})
-	session.Where(builder.Eq{"status": entity.TagStatusAvailable})
+	if !includeDeleted {
+		session.Where(builder.Eq{"status": entity.TagStatusAvailable})
+	}
 	exist, err = session.Get(tag)
 	if err != nil {
 		return nil, false, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index aea2208d..2aa2f8ae 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -113,7 +113,7 @@ func (os *ObjService) GetInfo(ctx context.Context, objectID string) (objInfo *sc
 			}
 		}
 	case constant.TagObjectType:
-		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID)
+		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID, true)
 		if err != nil {
 			return nil, err
 		}
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index ef04c06b..16b297a5 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -25,7 +25,7 @@ type TagCommonRepo interface {
 	GetTagBySlugName(ctx context.Context, slugName string) (tagInfo *entity.Tag, exist bool, err error)
 	GetTagListByName(ctx context.Context, name string, limit int, hasReserved bool) (tagList []*entity.Tag, err error)
 	GetTagListByNames(ctx context.Context, names []string) (tagList []*entity.Tag, err error)
-	GetTagByID(ctx context.Context, tagID string) (tag *entity.Tag, exist bool, err error)
+	GetTagByID(ctx context.Context, tagID string, includeDeleted bool) (tag *entity.Tag, exist bool, err error)
 	GetTagPage(ctx context.Context, page, pageSize int, tag *entity.Tag, queryCond string) (tagList []*entity.Tag, total int64, err error)
 	GetRecommendTagList(ctx context.Context) (tagList []*entity.Tag, err error)
 	GetReservedTagList(ctx context.Context) (tagList []*entity.Tag, err error)
@@ -209,7 +209,7 @@ func (ts *TagCommonService) AddTagList(ctx context.Context, tagList []*entity.Ta
 
 // GetTagByID get object tag
 func (ts *TagCommonService) GetTagByID(ctx context.Context, tagID string) (tag *entity.Tag, exist bool, err error) {
-	tag, exist, err = ts.tagCommonRepo.GetTagByID(ctx, tagID)
+	tag, exist, err = ts.tagCommonRepo.GetTagByID(ctx, tagID, false)
 	if !exist {
 		return
 	}

From b5b1a10df441c29caee72868c14670aa2a34c2ad Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:14:15 +0800
Subject: [PATCH 059/194] update revision audit

---
 cmd/answer/wire_gen.go                     |  2 +-
 docs/docs.go                               | 58 ++++++++++++++++++++++
 docs/swagger.json                          | 58 ++++++++++++++++++++++
 docs/swagger.yaml                          | 36 ++++++++++++++
 internal/controller/revision_controller.go | 30 ++++++++++-
 internal/repo/revision/revision_repo.go    | 15 ++++++
 internal/router/answer_api_router.go       |  8 +--
 internal/schema/revision_schema.go         | 11 ++++
 internal/service/rank/rank_service.go      | 44 ++++++++--------
 internal/service/revision/revision.go      |  1 +
 internal/service/revision_service.go       | 19 +++++++
 11 files changed, 256 insertions(+), 26 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 36e44755..7186db86 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -164,7 +164,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchService := service.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService)
 	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService)
-	revisionController := controller.NewRevisionController(serviceRevisionService)
+	revisionController := controller.NewRevisionController(serviceRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	commonRepo := common.NewCommonRepo(dataData, uniqueIDRepo)
 	reportHandle := report_handle_backyard.NewReportHandle(questionCommon, commentRepo, configRepo)
diff --git a/docs/docs.go b/docs/docs.go
index 5a5baf7f..c5da1549 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3069,8 +3069,49 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/revisions/audit": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "revision audit operation:approve or reject",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "revision audit",
+                "parameters": [
+                    {
+                        "description": "audit",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.RevisionAuditReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions/unreviewed": {
             "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "get unreviewed revision list",
                 "produces": [
                     "application/json"
@@ -6013,6 +6054,23 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.RevisionAuditReq": {
+            "type": "object",
+            "required": [
+                "id",
+                "operation"
+            ],
+            "properties": {
+                "id": {
+                    "description": "object id",
+                    "type": "string"
+                },
+                "operation": {
+                    "description": "approve or reject",
+                    "type": "string"
+                }
+            }
+        },
         "schema.SearchListResp": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index c4deea23..9fc0b02c 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3057,8 +3057,49 @@
                 }
             }
         },
+        "/answer/api/v1/revisions/audit": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "revision audit operation:approve or reject",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "revision audit",
+                "parameters": [
+                    {
+                        "description": "audit",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.RevisionAuditReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions/unreviewed": {
             "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
                 "description": "get unreviewed revision list",
                 "produces": [
                     "application/json"
@@ -6001,6 +6042,23 @@
                 }
             }
         },
+        "schema.RevisionAuditReq": {
+            "type": "object",
+            "required": [
+                "id",
+                "operation"
+            ],
+            "properties": {
+                "id": {
+                    "description": "object id",
+                    "type": "string"
+                },
+                "operation": {
+                    "description": "approve or reject",
+                    "type": "string"
+                }
+            }
+        },
         "schema.SearchListResp": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 4e1a2898..51439b21 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1069,6 +1069,18 @@ definitions:
     - flagged_type
     - id
     type: object
+  schema.RevisionAuditReq:
+    properties:
+      id:
+        description: object id
+        type: string
+      operation:
+        description: approve or reject
+        type: string
+    required:
+    - id
+    - operation
+    type: object
   schema.SearchListResp:
     properties:
       count:
@@ -3494,6 +3506,28 @@ paths:
       summary: get revision list
       tags:
       - Revision
+  /answer/api/v1/revisions/audit:
+    put:
+      description: revision audit operation:approve or reject
+      parameters:
+      - description: audit
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/schema.RevisionAuditReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RespBody'
+      security:
+      - ApiKeyAuth: []
+      summary: revision audit
+      tags:
+      - Revision
   /answer/api/v1/revisions/unreviewed:
     get:
       description: get unreviewed revision list
@@ -3517,6 +3551,8 @@ paths:
                     $ref: '#/definitions/schema.GetRevisionResp'
                   type: array
               type: object
+      security:
+      - ApiKeyAuth: []
       summary: get unreviewed revision list
       tags:
       - Revision
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index c9331bfa..3d421d20 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -57,6 +57,7 @@ func (rc *RevisionController) GetRevisionList(ctx *gin.Context) {
 // @Description get unreviewed revision list
 // @Tags Revision
 // @Produce json
+// @Security ApiKeyAuth
 // @Param page query string true "page id"
 // @Success 200 {object} handler.RespBody{data=[]schema.GetRevisionResp}
 // @Router /answer/api/v1/revisions/unreviewed [get]
@@ -69,7 +70,7 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	userinfo := middleware.GetUserInfoFromContext(ctx)
 	if !userinfo.IsAdmin {
 		userID := middleware.GetLoginUserIDFromContext(ctx)
-		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.QuestionEditRank); err != nil || !can {
+		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.UnreviewedRevisionListRank); err != nil || !can {
 			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 			return
 		}
@@ -81,3 +82,30 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 		"count": count,
 	})
 }
+
+// RevisionAudit godoc
+// @Summary revision audit
+// @Description revision audit operation:approve or reject
+// @Tags Revision
+// @Produce json
+// @Security ApiKeyAuth
+// @Param data body schema.RevisionAuditReq true "audit"
+// @Success 200 {object} handler.RespBody{}
+// @Router /answer/api/v1/revisions/audit [put]
+func (rc *RevisionController) RevisionAudit(ctx *gin.Context) {
+	req := &schema.RevisionAuditReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	userinfo := middleware.GetUserInfoFromContext(ctx)
+	if !userinfo.IsAdmin {
+		if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.RevisionAuditRank); err != nil || !can {
+			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+			return
+		}
+	}
+
+	err := rc.revisionListService.RevisionAudit(ctx, req)
+	handler.HandleResponse(ctx, err, gin.H{})
+}
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index b0d3d5f6..a905c95a 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -79,6 +79,21 @@ func (rr *revisionRepo) UpdateObjectRevisionId(ctx context.Context, revision *en
 	return nil
 }
 
+// UpdateStatus update revision status
+func (rr *revisionRepo) UpdateStatus(ctx context.Context, id string, status int) (err error) {
+	if id == "" {
+		return nil
+	}
+	var data entity.Revision
+	data.ID = id
+	data.Status = status
+	_, err = rr.data.DB.Where("id =?", id).Cols("status").Update(&data)
+	if err != nil {
+		return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return nil
+}
+
 // GetRevision get revision one
 func (rr *revisionRepo) GetRevision(ctx context.Context, id string) (
 	revision *entity.Revision, exist bool, err error,
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 4ccf741b..80525787 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -140,9 +140,14 @@ func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {
 	//siteinfo
 	r.GET("/siteinfo", a.siteinfoController.GetSiteInfo)
 	r.GET("/siteinfo/legal", a.siteinfoController.GetSiteLegalInfo)
+
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
+	//revisions
+	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
+	r.PUT("/revisions/audit", a.revisionController.RevisionAudit)
+
 	// comment
 	r.POST("/comment", a.commentController.AddComment)
 	r.DELETE("/comment", a.commentController.RemoveComment)
@@ -209,9 +214,6 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	r.GET("/activity/timeline", a.activityController.GetObjectTimeline)
 	r.GET("/activity/timeline/detail", a.activityController.GetObjectTimelineDetail)
 
-	//revisions
-	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
-
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerCmsAPIRouter(r *gin.RouterGroup) {
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index e4141d65..234c4ce5 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -26,6 +26,17 @@ type GetRevisionListReq struct {
 	ObjectID string `validate:"required" comment:"object_id" form:"object_id"`
 }
 
+const RevisionAuditApprove = "approve"
+const RevisionAuditReject = "reject"
+
+type RevisionAuditReq struct {
+	// object id
+	ID        string `validate:"required" comment:"id" form:"id"`
+	Operation string `validate:"required" comment:"operation" form:"operation"` //approve or reject
+	UserID    string `json:"-" `                                                // user_id
+	// IsAdmin   bool   `json:"-"`
+}
+
 type RevisionSearch struct {
 	Page int `json:"page" form:"page"` // Query number of pages
 }
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index c632149d..138d9eae 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -17,27 +17,29 @@ import (
 )
 
 const (
-	QuestionAddRank      = "rank.question.add"
-	QuestionEditRank     = "rank.question.edit"
-	QuestionDeleteRank   = "rank.question.delete"
-	QuestionVoteUpRank   = "rank.question.vote_up"
-	QuestionVoteDownRank = "rank.question.vote_down"
-	AnswerAddRank        = "rank.answer.add"
-	AnswerEditRank       = "rank.answer.edit"
-	AnswerDeleteRank     = "rank.answer.delete"
-	AnswerAcceptRank     = "rank.answer.accept"
-	AnswerVoteUpRank     = "rank.answer.vote_up"
-	AnswerVoteDownRank   = "rank.answer.vote_down"
-	CommentAddRank       = "rank.comment.add"
-	CommentEditRank      = "rank.comment.edit"
-	CommentDeleteRank    = "rank.comment.delete"
-	ReportAddRank        = "rank.report.add"
-	TagAddRank           = "rank.tag.add"
-	TagEditRank          = "rank.tag.edit"
-	TagDeleteRank        = "rank.tag.delete"
-	TagSynonymRank       = "rank.tag.synonym"
-	LinkUrlLimitRank     = "rank.link.url_limit"
-	VoteDetailRank       = "rank.vote.detail"
+	QuestionAddRank            = "rank.question.add"
+	QuestionEditRank           = "rank.question.edit"
+	QuestionDeleteRank         = "rank.question.delete"
+	QuestionVoteUpRank         = "rank.question.vote_up"
+	QuestionVoteDownRank       = "rank.question.vote_down"
+	AnswerAddRank              = "rank.answer.add"
+	AnswerEditRank             = "rank.answer.edit"
+	AnswerDeleteRank           = "rank.answer.delete"
+	AnswerAcceptRank           = "rank.answer.accept"
+	AnswerVoteUpRank           = "rank.answer.vote_up"
+	AnswerVoteDownRank         = "rank.answer.vote_down"
+	CommentAddRank             = "rank.comment.add"
+	CommentEditRank            = "rank.comment.edit"
+	CommentDeleteRank          = "rank.comment.delete"
+	ReportAddRank              = "rank.report.add"
+	TagAddRank                 = "rank.tag.add"
+	TagEditRank                = "rank.tag.edit"
+	TagDeleteRank              = "rank.tag.delete"
+	TagSynonymRank             = "rank.tag.synonym"
+	LinkUrlLimitRank           = "rank.link.url_limit"
+	VoteDetailRank             = "rank.vote.detail"
+	RevisionAuditRank          = "rank.revision.audit"
+	UnreviewedRevisionListRank = "rank.revision.unreviewed_list"
 )
 
 type UserRankRepo interface {
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index 1bc76fff..cf146947 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -16,4 +16,5 @@ type RevisionRepo interface {
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
 	ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
 	SearchUnreviewedList(ctx context.Context, search *entity.RevisionSearch) ([]*entity.Revision, int64, error)
+	UpdateStatus(ctx context.Context, id string, status int) (err error)
 }
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index d73ad878..a6582d07 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -38,6 +38,25 @@ func NewRevisionService(
 		objectInfoService: objectInfoService,
 	}
 }
+func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.RevisionAuditReq) (err error) {
+	revisioninfo, exist, err := rs.revisionRepo.GetRevisionByID(ctx, req.ID)
+	if err != nil {
+		return
+	}
+	if !exist {
+		return
+	}
+	if revisioninfo.Status != entity.RevisionUnreviewedStatus {
+		return
+	}
+	if req.Operation == schema.RevisionAuditReject {
+		revisioninfo.Status = entity.RevisionReviewRejectStatus
+		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
+		return
+	}
+
+	return nil
+}
 
 // SearchUnreviewedList get unreviewed list
 func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []*schema.GetUnreviewedRevisionResp, count int64, err error) {

From 5a16a248595e5b219eee9688dc5079138bcd47a1 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 11:24:11 +0800
Subject: [PATCH 060/194] fix: not enough argument lead to compile error

---
 internal/service/object_info/object_info.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 06c69237..77e255b3 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -95,7 +95,7 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		}
 
 	case constant.TagObjectType:
-		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID)
+		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID, true)
 		if err != nil {
 			return nil, err
 		}

From 2f33d000a1bd4cf1f0badfd1f6f5d36f4070ab43 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:29:58 +0800
Subject: [PATCH 061/194] update question AddActivity

---
 internal/service/question_service.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index e9b8a4a9..9bec3463 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -272,7 +272,7 @@ func (qs *QuestionService) CheckCanUpdateQuestion(ctx context.Context, req *sche
 
 // UpdateQuestion update question
 func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
-
+	var canUpdateQuestion bool
 	questionInfo = &schema.QuestionInfo{}
 
 	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
@@ -353,11 +353,11 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		Title:    question.Title,
 		Log:      req.EditSummary,
 	}
-
 	// It's not you or the administrator that needs to be reviewed
 	if dbinfo.UserID != req.UserID && !req.IsAdmin {
 		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	} else {
+		canUpdateQuestion = true
 		//Direct modification
 		revisionDTO.Status = entity.RevisionReviewPassStatus
 		//update question to db
@@ -385,13 +385,15 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if err != nil {
 		return
 	}
-	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:           req.UserID,
-		ObjectID:         question.ID,
-		ActivityTypeKey:  constant.ActQuestionEdited,
-		RevisionID:       revisionID,
-		OriginalObjectID: question.ID,
-	})
+	if canUpdateQuestion {
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           req.UserID,
+			ObjectID:         question.ID,
+			ActivityTypeKey:  constant.ActQuestionEdited,
+			RevisionID:       revisionID,
+			OriginalObjectID: question.ID,
+		})
+	}
 
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false, false)
 	return

From 155c9b57c33039c332d90098191a0d5049b5d32f Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 24 Nov 2022 11:35:32 +0800
Subject: [PATCH 062/194] fix: timeline add empty state

---
 i18n/en_US.yaml                 | 1 +
 ui/src/pages/Timeline/index.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index d49bfb96..e9b98f40 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1215,3 +1215,4 @@ ui:
     type: Type
     by: By
     comment: Comment
+    no_data: "We couldn't find anything."
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index dd27ebd9..8c592a56 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 
 import { loggedUserInfoStore } from '@/stores';
 import { useTimelineData } from '@/services';
-import { PageTitle } from '@/components';
+import { PageTitle, Empty } from '@/components';
 
 import HistoryItem from './components/Item';
 
@@ -15,7 +15,7 @@ const Index: FC = () => {
   const { is_admin } = loggedUserInfoStore((state) => state.user);
   const [showVotes, setShowVotes] = useState(false);
 
-  const { data: timelineData } = useTimelineData({
+  const { data: timelineData, isLoading } = useTimelineData({
     object_id: tid || aid || qid,
     show_vote: showVotes,
   });
@@ -91,6 +91,9 @@ const Index: FC = () => {
               })}
             </tbody>
           </Table>
+          {!isLoading && Number(timelineData?.timeline?.length) <= 0 && (
+            <Empty>{t('no_data')}</Empty>
+          )}
         </Col>
       </Row>
     </Container>

From fea5ff5fde5258ae559cbc0ac5ea2ab91d928265 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:50:11 +0800
Subject: [PATCH 063/194] fix answer list

---
 internal/controller/answer_controller.go | 4 +++-
 internal/service/revision_service.go     | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 00f61280..81129227 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -194,7 +194,9 @@ func (ac *AnswerController) AnswerList(ctx *gin.Context) {
 	}
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
 	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	if userinfo != nil {
+		req.IsAdmin = userinfo.IsAdmin
+	}
 	list, count, err := ac.answerService.SearchList(ctx, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index a6582d07..3d07b9f3 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -54,6 +54,11 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
 		return
 	}
+	if req.Operation == schema.RevisionAuditApprove {
+		// revisioninfo.Status = entity.RevisionReviewRejectStatus
+		// err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
+		return
+	}
 
 	return nil
 }

From 18e062623e17954a89e591e2a5058445a2a619b3 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 11:59:19 +0800
Subject: [PATCH 064/194] fix: if i18n file exist, try to replace it when init.
 #95

---
 internal/cli/install.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/internal/cli/install.go b/internal/cli/install.go
index 1f759b7b..6737da98 100644
--- a/internal/cli/install.go
+++ b/internal/cli/install.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 
 	"github.com/answerdev/answer/configs"
@@ -96,6 +97,12 @@ func installI18nBundle() {
 		if err != nil {
 			continue
 		}
+		if dir.CheckFileExist(path) {
+			fmt.Printf("[i18n] install %s file exist, try to replace it\n", item.Name())
+			if err = os.Remove(path); err != nil {
+				fmt.Println(err)
+			}
+		}
 		fmt.Printf("[i18n] install %s bundle...\n", item.Name())
 		err = writer.WriteFile(path, string(content))
 		if err != nil {

From 7794dd2b5c8aa17bcbe49bb8d1b74d50c5d0a4bc Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:27:31 +0800
Subject: [PATCH 065/194] update question revision

---
 cmd/answer/wire_gen.go                    |  2 +-
 internal/service/revision_service.go      | 94 ++++++++++++++++++++++-
 internal/service/tag_common/tag_common.go |  4 +-
 3 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 7186db86..54a54058 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -163,7 +163,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon)
 	searchService := service.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService)
-	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService)
+	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService)
 	revisionController := controller.NewRevisionController(serviceRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	commonRepo := common.NewCommonRepo(dataData, uniqueIDRepo)
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 3d07b9f3..400a8091 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -3,14 +3,20 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
+	"github.com/answerdev/answer/internal/service/activity_queue"
+	answercommon "github.com/answerdev/answer/internal/service/answer_common"
 	"github.com/answerdev/answer/internal/service/object_info"
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
+	"github.com/answerdev/answer/internal/service/tag"
+	tagcommon "github.com/answerdev/answer/internal/service/tag_common"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
+	"github.com/answerdev/answer/pkg/obj"
 	"github.com/jinzhu/copier"
 )
 
@@ -21,6 +27,10 @@ type RevisionService struct {
 	questionCommon    *questioncommon.QuestionCommon
 	answerService     *AnswerService
 	objectInfoService *object_info.ObjService
+	questionRepo      questioncommon.QuestionRepo
+	answerRepo        answercommon.AnswerRepo
+	tagRepo           tag.TagRepo
+	tagCommon         *tagcommon.TagCommonService
 }
 
 func NewRevisionService(
@@ -29,6 +39,11 @@ func NewRevisionService(
 	questionCommon *questioncommon.QuestionCommon,
 	answerService *AnswerService,
 	objectInfoService *object_info.ObjService,
+	questionRepo questioncommon.QuestionRepo,
+	answerRepo answercommon.AnswerRepo,
+	tagRepo tag.TagRepo,
+	tagCommon *tagcommon.TagCommonService,
+
 ) *RevisionService {
 	return &RevisionService{
 		revisionRepo:      revisionRepo,
@@ -36,6 +51,10 @@ func NewRevisionService(
 		questionCommon:    questionCommon,
 		answerService:     answerService,
 		objectInfoService: objectInfoService,
+		questionRepo:      questionRepo,
+		answerRepo:        answerRepo,
+		tagRepo:           tagRepo,
+		tagCommon:         tagCommon,
 	}
 }
 func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.RevisionAuditReq) (err error) {
@@ -50,13 +69,82 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		return
 	}
 	if req.Operation == schema.RevisionAuditReject {
-		revisioninfo.Status = entity.RevisionReviewRejectStatus
 		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
 		return
 	}
 	if req.Operation == schema.RevisionAuditApprove {
-		// revisioninfo.Status = entity.RevisionReviewRejectStatus
-		// err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
+		objectType, objectTypeerr := obj.GetObjectTypeStrByObjectID(revisioninfo.ObjectID)
+		if objectTypeerr != nil {
+			return objectTypeerr
+		}
+		revisionitem := &schema.GetRevisionResp{}
+		_ = copier.Copy(revisionitem, revisioninfo)
+		rs.parseItem(ctx, revisionitem)
+		switch objectType {
+		case constant.QuestionObjectType:
+			questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfo)
+			if ok {
+				now := time.Now()
+				question := &entity.Question{}
+				question.ID = req.ID
+				question.Title = questioninfo.Title
+				question.OriginalText = questioninfo.Content
+				question.ParsedText = questioninfo.HTML
+				question.UpdatedAt = now
+				saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
+				if saveerr != nil {
+					return saveerr
+				}
+				objectTagTags := make([]*schema.TagItem, 0)
+				for _, tag := range questioninfo.Tags {
+					item := &schema.TagItem{}
+					item.SlugName = tag.SlugName
+					objectTagTags = append(objectTagTags, item)
+				}
+				objectTagData := schema.TagChange{}
+				objectTagData.ObjectID = question.ID
+				objectTagData.Tags = objectTagTags
+				saveerr = rs.tagCommon.ObjectChangeTag(ctx, &objectTagData)
+				if saveerr != nil {
+					return saveerr
+				}
+				activity_queue.AddActivity(&schema.ActivityMsg{
+					UserID:           revisioninfo.UserID,
+					ObjectID:         revisioninfo.ObjectID,
+					ActivityTypeKey:  constant.ActQuestionEdited,
+					RevisionID:       revisioninfo.ID,
+					OriginalObjectID: revisioninfo.ObjectID,
+				})
+			}
+			//
+		case constant.AnswerObjectType:
+			answerinfo, ok := revisionitem.ContentParsed.(*schema.AnswerInfo)
+			if ok {
+				now := time.Now()
+				insertData := new(entity.Answer)
+				insertData.ID = req.ID
+				insertData.OriginalText = answerinfo.Content
+				insertData.ParsedText = answerinfo.HTML
+				insertData.UpdatedAt = now
+				if saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
+					return saveerr
+				}
+			}
+
+		case constant.TagObjectType:
+			taginfo, ok := revisionitem.ContentParsed.(*schema.GetTagResp)
+			if ok {
+				tag := &entity.Tag{}
+				tag.ID = taginfo.TagID
+				tag.OriginalText = taginfo.OriginalText
+				tag.ParsedText = taginfo.ParsedText
+				saveerr := rs.tagRepo.UpdateTag(ctx, tag)
+				if saveerr != nil {
+					return saveerr
+				}
+			}
+		}
+		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus)
 		return
 	}
 
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index e5dcbf35..6252623f 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -52,7 +52,9 @@ type TagCommonService struct {
 }
 
 // NewTagCommonService new tag service
-func NewTagCommonService(tagCommonRepo TagCommonRepo, tagRelRepo TagRelRepo,
+func NewTagCommonService(
+	tagCommonRepo TagCommonRepo,
+	tagRelRepo TagRelRepo,
 	revisionService *revision_common.RevisionService,
 	siteInfoService *siteinfo_common.SiteInfoCommonService,
 ) *TagCommonService {

From d1f951d0664c6f53291bbe182a33d5e1c131b8b9 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:31:28 +0800
Subject: [PATCH 066/194] fix question revision

---
 internal/service/revision_service.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 400a8091..aa411459 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -86,7 +86,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 			if ok {
 				now := time.Now()
 				question := &entity.Question{}
-				question.ID = req.ID
+				question.ID = questioninfo.ID
 				question.Title = questioninfo.Title
 				question.OriginalText = questioninfo.Content
 				question.ParsedText = questioninfo.HTML
@@ -122,7 +122,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 			if ok {
 				now := time.Now()
 				insertData := new(entity.Answer)
-				insertData.ID = req.ID
+				insertData.ID = answerinfo.ID
 				insertData.OriginalText = answerinfo.Content
 				insertData.ParsedText = answerinfo.HTML
 				insertData.UpdatedAt = now

From 977f9999a9d46f741841385dc4c3bf7770d787ec Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 15:02:31 +0800
Subject: [PATCH 067/194] update tag revision

---
 i18n/en_US.yaml                      |  2 +
 internal/base/reason/reason.go       |  1 +
 internal/service/answer_service.go   | 69 +++++++++++++++++-----------
 internal/service/revision_service.go | 34 +++++++++++++-
 internal/service/tag/tag_service.go  |  9 ++++
 5 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 19bc53cf..66fa7e1b 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -90,6 +90,8 @@ backend:
         other: "Please enter at least one required tag."
       not_contain_synonym_tags:
         other: "Should not contain synonym tags."
+      cannot_update:
+        other: "No permission to update."
     theme:
       not_found:
         other: "Theme not found."
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 52c5c499..274cc1cc 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -41,6 +41,7 @@ const (
 	ObjectNotFound                   = "error.object.not_found"
 	TagNotFound                      = "error.tag.not_found"
 	TagNotContainSynonym             = "error.tag.not_contain_synonym_tags"
+	TagCannotUpdate                  = "error.tag.cannot_update"
 	RankFailToMeetTheCondition       = "error.rank.fail_to_meet_the_condition"
 	ThemeNotFound                    = "error.theme.not_found"
 	LangNotFound                     = "error.lang.not_found"
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 6009e749..0efb0ea9 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -190,6 +190,16 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 }
 
 func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq) (string, error) {
+	var canUpdate bool
+	_, existUnreviewed, err := as.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
+	if err != nil {
+		return "", err
+	}
+	if existUnreviewed {
+		err = errors.BadRequest(reason.AnswerCannotUpdate)
+		return "", err
+	}
+
 	questionInfo, exist, err := as.questionRepo.GetQuestion(ctx, req.QuestionID)
 	if err != nil {
 		return "", err
@@ -197,17 +207,13 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	if !exist {
 		return "", errors.BadRequest(reason.QuestionNotFound)
 	}
-	if !req.IsAdmin {
-		answerInfo, exist, err := as.answerRepo.GetByID(ctx, req.ID)
-		if err != nil {
-			return "", err
-		}
-		if !exist {
-			return "", nil
-		}
-		if answerInfo.UserID != req.UserID {
-			return "", errors.BadRequest(reason.AnswerCannotUpdate)
-		}
+
+	answerInfo, exist, err := as.answerRepo.GetByID(ctx, req.ID)
+	if err != nil {
+		return "", err
+	}
+	if !exist {
+		return "", nil
 	}
 
 	now := time.Now()
@@ -218,34 +224,45 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	insertData.OriginalText = req.Content
 	insertData.ParsedText = req.HTML
 	insertData.UpdatedAt = now
-	if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
-		return "", err
-	}
-	err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
-	if err != nil {
-		return insertData.ID, err
-	}
+
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   req.UserID,
 		ObjectID: req.ID,
 		Title:    "",
 		Log:      req.EditSummary,
 	}
+
+	if answerInfo.UserID != req.UserID && !req.IsAdmin {
+		revisionDTO.Status = entity.RevisionUnreviewedStatus
+	} else {
+		canUpdate = true
+		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
+			return "", err
+		}
+		err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
+		if err != nil {
+			return insertData.ID, err
+		}
+		as.notificationUpdateAnswer(ctx, questionInfo.UserID, insertData.ID, req.UserID)
+		revisionDTO.Status = entity.RevisionReviewPassStatus
+	}
+
 	infoJSON, _ := json.Marshal(insertData)
 	revisionDTO.Content = string(infoJSON)
 	revisionID, err := as.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return insertData.ID, err
 	}
-	as.notificationUpdateAnswer(ctx, questionInfo.UserID, insertData.ID, req.UserID)
+	if canUpdate {
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           insertData.UserID,
+			ObjectID:         insertData.ID,
+			OriginalObjectID: insertData.ID,
+			ActivityTypeKey:  constant.ActAnswerEdited,
+			RevisionID:       revisionID,
+		})
+	}
 
-	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:           insertData.UserID,
-		ObjectID:         insertData.ID,
-		OriginalObjectID: insertData.ID,
-		ActivityTypeKey:  constant.ActAnswerEdited,
-		RevisionID:       revisionID,
-	})
 	return insertData.ID, nil
 }
 
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index aa411459..3d434651 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -6,10 +6,12 @@ import (
 	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
+	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/activity_queue"
 	answercommon "github.com/answerdev/answer/internal/service/answer_common"
+	"github.com/answerdev/answer/internal/service/notice_queue"
 	"github.com/answerdev/answer/internal/service/object_info"
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
@@ -18,6 +20,7 @@ import (
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/answerdev/answer/pkg/obj"
 	"github.com/jinzhu/copier"
+	"github.com/segmentfault/pacman/errors"
 )
 
 // RevisionService user service
@@ -126,9 +129,38 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 				insertData.OriginalText = answerinfo.Content
 				insertData.ParsedText = answerinfo.HTML
 				insertData.UpdatedAt = now
-				if saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
+				saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"})
+				if saveerr != nil {
 					return saveerr
 				}
+				saveerr = rs.questionCommon.UpdataPostTime(ctx, answerinfo.QuestionID)
+				if saveerr != nil {
+					return saveerr
+				}
+				questionInfo, exist, err := rs.questionRepo.GetQuestion(ctx, answerinfo.QuestionID)
+				if err != nil {
+					return err
+				}
+				if !exist {
+					return errors.BadRequest(reason.QuestionNotFound)
+				}
+				msg := &schema.NotificationMsg{
+					TriggerUserID:  revisioninfo.UserID,
+					ReceiverUserID: questionInfo.UserID,
+					Type:           schema.NotificationTypeInbox,
+					ObjectID:       answerinfo.ID,
+				}
+				msg.ObjectType = constant.AnswerObjectType
+				msg.NotificationAction = constant.UpdateAnswer
+				notice_queue.AddNotification(msg)
+
+				activity_queue.AddActivity(&schema.ActivityMsg{
+					UserID:           revisioninfo.UserID,
+					ObjectID:         insertData.ID,
+					OriginalObjectID: insertData.ID,
+					ActivityTypeKey:  constant.ActAnswerEdited,
+					RevisionID:       revisioninfo.ID,
+				})
 			}
 
 		case constant.TagObjectType:
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index fa63e80f..223342e2 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -68,6 +68,15 @@ func (ts *TagService) RemoveTag(ctx context.Context, tagID string) (err error) {
 
 // UpdateTag update tag
 func (ts *TagService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (err error) {
+	_, existUnreviewed, err := ts.revisionService.ExistUnreviewedByObjectID(ctx, req.TagID)
+	if err != nil {
+		return err
+	}
+	if existUnreviewed {
+		err = errors.BadRequest(reason.AnswerCannotUpdate)
+		return err
+	}
+
 	tag := &entity.Tag{}
 	_ = copier.Copy(tag, req)
 	tag.ID = req.TagID

From afa66cb9f6643ba8859509eaf896ccb4b3c796e6 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 15:24:04 +0800
Subject: [PATCH 068/194] refactor: extract is admin flag from context

---
 internal/base/middleware/auth.go           | 17 +++++++++-----
 internal/controller/answer_controller.go   | 12 ++++------
 internal/controller/question_controller.go | 27 +++++++++-------------
 internal/controller/tag_controller.go      |  3 +--
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.go
index 813effe3..e793d3c7 100644
--- a/internal/base/middleware/auth.go
+++ b/internal/base/middleware/auth.go
@@ -113,15 +113,20 @@ func (am *AuthUserMiddleware) CmsAuth() gin.HandlerFunc {
 
 // GetLoginUserIDFromContext get user id from context
 func GetLoginUserIDFromContext(ctx *gin.Context) (userID string) {
-	userInfo, exist := ctx.Get(ctxUUIDKey)
-	if !exist {
+	userInfo := GetUserInfoFromContext(ctx)
+	if userInfo == nil {
 		return ""
 	}
-	u, ok := userInfo.(*entity.UserCacheInfo)
-	if !ok {
-		return ""
+	return userInfo.UserID
+}
+
+// GetIsAdminFromContext get user is admin from context
+func GetIsAdminFromContext(ctx *gin.Context) (isAdmin bool) {
+	userInfo := GetUserInfoFromContext(ctx)
+	if userInfo == nil {
+		return false
 	}
-	return u.UserID
+	return userInfo.IsAdmin
 }
 
 // GetUserInfoFromContext get user info from context
diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 81129227..6cc3edc2 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -51,12 +51,12 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerDeleteRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+
 	err := ac.answerService.RemoveAnswer(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
@@ -148,8 +148,7 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 
 	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerEditRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
@@ -193,10 +192,7 @@ func (ac *AnswerController) AnswerList(ctx *gin.Context) {
 		return
 	}
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	if userinfo != nil {
-		req.IsAdmin = userinfo.IsAdmin
-	}
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	list, count, err := ac.answerService.SearchList(ctx, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 940f8c4e..e91c4b20 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -42,12 +42,11 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionDeleteRank); err != nil || !can {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
 
 	err := qc.questionService.RemoveQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
@@ -69,8 +68,7 @@ func (qc *QuestionController) CloseQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	err := qc.questionService.CloseQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
@@ -85,17 +83,16 @@ func (qc *QuestionController) CloseQuestion(ctx *gin.Context) {
 // @Param id query string true "Question TagID"  default(1)
 // @Success 200 {string} string ""
 // @Router /answer/api/v1/question/info [get]
-func (qc *QuestionController) GetQuestion(c *gin.Context) {
-	id := c.Query("id")
-	ctx := context.Background()
-	userID := middleware.GetLoginUserIDFromContext(c)
-	userinfo := middleware.GetUserInfoFromContext(c)
-	info, err := qc.questionService.GetQuestion(ctx, id, userID, true, userinfo.IsAdmin)
+func (qc *QuestionController) GetQuestion(ctx *gin.Context) {
+	id := ctx.Query("id")
+	userID := middleware.GetLoginUserIDFromContext(ctx)
+	isAdmin := middleware.GetIsAdminFromContext(ctx)
+	info, err := qc.questionService.GetQuestion(ctx, id, userID, true, isAdmin)
 	if err != nil {
-		handler.HandleResponse(c, err, nil)
+		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	handler.HandleResponse(c, nil, info)
+	handler.HandleResponse(ctx, nil, info)
 }
 
 // SimilarQuestion godoc
@@ -218,8 +215,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
@@ -244,8 +240,7 @@ func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
 	req := &schema.CheckCanQuestionUpdate{}
 	req.ID = id
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index 673a746c..f1877db3 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -42,8 +42,7 @@ func (tc *TagController) SearchTagLike(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	req.IsAdmin = userinfo.IsAdmin
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	resp, err := tc.tagCommonService.SearchTagLike(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }

From 7506806b67e412c93e8a32b704b387b04dd7a7ac Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 15:48:04 +0800
Subject: [PATCH 069/194] update tag revision

---
 cmd/answer/wire_gen.go                    |  4 +-
 internal/repo/tag/tag_repo.go             |  4 +-
 internal/service/revision_service.go      | 42 +++++++++++-
 internal/service/tag/tag_service.go       | 78 ++---------------------
 internal/service/tag_common/tag_common.go | 75 ++++++++++++++++++++++
 5 files changed, 124 insertions(+), 79 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 54a54058..217edea1 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -121,9 +121,10 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	questionRepo := question.NewQuestionRepo(dataData, uniqueIDRepo)
 	tagCommonRepo := tag_common.NewTagCommonRepo(dataData, uniqueIDRepo)
 	tagRelRepo := tag.NewTagRelRepo(dataData)
+	tagRepo := tag.NewTagRepo(dataData, uniqueIDRepo)
 	revisionRepo := revision.NewRevisionRepo(dataData, uniqueIDRepo)
 	revisionService := revision_common.NewRevisionService(revisionRepo, userRepo)
-	tagCommonService := tag_common2.NewTagCommonService(tagCommonRepo, tagRelRepo, revisionService, siteInfoCommonService)
+	tagCommonService := tag_common2.NewTagCommonService(tagCommonRepo, tagRelRepo, tagRepo, revisionService, siteInfoCommonService)
 	objService := object_info.NewObjService(answerRepo, questionRepo, commentCommonRepo, tagCommonRepo, tagCommonService)
 	voteRepo := activity_common.NewVoteRepo(dataData, activityRepo)
 	commentService := comment2.NewCommentService(commentRepo, commentCommonRepo, userCommon, objService, voteRepo)
@@ -135,7 +136,6 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	serviceVoteRepo := activity.NewVoteRepo(dataData, uniqueIDRepo, configRepo, activityRepo, userRankRepo, voteRepo)
 	voteService := service.NewVoteService(serviceVoteRepo, uniqueIDRepo, configRepo, questionRepo, answerRepo, commentCommonRepo, objService)
 	voteController := controller.NewVoteController(voteService)
-	tagRepo := tag.NewTagRepo(dataData, uniqueIDRepo)
 	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
 	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService)
 	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
diff --git a/internal/repo/tag/tag_repo.go b/internal/repo/tag/tag_repo.go
index 4a9222e3..0c1169e0 100644
--- a/internal/repo/tag/tag_repo.go
+++ b/internal/repo/tag/tag_repo.go
@@ -6,7 +6,7 @@ import (
 	"github.com/answerdev/answer/internal/base/data"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
-	"github.com/answerdev/answer/internal/service/tag"
+	"github.com/answerdev/answer/internal/service/tag_common"
 	"github.com/answerdev/answer/internal/service/unique"
 	"github.com/segmentfault/pacman/errors"
 	"xorm.io/builder"
@@ -22,7 +22,7 @@ type tagRepo struct {
 func NewTagRepo(
 	data *data.Data,
 	uniqueIDRepo unique.UniqueIDRepo,
-) tag.TagRepo {
+) tag_common.TagRepo {
 	return &tagRepo{
 		data:         data,
 		uniqueIDRepo: uniqueIDRepo,
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 3d434651..9a797954 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -15,12 +15,14 @@ import (
 	"github.com/answerdev/answer/internal/service/object_info"
 	questioncommon "github.com/answerdev/answer/internal/service/question_common"
 	"github.com/answerdev/answer/internal/service/revision"
-	"github.com/answerdev/answer/internal/service/tag"
+	"github.com/answerdev/answer/internal/service/tag_common"
 	tagcommon "github.com/answerdev/answer/internal/service/tag_common"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
+	"github.com/answerdev/answer/pkg/converter"
 	"github.com/answerdev/answer/pkg/obj"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
+	"github.com/segmentfault/pacman/log"
 )
 
 // RevisionService user service
@@ -32,7 +34,7 @@ type RevisionService struct {
 	objectInfoService *object_info.ObjService
 	questionRepo      questioncommon.QuestionRepo
 	answerRepo        answercommon.AnswerRepo
-	tagRepo           tag.TagRepo
+	tagRepo           tag_common.TagRepo
 	tagCommon         *tagcommon.TagCommonService
 }
 
@@ -44,7 +46,7 @@ func NewRevisionService(
 	objectInfoService *object_info.ObjService,
 	questionRepo questioncommon.QuestionRepo,
 	answerRepo answercommon.AnswerRepo,
-	tagRepo tag.TagRepo,
+	tagRepo tag_common.TagRepo,
 	tagCommon *tagcommon.TagCommonService,
 
 ) *RevisionService {
@@ -168,14 +170,48 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 			if ok {
 				tag := &entity.Tag{}
 				tag.ID = taginfo.TagID
+				tag.DisplayName = taginfo.DisplayName
+				tag.SlugName = taginfo.SlugName
 				tag.OriginalText = taginfo.OriginalText
 				tag.ParsedText = taginfo.ParsedText
 				saveerr := rs.tagRepo.UpdateTag(ctx, tag)
 				if saveerr != nil {
 					return saveerr
 				}
+
+				tagInfo, exist, err := rs.tagCommon.GetTagByID(ctx, taginfo.TagID)
+				if err != nil {
+					return err
+				}
+				if !exist {
+					return errors.BadRequest(reason.TagNotFound)
+				}
+				if tagInfo.MainTagID == 0 && len(tagInfo.SlugName) > 0 {
+					log.Debugf("tag %s update slug_name", tagInfo.SlugName)
+					tagList, err := rs.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
+					if err != nil {
+						return err
+					}
+					updateTagSlugNames := make([]string, 0)
+					for _, tag := range tagList {
+						updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
+					}
+					err = rs.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
+					if err != nil {
+						return err
+					}
+				}
+
+				activity_queue.AddActivity(&schema.ActivityMsg{
+					UserID:           revisioninfo.UserID,
+					ObjectID:         taginfo.TagID,
+					OriginalObjectID: taginfo.TagID,
+					ActivityTypeKey:  constant.ActTagEdited,
+					RevisionID:       revisioninfo.ID,
+				})
 			}
 		}
+
 		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus)
 		return
 	}
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index 223342e2..057e1de8 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -8,7 +8,7 @@ import (
 	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
-	"github.com/answerdev/answer/internal/service/tag_common"
+	tagcommonser "github.com/answerdev/answer/internal/service/tag_common"
 	"github.com/answerdev/answer/pkg/htmltext"
 
 	"github.com/answerdev/answer/internal/base/pager"
@@ -23,17 +23,10 @@ import (
 	"github.com/segmentfault/pacman/log"
 )
 
-type TagRepo interface {
-	RemoveTag(ctx context.Context, tagID string) (err error)
-	UpdateTag(ctx context.Context, tag *entity.Tag) (err error)
-	UpdateTagSynonym(ctx context.Context, tagSlugNameList []string, mainTagID int64, mainTagSlugName string) (err error)
-	GetTagList(ctx context.Context, tag *entity.Tag) (tagList []*entity.Tag, err error)
-}
-
 // TagService user service
 type TagService struct {
-	tagRepo          TagRepo
-	tagCommonService *tag_common.TagCommonService
+	tagRepo          tagcommonser.TagRepo
+	tagCommonService *tagcommonser.TagCommonService
 	revisionService  *revision_common.RevisionService
 	followCommon     activity_common.FollowRepo
 	siteInfoService  *siteinfo_common.SiteInfoCommonService
@@ -41,8 +34,8 @@ type TagService struct {
 
 // NewTagService new tag service
 func NewTagService(
-	tagRepo TagRepo,
-	tagCommonService *tag_common.TagCommonService,
+	tagRepo tagcommonser.TagRepo,
+	tagCommonService *tagcommonser.TagCommonService,
 	revisionService *revision_common.RevisionService,
 	followCommon activity_common.FollowRepo,
 	siteInfoService *siteinfo_common.SiteInfoCommonService) *TagService {
@@ -68,66 +61,7 @@ func (ts *TagService) RemoveTag(ctx context.Context, tagID string) (err error) {
 
 // UpdateTag update tag
 func (ts *TagService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (err error) {
-	_, existUnreviewed, err := ts.revisionService.ExistUnreviewedByObjectID(ctx, req.TagID)
-	if err != nil {
-		return err
-	}
-	if existUnreviewed {
-		err = errors.BadRequest(reason.AnswerCannotUpdate)
-		return err
-	}
-
-	tag := &entity.Tag{}
-	_ = copier.Copy(tag, req)
-	tag.ID = req.TagID
-	err = ts.tagRepo.UpdateTag(ctx, tag)
-	if err != nil {
-		return err
-	}
-
-	tagInfo, exist, err := ts.tagCommonService.GetTagByID(ctx, req.TagID)
-	if err != nil {
-		return err
-	}
-	if !exist {
-		return errors.BadRequest(reason.TagNotFound)
-	}
-	if tagInfo.MainTagID == 0 && len(req.SlugName) > 0 {
-		log.Debugf("tag %s update slug_name", tagInfo.SlugName)
-		tagList, err := ts.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
-		if err != nil {
-			return err
-		}
-		updateTagSlugNames := make([]string, 0)
-		for _, tag := range tagList {
-			updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
-		}
-		err = ts.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
-		if err != nil {
-			return err
-		}
-	}
-
-	revisionDTO := &schema.AddRevisionDTO{
-		UserID:   req.UserID,
-		ObjectID: tag.ID,
-		Title:    tag.SlugName,
-		Log:      req.EditSummary,
-	}
-	tagInfoJson, _ := json.Marshal(tagInfo)
-	revisionDTO.Content = string(tagInfoJson)
-	revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
-	if err != nil {
-		return err
-	}
-	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:           req.UserID,
-		ObjectID:         tag.ID,
-		OriginalObjectID: tag.ID,
-		ActivityTypeKey:  constant.ActTagEdited,
-		RevisionID:       revisionID,
-	})
-	return
+	return ts.tagCommonService.UpdateTag(ctx, req)
 }
 
 // GetTagInfo get tag one
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 6252623f..e72db785 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -15,6 +15,8 @@ import (
 	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
+	"github.com/answerdev/answer/pkg/converter"
+	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
 )
@@ -33,6 +35,13 @@ type TagCommonRepo interface {
 	UpdateTagQuestionCount(ctx context.Context, tagID string, questionCount int) (err error)
 }
 
+type TagRepo interface {
+	RemoveTag(ctx context.Context, tagID string) (err error)
+	UpdateTag(ctx context.Context, tag *entity.Tag) (err error)
+	UpdateTagSynonym(ctx context.Context, tagSlugNameList []string, mainTagID int64, mainTagSlugName string) (err error)
+	GetTagList(ctx context.Context, tag *entity.Tag) (tagList []*entity.Tag, err error)
+}
+
 type TagRelRepo interface {
 	AddTagRelList(ctx context.Context, tagList []*entity.TagRel) (err error)
 	RemoveTagRelListByIDs(ctx context.Context, ids []int64) (err error)
@@ -48,6 +57,7 @@ type TagCommonService struct {
 	revisionService *revision_common.RevisionService
 	tagCommonRepo   TagCommonRepo
 	tagRelRepo      TagRelRepo
+	tagRepo         TagRepo
 	siteInfoService *siteinfo_common.SiteInfoCommonService
 }
 
@@ -55,12 +65,14 @@ type TagCommonService struct {
 func NewTagCommonService(
 	tagCommonRepo TagCommonRepo,
 	tagRelRepo TagRelRepo,
+	tagRepo TagRepo,
 	revisionService *revision_common.RevisionService,
 	siteInfoService *siteinfo_common.SiteInfoCommonService,
 ) *TagCommonService {
 	return &TagCommonService{
 		tagCommonRepo:   tagCommonRepo,
 		tagRelRepo:      tagRelRepo,
+		tagRepo:         tagRepo,
 		revisionService: revisionService,
 		siteInfoService: siteInfoService,
 	}
@@ -584,3 +596,66 @@ func (ts *TagCommonService) CreateOrUpdateTagRelList(ctx context.Context, object
 	}
 	return nil
 }
+
+func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (err error) {
+	_, existUnreviewed, err := ts.revisionService.ExistUnreviewedByObjectID(ctx, req.TagID)
+	if err != nil {
+		return err
+	}
+	if existUnreviewed {
+		err = errors.BadRequest(reason.AnswerCannotUpdate)
+		return err
+	}
+
+	tag := &entity.Tag{}
+	_ = copier.Copy(tag, req)
+	tag.ID = req.TagID
+	err = ts.tagRepo.UpdateTag(ctx, tag)
+	if err != nil {
+		return err
+	}
+
+	tagInfo, exist, err := ts.GetTagByID(ctx, req.TagID)
+	if err != nil {
+		return err
+	}
+	if !exist {
+		return errors.BadRequest(reason.TagNotFound)
+	}
+	if tagInfo.MainTagID == 0 && len(req.SlugName) > 0 {
+		log.Debugf("tag %s update slug_name", tagInfo.SlugName)
+		tagList, err := ts.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
+		if err != nil {
+			return err
+		}
+		updateTagSlugNames := make([]string, 0)
+		for _, tag := range tagList {
+			updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
+		}
+		err = ts.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
+		if err != nil {
+			return err
+		}
+	}
+	revisionDTO := &schema.AddRevisionDTO{
+		UserID:   req.UserID,
+		ObjectID: tag.ID,
+		Title:    tag.SlugName,
+		Log:      req.EditSummary,
+	}
+	tagInfoJson, _ := json.Marshal(tagInfo)
+	revisionDTO.Content = string(tagInfoJson)
+	revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
+	if err != nil {
+		return err
+	}
+
+	activity_queue.AddActivity(&schema.ActivityMsg{
+		UserID:           req.UserID,
+		ObjectID:         tag.ID,
+		OriginalObjectID: tag.ID,
+		ActivityTypeKey:  constant.ActTagEdited,
+		RevisionID:       revisionID,
+	})
+	return
+}

From 1e14c9ab5425f57db27dc4f90f710e48f2a8cd2c Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:00:56 +0800
Subject: [PATCH 070/194] update revision tag

---
 internal/schema/tag_schema.go             |  3 +-
 internal/service/tag_common/tag_common.go | 78 +++++++++++++----------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go
index 8e1b6da0..a6147822 100644
--- a/internal/schema/tag_schema.go
+++ b/internal/schema/tag_schema.go
@@ -152,7 +152,8 @@ type UpdateTagReq struct {
 	// edit summary
 	EditSummary string `validate:"omitempty" json:"edit_summary"`
 	// user id
-	UserID string `json:"-"`
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"-"`
 }
 
 func (r *UpdateTagReq) Check() (errFields []*validator.FormErrorField, err error) {
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index e72db785..1d63eb14 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -16,7 +16,6 @@ import (
 	"github.com/answerdev/answer/internal/service/revision_common"
 	"github.com/answerdev/answer/internal/service/siteinfo_common"
 	"github.com/answerdev/answer/pkg/converter"
-	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
 )
@@ -598,6 +597,7 @@ func (ts *TagCommonService) CreateOrUpdateTagRelList(ctx context.Context, object
 }
 
 func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTagReq) (err error) {
+	var canUpdate bool
 	_, existUnreviewed, err := ts.revisionService.ExistUnreviewedByObjectID(ctx, req.TagID)
 	if err != nil {
 		return err
@@ -607,14 +607,6 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 		return err
 	}
 
-	tag := &entity.Tag{}
-	_ = copier.Copy(tag, req)
-	tag.ID = req.TagID
-	err = ts.tagRepo.UpdateTag(ctx, tag)
-	if err != nil {
-		return err
-	}
-
 	tagInfo, exist, err := ts.GetTagByID(ctx, req.TagID)
 	if err != nil {
 		return err
@@ -622,40 +614,60 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 	if !exist {
 		return errors.BadRequest(reason.TagNotFound)
 	}
-	if tagInfo.MainTagID == 0 && len(req.SlugName) > 0 {
-		log.Debugf("tag %s update slug_name", tagInfo.SlugName)
-		tagList, err := ts.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
-		if err != nil {
-			return err
-		}
-		updateTagSlugNames := make([]string, 0)
-		for _, tag := range tagList {
-			updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
-		}
-		err = ts.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
-		if err != nil {
-			return err
-		}
-	}
+
+	tagInfo.SlugName = req.SlugName
+	tagInfo.DisplayName = req.DisplayName
+	tagInfo.OriginalText = req.OriginalText
+	tagInfo.ParsedText = req.ParsedText
+
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   req.UserID,
-		ObjectID: tag.ID,
-		Title:    tag.SlugName,
+		ObjectID: tagInfo.ID,
+		Title:    tagInfo.SlugName,
 		Log:      req.EditSummary,
 	}
+
+	if !req.IsAdmin {
+		revisionDTO.Status = entity.RevisionUnreviewedStatus
+	} else {
+		canUpdate = true
+		err = ts.tagRepo.UpdateTag(ctx, tagInfo)
+		if err != nil {
+			return err
+		}
+		if tagInfo.MainTagID == 0 && len(req.SlugName) > 0 {
+			log.Debugf("tag %s update slug_name", tagInfo.SlugName)
+			tagList, err := ts.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
+			if err != nil {
+				return err
+			}
+			updateTagSlugNames := make([]string, 0)
+			for _, tag := range tagList {
+				updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
+			}
+			err = ts.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
+			if err != nil {
+				return err
+			}
+		}
+		revisionDTO.Status = entity.RevisionReviewPassStatus
+	}
+
 	tagInfoJson, _ := json.Marshal(tagInfo)
 	revisionDTO.Content = string(tagInfoJson)
 	revisionID, err := ts.revisionService.AddRevision(ctx, revisionDTO, true)
 	if err != nil {
 		return err
 	}
+	if canUpdate {
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           req.UserID,
+			ObjectID:         tagInfo.ID,
+			OriginalObjectID: tagInfo.ID,
+			ActivityTypeKey:  constant.ActTagEdited,
+			RevisionID:       revisionID,
+		})
+	}
 
-	activity_queue.AddActivity(&schema.ActivityMsg{
-		UserID:           req.UserID,
-		ObjectID:         tag.ID,
-		OriginalObjectID: tag.ID,
-		ActivityTypeKey:  constant.ActTagEdited,
-		RevisionID:       revisionID,
-	})
 	return
 }

From ff50bc94222fe3025e2695fdb03107efef4d7213 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:08:59 +0800
Subject: [PATCH 071/194] fix is admin

---
 internal/controller/question_controller.go | 10 ++++++----
 internal/service/question_service.go       | 17 +++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index e91c4b20..06c0cdbd 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -241,12 +241,14 @@ func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
 	req.ID = id
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
-		return
+	if !req.IsAdmin {
+		if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
+			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+			return
+		}
 	}
 
-	resp, err := qc.questionService.CheckCanUpdateQuestion(ctx, req)
+	resp, err := qc.questionService.CheckCanUpdate(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{
 		"unreviewed": resp,
 	})
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 9bec3463..526945ba 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -262,14 +262,6 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 	return nil
 }
 
-func (qs *QuestionService) CheckCanUpdateQuestion(ctx context.Context, req *schema.CheckCanQuestionUpdate) (exist bool, err error) {
-	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
-	if err != nil {
-		return false, err
-	}
-	return existUnreviewed, nil
-}
-
 // UpdateQuestion update question
 func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
 	var canUpdateQuestion bool
@@ -837,3 +829,12 @@ func (qs *QuestionService) changeQuestionToRevision(ctx context.Context, questio
 	}
 	return questionRevision, nil
 }
+
+// CheckCanUpdate can check question answer
+func (qs *QuestionService) CheckCanUpdate(ctx context.Context, req *schema.CheckCanQuestionUpdate) (exist bool, err error) {
+	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
+	if err != nil {
+		return false, err
+	}
+	return existUnreviewed, nil
+}

From 59a8b0f3bbec9ca9e89c28de1e2921126511f0fb Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 16:11:43 +0800
Subject: [PATCH 072/194] feat: check rank permission

---
 internal/controller/answer_controller.go    |  8 ++---
 internal/controller/comment_controller.go   |  6 ++--
 internal/controller/question_controller.go  | 19 ++++++-----
 internal/controller/report_controller.go    |  2 +-
 internal/controller/revision_controller.go  |  4 +--
 internal/controller/tag_controller.go       |  6 ++--
 internal/repo/search_common/search_repo.go  | 14 --------
 internal/schema/simple_obj_info_schema.go   | 18 +++++------
 internal/schema/user_schema.go              |  3 +-
 internal/service/comment/comment_service.go |  4 +--
 internal/service/object_info/object_info.go | 36 ++++++++++-----------
 internal/service/rank/rank_service.go       | 23 +++++++++++--
 internal/service/report/report_service.go   |  2 +-
 internal/service/user_common/user.go        | 17 +++++-----
 14 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 6cc3edc2..3124a7bd 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -52,7 +52,7 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerDeleteRank); err != nil || !can {
+	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerDeleteRank, req.ID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -106,7 +106,7 @@ func (ac *AnswerController) Add(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAddRank); err != nil || !can {
+	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAddRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -150,7 +150,7 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerEditRank); err != nil || !can {
+	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerEditRank, req.ID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -221,7 +221,7 @@ func (ac *AnswerController) Adopted(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAcceptRank); err != nil || !can {
+	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAcceptRank, req.QuestionID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go
index aad50ed2..eefdba4c 100644
--- a/internal/controller/comment_controller.go
+++ b/internal/controller/comment_controller.go
@@ -41,7 +41,7 @@ func (cc *CommentController) AddComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentAddRank); err != nil || !can {
+	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentAddRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -67,7 +67,7 @@ func (cc *CommentController) RemoveComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentDeleteRank); err != nil || !can {
+	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentDeleteRank, req.CommentID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -93,7 +93,7 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentEditRank); err != nil || !can {
+	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentEditRank, req.UserID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 06c0cdbd..7e708ba7 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -43,7 +43,7 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionDeleteRank); err != nil || !can {
+	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionDeleteRank, req.ID); err != nil || !can {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -190,7 +190,7 @@ func (qc *QuestionController) AddQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionAddRank); err != nil || !can {
+	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionAddRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -216,7 +216,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
+	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -236,16 +236,15 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 // @Success 200 {object} handler.RespBody
 // @Router /answer/api/v1/question/edit/check [get]
 func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
-	id := ctx.Query("id")
 	req := &schema.CheckCanQuestionUpdate{}
-	req.ID = id
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if !req.IsAdmin {
-		if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank); err != nil || !can {
-			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
-			return
-		}
+	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID); err != nil || !can {
+		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+		return
 	}
 
 	resp, err := qc.questionService.CheckCanUpdate(ctx, req)
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index 1067ee52..fa8b07de 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -40,7 +40,7 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.ReportAddRank); err != nil || !can {
+	if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.ReportAddRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 3d421d20..76ebf3c9 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -70,7 +70,7 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	userinfo := middleware.GetUserInfoFromContext(ctx)
 	if !userinfo.IsAdmin {
 		userID := middleware.GetLoginUserIDFromContext(ctx)
-		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.UnreviewedRevisionListRank); err != nil || !can {
+		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.UnreviewedRevisionListRank, ""); err != nil || !can {
 			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 			return
 		}
@@ -100,7 +100,7 @@ func (rc *RevisionController) RevisionAudit(ctx *gin.Context) {
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	userinfo := middleware.GetUserInfoFromContext(ctx)
 	if !userinfo.IsAdmin {
-		if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.RevisionAuditRank); err != nil || !can {
+		if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.RevisionAuditRank, ""); err != nil || !can {
 			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 			return
 		}
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index f1877db3..59f2ca83 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -63,7 +63,7 @@ func (tc *TagController) RemoveTag(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagDeleteRank); err != nil || !can {
+	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagDeleteRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -88,7 +88,7 @@ func (tc *TagController) UpdateTag(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagEditRank); err != nil || !can {
+	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagEditRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
@@ -190,7 +190,7 @@ func (tc *TagController) UpdateTagSynonym(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagSynonymRank); err != nil || !can {
+	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagSynonymRank, ""); err != nil || !can {
 		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
 		return
 	}
diff --git a/internal/repo/search_common/search_repo.go b/internal/repo/search_common/search_repo.go
index f1061300..aec7dc59 100644
--- a/internal/repo/search_common/search_repo.go
+++ b/internal/repo/search_common/search_repo.go
@@ -471,20 +471,6 @@ func (sr *searchRepo) parseResult(ctx context.Context, res []map[string][]byte)
 	return
 }
 
-// userBasicInfoFormat
-func (sr *searchRepo) userBasicInfoFormat(ctx context.Context, dbinfo *entity.User) *schema.UserBasicInfo {
-	return &schema.UserBasicInfo{
-		ID:          dbinfo.ID,
-		Username:    dbinfo.Username,
-		Rank:        dbinfo.Rank,
-		DisplayName: dbinfo.DisplayName,
-		Avatar:      dbinfo.Avatar,
-		Website:     dbinfo.Website,
-		Location:    dbinfo.Location,
-		IPInfo:      dbinfo.IPInfo,
-	}
-}
-
 func addRelevanceField(searchFields, words, fields []string) (res []string, args []interface{}) {
 	relevanceRes := []string{}
 	args = []interface{}{}
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 678ebb6c..28a7b775 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -2,15 +2,15 @@ package schema
 
 // SimpleObjectInfo simple object info
 type SimpleObjectInfo struct {
-	ObjectID      string `json:"object_id"`
-	ObjectCreator string `json:"object_creator"`
-	QuestionID    string `json:"question_id"`
-	AnswerID      string `json:"answer_id"`
-	CommentID     string `json:"comment_id"`
-	TagID         string `json:"tag_id"`
-	ObjectType    string `json:"object_type"`
-	Title         string `json:"title"`
-	Content       string `json:"content"`
+	ObjectID            string `json:"object_id"`
+	ObjectCreatorUserID string `json:"object_creator_user_id"`
+	QuestionID          string `json:"question_id"`
+	AnswerID            string `json:"answer_id"`
+	CommentID           string `json:"comment_id"`
+	TagID               string `json:"tag_id"`
+	ObjectType          string `json:"object_type"`
+	Title               string `json:"title"`
+	Content             string `json:"content"`
 }
 
 type UnreviewedRevisionInfoInfo struct {
diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go
index fdae241c..dd36f8c2 100644
--- a/internal/schema/user_schema.go
+++ b/internal/schema/user_schema.go
@@ -368,7 +368,8 @@ type ActionRecordResp struct {
 }
 
 type UserBasicInfo struct {
-	ID          string `json:"-" `           // user_id
+	ID          string `json:"-"` // user_id
+	IsAdmin     bool   `json:"-"`
 	Username    string `json:"username" `    // name
 	Rank        int    `json:"rank" `        // rank
 	DisplayName string `json:"display_name"` // display_name
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index b4dd5c8b..de96efd0 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -112,9 +112,9 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 	}
 
 	if objInfo.ObjectType == constant.QuestionObjectType {
-		cs.notificationQuestionComment(ctx, objInfo.ObjectCreator, comment.ID, req.UserID)
+		cs.notificationQuestionComment(ctx, objInfo.ObjectCreatorUserID, comment.ID, req.UserID)
 	} else if objInfo.ObjectType == constant.AnswerObjectType {
-		cs.notificationAnswerComment(ctx, objInfo.ObjectCreator, comment.ID, req.UserID)
+		cs.notificationAnswerComment(ctx, objInfo.ObjectCreatorUserID, comment.ID, req.UserID)
 	}
 	if len(req.MentionUsernameList) > 0 {
 		cs.notificationMention(ctx, req.MentionUsernameList, comment.ID, req.UserID)
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index b6cf3298..52bc4658 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -131,12 +131,12 @@ func (os *ObjService) GetInfo(ctx context.Context, objectID string) (objInfo *sc
 			break
 		}
 		objInfo = &schema.SimpleObjectInfo{
-			ObjectID:      questionInfo.ID,
-			ObjectCreator: questionInfo.UserID,
-			QuestionID:    questionInfo.ID,
-			ObjectType:    objectType,
-			Title:         questionInfo.Title,
-			Content:       questionInfo.ParsedText, // todo trim
+			ObjectID:            questionInfo.ID,
+			ObjectCreatorUserID: questionInfo.UserID,
+			QuestionID:          questionInfo.ID,
+			ObjectType:          objectType,
+			Title:               questionInfo.Title,
+			Content:             questionInfo.ParsedText, // todo trim
 		}
 	case constant.AnswerObjectType:
 		answerInfo, exist, err := os.answerRepo.GetAnswer(ctx, objectID)
@@ -151,13 +151,13 @@ func (os *ObjService) GetInfo(ctx context.Context, objectID string) (objInfo *sc
 			return nil, err
 		}
 		objInfo = &schema.SimpleObjectInfo{
-			ObjectID:      answerInfo.ID,
-			ObjectCreator: answerInfo.UserID,
-			QuestionID:    answerInfo.QuestionID,
-			AnswerID:      answerInfo.ID,
-			ObjectType:    objectType,
-			Title:         questionInfo.Title,    // this should be question title
-			Content:       answerInfo.ParsedText, // todo trim
+			ObjectID:            answerInfo.ID,
+			ObjectCreatorUserID: answerInfo.UserID,
+			QuestionID:          answerInfo.QuestionID,
+			AnswerID:            answerInfo.ID,
+			ObjectType:          objectType,
+			Title:               questionInfo.Title,    // this should be question title
+			Content:             answerInfo.ParsedText, // todo trim
 		}
 	case constant.CommentObjectType:
 		commentInfo, exist, err := os.commentRepo.GetComment(ctx, objectID)
@@ -168,11 +168,11 @@ func (os *ObjService) GetInfo(ctx context.Context, objectID string) (objInfo *sc
 			break
 		}
 		objInfo = &schema.SimpleObjectInfo{
-			ObjectID:      commentInfo.ID,
-			ObjectCreator: commentInfo.UserID,
-			ObjectType:    objectType,
-			Content:       commentInfo.ParsedText, // todo trim
-			CommentID:     commentInfo.ID,
+			ObjectID:            commentInfo.ID,
+			ObjectCreatorUserID: commentInfo.UserID,
+			ObjectType:          objectType,
+			Content:             commentInfo.ParsedText, // todo trim
+			CommentID:           commentInfo.ID,
 		}
 		if len(commentInfo.QuestionID) > 0 {
 			questionInfo, exist, err := os.questionRepo.GetQuestion(ctx, commentInfo.QuestionID)
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 138d9eae..10e18ea9 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -3,6 +3,7 @@ package rank
 import (
 	"context"
 
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/pager"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
@@ -70,7 +71,8 @@ func NewRankService(
 }
 
 // CheckRankPermission check whether the user reputation meets the permission
-func (rs *RankService) CheckRankPermission(ctx context.Context, userID string, action string) (can bool, err error) {
+func (rs *RankService) CheckRankPermission(ctx context.Context, userID string, action string, objectID string) (
+	can bool, err error) {
 	if len(userID) == 0 {
 		return false, nil
 	}
@@ -83,14 +85,29 @@ func (rs *RankService) CheckRankPermission(ctx context.Context, userID string, a
 	if !exist {
 		return false, nil
 	}
-	currentUserRank := userInfo.Rank
+	// administrator have all permissions
+	if userInfo.IsAdmin {
+		return true, nil
+	}
+
+	if len(objectID) > 0 {
+		objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
+		if err != nil {
+			return false, err
+		}
+		// if the user is this object creator, the user can operate this object.
+		// but if this object is tag, only users who have reached the rank level can operate.
+		if objectInfo.ObjectCreatorUserID == userID && objectInfo.ObjectType != constant.TagObjectType {
+			return true, nil
+		}
+	}
 
 	// get the amount of rank required for the current operation
 	requireRank, err := rs.configRepo.GetInt(action)
 	if err != nil {
 		return false, err
 	}
-
+	currentUserRank := userInfo.Rank
 	if currentUserRank < requireRank {
 		log.Debugf("user %s want to do action %s, but rank %d < %d",
 			userInfo.DisplayName, action, currentUserRank, requireRank)
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 251c3239..112996bf 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -47,7 +47,7 @@ func (rs *ReportService) AddReport(ctx context.Context, req *schema.AddReportReq
 
 	report := &entity.Report{
 		UserID:         req.UserID,
-		ReportedUserID: objInfo.ObjectCreator,
+		ReportedUserID: objInfo.ObjectCreatorUserID,
 		ObjectID:       req.ObjectID,
 		ObjectType:     objectTypeNumber,
 		ReportType:     req.ReportType,
diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go
index 92140250..281a74a9 100644
--- a/internal/service/user_common/user.go
+++ b/internal/service/user_common/user.go
@@ -36,12 +36,13 @@ func NewUserCommon(userRepo UserRepo) *UserCommon {
 	}
 }
 
-func (us *UserCommon) GetUserBasicInfoByID(ctx context.Context, ID string) (*schema.UserBasicInfo, bool, error) {
+func (us *UserCommon) GetUserBasicInfoByID(ctx context.Context, ID string) (
+	userBasicInfo *schema.UserBasicInfo, exist bool, err error) {
 	userInfo, exist, err := us.userRepo.GetByUserID(ctx, ID)
 	if err != nil {
 		return nil, exist, err
 	}
-	info := us.UserBasicInfoFormat(ctx, userInfo)
+	info := us.FormatUserBasicInfo(ctx, userInfo)
 	return info, exist, nil
 }
 
@@ -50,7 +51,7 @@ func (us *UserCommon) GetUserBasicInfoByUserName(ctx context.Context, username s
 	if err != nil {
 		return nil, exist, err
 	}
-	info := us.UserBasicInfoFormat(ctx, userInfo)
+	info := us.FormatUserBasicInfo(ctx, userInfo)
 	return info, exist, nil
 }
 
@@ -69,21 +70,21 @@ func (us *UserCommon) BatchUserBasicInfoByID(ctx context.Context, IDs []string)
 		return userMap, err
 	}
 	for _, item := range dbInfo {
-		info := us.UserBasicInfoFormat(ctx, item)
+		info := us.FormatUserBasicInfo(ctx, item)
 		userMap[item.ID] = info
 	}
 	return userMap, nil
 }
 
-// UserBasicInfoFormat
-func (us *UserCommon) UserBasicInfoFormat(ctx context.Context, userInfo *entity.User) *schema.UserBasicInfo {
+// FormatUserBasicInfo format user basic info
+func (us *UserCommon) FormatUserBasicInfo(ctx context.Context, userInfo *entity.User) *schema.UserBasicInfo {
 	userBasicInfo := &schema.UserBasicInfo{}
-	Avatar := schema.FormatAvatarInfo(userInfo.Avatar)
 	userBasicInfo.ID = userInfo.ID
+	userBasicInfo.IsAdmin = userInfo.IsAdmin
 	userBasicInfo.Username = userInfo.Username
 	userBasicInfo.Rank = userInfo.Rank
 	userBasicInfo.DisplayName = userInfo.DisplayName
-	userBasicInfo.Avatar = Avatar
+	userBasicInfo.Avatar = schema.FormatAvatarInfo(userInfo.Avatar)
 	userBasicInfo.Website = userInfo.Website
 	userBasicInfo.Location = userInfo.Location
 	userBasicInfo.IPInfo = userInfo.IPInfo

From 9fb1d82a5b269ae1fa9cd44e0b09fa30f33326d9 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:12:48 +0800
Subject: [PATCH 073/194] fix router

---
 internal/controller/question_controller.go | 2 +-
 internal/router/answer_api_router.go       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 7e708ba7..1ea03644 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -234,7 +234,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 // @Security ApiKeyAuth
 // @Param id query string true "id"  default(string)
 // @Success 200 {object} handler.RespBody
-// @Router /answer/api/v1/question/edit/check [get]
+// @Router /answer/api/v1/revisions/edit/check [get]
 func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
 	req := &schema.CheckCanQuestionUpdate{}
 	if handler.BindAndCheck(ctx, req) {
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 80525787..c45aa659 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -147,6 +147,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	//revisions
 	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
 	r.PUT("/revisions/audit", a.revisionController.RevisionAudit)
+	r.GET("/revisions/edit/check", a.questionController.CheckCanUpdateQuestion)
 
 	// comment
 	r.POST("/comment", a.commentController.AddComment)
@@ -177,7 +178,6 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	// question
 	r.POST("/question", a.questionController.AddQuestion)
 	r.PUT("/question", a.questionController.UpdateQuestion)
-	r.GET("/question/edit/check", a.questionController.CheckCanUpdateQuestion)
 	r.DELETE("/question", a.questionController.RemoveQuestion)
 	r.PUT("/question/status", a.questionController.CloseQuestion)
 	r.GET("/question/similar", a.questionController.SearchByTitleLike)

From 45bf3e4a459d83d93b2b41c05aad28cbe44b5888 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:16:39 +0800
Subject: [PATCH 074/194] swagger

---
 docs/docs.go                               | 76 +++++++++++-----------
 docs/swagger.json                          | 76 +++++++++++-----------
 docs/swagger.yaml                          | 48 +++++++-------
 internal/controller/question_controller.go |  2 +-
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index c5da1549..936f0c5c 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -2575,44 +2575,6 @@ const docTemplate = `{
                 }
             }
         },
-        "/answer/api/v1/question/edit/check": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "check can update question",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "api-question"
-                ],
-                "summary": "check can update question",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "default": "string",
-                        "description": "id",
-                        "name": "id",
-                        "in": "query",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
         "/answer/api/v1/question/info": {
             "get": {
                 "security": [
@@ -3105,6 +3067,44 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/revisions/edit/check": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "check can update question",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "check can update question",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "default": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions/unreviewed": {
             "get": {
                 "security": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 9fc0b02c..c0182ab4 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -2563,44 +2563,6 @@
                 }
             }
         },
-        "/answer/api/v1/question/edit/check": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "check can update question",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "api-question"
-                ],
-                "summary": "check can update question",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "default": "string",
-                        "description": "id",
-                        "name": "id",
-                        "in": "query",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
         "/answer/api/v1/question/info": {
             "get": {
                 "security": [
@@ -3093,6 +3055,44 @@
                 }
             }
         },
+        "/answer/api/v1/revisions/edit/check": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "check can update question",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "check can update question",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "default": "string",
+                        "description": "id",
+                        "name": "id",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions/unreviewed": {
             "get": {
                 "security": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 51439b21..842c9b4f 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3197,30 +3197,6 @@ paths:
       summary: close question msg list
       tags:
       - api-question
-  /answer/api/v1/question/edit/check:
-    get:
-      consumes:
-      - application/json
-      description: check can update question
-      parameters:
-      - default: string
-        description: id
-        in: query
-        name: id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.RespBody'
-      security:
-      - ApiKeyAuth: []
-      summary: check can update question
-      tags:
-      - api-question
   /answer/api/v1/question/info:
     get:
       consumes:
@@ -3528,6 +3504,30 @@ paths:
       summary: revision audit
       tags:
       - Revision
+  /answer/api/v1/revisions/edit/check:
+    get:
+      consumes:
+      - application/json
+      description: check can update question
+      parameters:
+      - default: string
+        description: id
+        in: query
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RespBody'
+      security:
+      - ApiKeyAuth: []
+      summary: check can update question
+      tags:
+      - Revision
   /answer/api/v1/revisions/unreviewed:
     get:
       description: get unreviewed revision list
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 1ea03644..863a5b2e 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -228,7 +228,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 // CheckCanUpdateQuestion check can update question
 // @Summary check can update question
 // @Description check can update question
-// @Tags api-question
+// @Tags Revision
 // @Accept json
 // @Produce json
 // @Security ApiKeyAuth

From 81ec786366c68c87b1c60cb292d37ce4699d59f0 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 24 Nov 2022 17:33:48 +0800
Subject: [PATCH 075/194] fix: timeline content add monospace text style

---
 ui/src/components/DiffContent/index.tsx | 2 +-
 ui/src/index.scss                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 432fbc9e..77386664 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -89,7 +89,7 @@ const Index: FC<Props> = ({ objectType, newData, oldData, className = '' }) => {
         dangerouslySetInnerHTML={{
           __html: diffText(newData.original_text, oldData?.original_text),
         }}
-        className="pre-line"
+        className="pre-line text-break font-monospace"
       />
     </div>
   );
diff --git a/ui/src/index.scss b/ui/src/index.scss
index fd0d5e46..20e96e07 100644
--- a/ui/src/index.scss
+++ b/ui/src/index.scss
@@ -281,5 +281,5 @@ a {
 }
 
 .pre-line {
-  white-space: pre-line;
+  white-space: pre-wrap;
 }

From a376489b49b9abcd606c600742ecc2c1bfe3d1b3 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 17:47:54 +0800
Subject: [PATCH 076/194] update revision service

---
 internal/service/revision_service.go | 261 ++++++++++++++-------------
 1 file changed, 139 insertions(+), 122 deletions(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 9a797954..a5c8917a 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -62,6 +62,7 @@ func NewRevisionService(
 		tagCommon:         tagCommon,
 	}
 }
+
 func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.RevisionAuditReq) (err error) {
 	revisioninfo, exist, err := rs.revisionRepo.GetRevisionByID(ctx, req.ID)
 	if err != nil {
@@ -85,133 +86,18 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		revisionitem := &schema.GetRevisionResp{}
 		_ = copier.Copy(revisionitem, revisioninfo)
 		rs.parseItem(ctx, revisionitem)
+		var saveErr error
 		switch objectType {
 		case constant.QuestionObjectType:
-			questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfo)
-			if ok {
-				now := time.Now()
-				question := &entity.Question{}
-				question.ID = questioninfo.ID
-				question.Title = questioninfo.Title
-				question.OriginalText = questioninfo.Content
-				question.ParsedText = questioninfo.HTML
-				question.UpdatedAt = now
-				saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
-				if saveerr != nil {
-					return saveerr
-				}
-				objectTagTags := make([]*schema.TagItem, 0)
-				for _, tag := range questioninfo.Tags {
-					item := &schema.TagItem{}
-					item.SlugName = tag.SlugName
-					objectTagTags = append(objectTagTags, item)
-				}
-				objectTagData := schema.TagChange{}
-				objectTagData.ObjectID = question.ID
-				objectTagData.Tags = objectTagTags
-				saveerr = rs.tagCommon.ObjectChangeTag(ctx, &objectTagData)
-				if saveerr != nil {
-					return saveerr
-				}
-				activity_queue.AddActivity(&schema.ActivityMsg{
-					UserID:           revisioninfo.UserID,
-					ObjectID:         revisioninfo.ObjectID,
-					ActivityTypeKey:  constant.ActQuestionEdited,
-					RevisionID:       revisioninfo.ID,
-					OriginalObjectID: revisioninfo.ObjectID,
-				})
-			}
-			//
+			saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
 		case constant.AnswerObjectType:
-			answerinfo, ok := revisionitem.ContentParsed.(*schema.AnswerInfo)
-			if ok {
-				now := time.Now()
-				insertData := new(entity.Answer)
-				insertData.ID = answerinfo.ID
-				insertData.OriginalText = answerinfo.Content
-				insertData.ParsedText = answerinfo.HTML
-				insertData.UpdatedAt = now
-				saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"})
-				if saveerr != nil {
-					return saveerr
-				}
-				saveerr = rs.questionCommon.UpdataPostTime(ctx, answerinfo.QuestionID)
-				if saveerr != nil {
-					return saveerr
-				}
-				questionInfo, exist, err := rs.questionRepo.GetQuestion(ctx, answerinfo.QuestionID)
-				if err != nil {
-					return err
-				}
-				if !exist {
-					return errors.BadRequest(reason.QuestionNotFound)
-				}
-				msg := &schema.NotificationMsg{
-					TriggerUserID:  revisioninfo.UserID,
-					ReceiverUserID: questionInfo.UserID,
-					Type:           schema.NotificationTypeInbox,
-					ObjectID:       answerinfo.ID,
-				}
-				msg.ObjectType = constant.AnswerObjectType
-				msg.NotificationAction = constant.UpdateAnswer
-				notice_queue.AddNotification(msg)
-
-				activity_queue.AddActivity(&schema.ActivityMsg{
-					UserID:           revisioninfo.UserID,
-					ObjectID:         insertData.ID,
-					OriginalObjectID: insertData.ID,
-					ActivityTypeKey:  constant.ActAnswerEdited,
-					RevisionID:       revisioninfo.ID,
-				})
-			}
-
+			saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
 		case constant.TagObjectType:
-			taginfo, ok := revisionitem.ContentParsed.(*schema.GetTagResp)
-			if ok {
-				tag := &entity.Tag{}
-				tag.ID = taginfo.TagID
-				tag.DisplayName = taginfo.DisplayName
-				tag.SlugName = taginfo.SlugName
-				tag.OriginalText = taginfo.OriginalText
-				tag.ParsedText = taginfo.ParsedText
-				saveerr := rs.tagRepo.UpdateTag(ctx, tag)
-				if saveerr != nil {
-					return saveerr
-				}
-
-				tagInfo, exist, err := rs.tagCommon.GetTagByID(ctx, taginfo.TagID)
-				if err != nil {
-					return err
-				}
-				if !exist {
-					return errors.BadRequest(reason.TagNotFound)
-				}
-				if tagInfo.MainTagID == 0 && len(tagInfo.SlugName) > 0 {
-					log.Debugf("tag %s update slug_name", tagInfo.SlugName)
-					tagList, err := rs.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
-					if err != nil {
-						return err
-					}
-					updateTagSlugNames := make([]string, 0)
-					for _, tag := range tagList {
-						updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
-					}
-					err = rs.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
-					if err != nil {
-						return err
-					}
-				}
-
-				activity_queue.AddActivity(&schema.ActivityMsg{
-					UserID:           revisioninfo.UserID,
-					ObjectID:         taginfo.TagID,
-					OriginalObjectID: taginfo.TagID,
-					ActivityTypeKey:  constant.ActTagEdited,
-					RevisionID:       revisioninfo.ID,
-				})
-			}
+			saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
+		}
+		if saveErr != nil {
+			return saveErr
 		}
-
 		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus)
 		return
 	}
@@ -219,6 +105,137 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 	return nil
 }
 
+func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
+	questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfo)
+	if ok {
+		now := time.Now()
+		question := &entity.Question{}
+		question.ID = questioninfo.ID
+		question.Title = questioninfo.Title
+		question.OriginalText = questioninfo.Content
+		question.ParsedText = questioninfo.HTML
+		question.UpdatedAt = now
+		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
+		if saveerr != nil {
+			return saveerr
+		}
+		objectTagTags := make([]*schema.TagItem, 0)
+		for _, tag := range questioninfo.Tags {
+			item := &schema.TagItem{}
+			item.SlugName = tag.SlugName
+			objectTagTags = append(objectTagTags, item)
+		}
+		objectTagData := schema.TagChange{}
+		objectTagData.ObjectID = question.ID
+		objectTagData.Tags = objectTagTags
+		saveerr = rs.tagCommon.ObjectChangeTag(ctx, &objectTagData)
+		if saveerr != nil {
+			return saveerr
+		}
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           revisionitem.UserID,
+			ObjectID:         revisionitem.ObjectID,
+			ActivityTypeKey:  constant.ActQuestionEdited,
+			RevisionID:       revisionitem.ID,
+			OriginalObjectID: revisionitem.ObjectID,
+		})
+	}
+	return nil
+}
+
+func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
+	answerinfo, ok := revisionitem.ContentParsed.(*schema.AnswerInfo)
+	if ok {
+		now := time.Now()
+		insertData := new(entity.Answer)
+		insertData.ID = answerinfo.ID
+		insertData.OriginalText = answerinfo.Content
+		insertData.ParsedText = answerinfo.HTML
+		insertData.UpdatedAt = now
+		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"})
+		if saveerr != nil {
+			return saveerr
+		}
+		saveerr = rs.questionCommon.UpdataPostTime(ctx, answerinfo.QuestionID)
+		if saveerr != nil {
+			return saveerr
+		}
+		questionInfo, exist, err := rs.questionRepo.GetQuestion(ctx, answerinfo.QuestionID)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.BadRequest(reason.QuestionNotFound)
+		}
+		msg := &schema.NotificationMsg{
+			TriggerUserID:  revisionitem.UserID,
+			ReceiverUserID: questionInfo.UserID,
+			Type:           schema.NotificationTypeInbox,
+			ObjectID:       answerinfo.ID,
+		}
+		msg.ObjectType = constant.AnswerObjectType
+		msg.NotificationAction = constant.UpdateAnswer
+		notice_queue.AddNotification(msg)
+
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           revisionitem.UserID,
+			ObjectID:         insertData.ID,
+			OriginalObjectID: insertData.ID,
+			ActivityTypeKey:  constant.ActAnswerEdited,
+			RevisionID:       revisionitem.ID,
+		})
+	}
+	return nil
+}
+
+func (rs *RevisionService) revisionAuditTag(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
+	taginfo, ok := revisionitem.ContentParsed.(*schema.GetTagResp)
+	if ok {
+		tag := &entity.Tag{}
+		tag.ID = taginfo.TagID
+		tag.DisplayName = taginfo.DisplayName
+		tag.SlugName = taginfo.SlugName
+		tag.OriginalText = taginfo.OriginalText
+		tag.ParsedText = taginfo.ParsedText
+		saveerr := rs.tagRepo.UpdateTag(ctx, tag)
+		if saveerr != nil {
+			return saveerr
+		}
+
+		tagInfo, exist, err := rs.tagCommon.GetTagByID(ctx, taginfo.TagID)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.BadRequest(reason.TagNotFound)
+		}
+		if tagInfo.MainTagID == 0 && len(tagInfo.SlugName) > 0 {
+			log.Debugf("tag %s update slug_name", tagInfo.SlugName)
+			tagList, err := rs.tagRepo.GetTagList(ctx, &entity.Tag{MainTagID: converter.StringToInt64(tagInfo.ID)})
+			if err != nil {
+				return err
+			}
+			updateTagSlugNames := make([]string, 0)
+			for _, tag := range tagList {
+				updateTagSlugNames = append(updateTagSlugNames, tag.SlugName)
+			}
+			err = rs.tagRepo.UpdateTagSynonym(ctx, updateTagSlugNames, converter.StringToInt64(tagInfo.ID), tagInfo.MainTagSlugName)
+			if err != nil {
+				return err
+			}
+		}
+
+		activity_queue.AddActivity(&schema.ActivityMsg{
+			UserID:           revisionitem.UserID,
+			ObjectID:         taginfo.TagID,
+			OriginalObjectID: taginfo.TagID,
+			ActivityTypeKey:  constant.ActTagEdited,
+			RevisionID:       revisionitem.ID,
+		})
+	}
+	return nil
+}
+
 // SearchUnreviewedList get unreviewed list
 func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []*schema.GetUnreviewedRevisionResp, count int64, err error) {
 	resp = []*schema.GetUnreviewedRevisionResp{}

From 00a0c160b3f912f0f3eb91b4821201c038f431ee Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 17:52:21 +0800
Subject: [PATCH 077/194] fix revision service

---
 internal/service/revision_service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index a5c8917a..9272641f 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -93,7 +93,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		case constant.AnswerObjectType:
 			saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
 		case constant.TagObjectType:
-			saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
+			saveErr = rs.revisionAuditTag(ctx, revisionitem)
 		}
 		if saveErr != nil {
 			return saveErr

From cacb9783b861510662fa2aa0603c9d5605c87102 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 17:58:22 +0800
Subject: [PATCH 078/194] fix

---
 internal/schema/question_schema.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index b6b5d0c0..8efb61b9 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -36,7 +36,7 @@ type QuestionAdd struct {
 
 type CheckCanQuestionUpdate struct {
 	// question id
-	ID string `validate:"required" json:"id"`
+	ID string `validate:"required" form:"id"`
 	// user id
 	UserID  string `json:"-"`
 	IsAdmin bool   `json:"-"`

From bb5594722fd9c32feaca37bf9a8abee759bd0aef Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 24 Nov 2022 18:00:30 +0800
Subject: [PATCH 079/194] feat: check user operation need review

---
 internal/controller/answer_controller.go   |  46 +++++++--
 internal/controller/comment_controller.go  |  31 ++++--
 internal/controller/question_controller.go |  42 ++++++--
 internal/controller/report_controller.go   |  11 +-
 internal/controller/revision_controller.go |  42 ++++----
 internal/controller/tag_controller.go      |  37 +++++--
 internal/schema/answer_schema.go           |  17 +--
 internal/schema/question_schema.go         |   5 +-
 internal/schema/revision_schema.go         |   3 +-
 internal/schema/tag_schema.go              |   5 +-
 internal/service/rank/rank_service.go      | 114 +++++++++++++++------
 internal/service/tag_common/tag_common.go  |   6 +-
 12 files changed, 253 insertions(+), 106 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 3124a7bd..daae2ebd 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -52,12 +52,17 @@ func (ac *AnswerController) RemoveAnswer(ctx *gin.Context) {
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerDeleteRank, req.ID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := ac.rankService.CheckOperationPermission(ctx, req.UserID, rank.AnswerDeleteRank, req.ID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := ac.answerService.RemoveAnswer(ctx, req)
+	err = ac.answerService.RemoveAnswer(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
@@ -106,8 +111,13 @@ func (ac *AnswerController) Add(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAddRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := ac.rankService.CheckOperationPermission(ctx, req.UserID, rank.AnswerAddRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
@@ -150,12 +160,21 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerEditRank, req.ID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.AnswerEditRank,
+		rank.AnswerEditWithoutReviewRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
 		return
 	}
+	if !canList[0] {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+	req.NoNeedReview = canList[1]
 
-	_, err := ac.answerService.Update(ctx, req)
+	_, err = ac.answerService.Update(ctx, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
@@ -221,12 +240,17 @@ func (ac *AnswerController) Adopted(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := ac.rankService.CheckRankPermission(ctx, req.UserID, rank.AnswerAcceptRank, req.QuestionID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := ac.rankService.CheckOperationPermission(ctx, req.UserID, rank.AnswerAcceptRank, req.QuestionID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := ac.answerService.UpdateAdopted(ctx, req)
+	err = ac.answerService.UpdateAdopted(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go
index eefdba4c..29ab36a1 100644
--- a/internal/controller/comment_controller.go
+++ b/internal/controller/comment_controller.go
@@ -41,8 +41,13 @@ func (cc *CommentController) AddComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentAddRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentAddRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
@@ -67,12 +72,17 @@ func (cc *CommentController) RemoveComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentDeleteRank, req.CommentID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentDeleteRank, req.CommentID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := cc.commentService.RemoveComment(ctx, req)
+	err = cc.commentService.RemoveComment(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
@@ -93,12 +103,17 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := cc.rankService.CheckRankPermission(ctx, req.UserID, rank.CommentEditRank, req.UserID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentEditRank, req.UserID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := cc.commentService.UpdateComment(ctx, req)
+	err = cc.commentService.UpdateComment(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 863a5b2e..88da05a5 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -43,12 +43,17 @@ func (qc *QuestionController) RemoveQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionDeleteRank, req.ID); err != nil || !can {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, rank.QuestionDeleteRank, req.ID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := qc.questionService.RemoveQuestion(ctx, req)
+	err = qc.questionService.RemoveQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
@@ -190,8 +195,13 @@ func (qc *QuestionController) AddQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionAddRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, rank.QuestionAddRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
@@ -216,10 +226,19 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	canList, err := qc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionEditRank,
+		rank.QuestionEditWithoutReviewRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
 		return
 	}
+	if !canList[0] {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+	req.NoNeedReview = canList[1]
 
 	resp, err := qc.questionService.UpdateQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
@@ -242,8 +261,13 @@ func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	if can, err := qc.rankService.CheckRankPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index fa8b07de..6e7141ec 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -40,12 +40,17 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.ReportAddRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, rank.ReportAddRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := rc.reportService.AddReport(ctx, req)
+	err = rc.reportService.AddReport(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 76ebf3c9..d9f80939 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -7,7 +7,6 @@ import (
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
 	"github.com/answerdev/answer/internal/service/rank"
-	"github.com/answerdev/answer/pkg/converter"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
 )
@@ -62,18 +61,21 @@ func (rc *RevisionController) GetRevisionList(ctx *gin.Context) {
 // @Success 200 {object} handler.RespBody{data=[]schema.GetRevisionResp}
 // @Router /answer/api/v1/revisions/unreviewed [get]
 func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
-	pageStr := ctx.Query("page")
-	page := converter.StringToInt(pageStr)
-	req := &schema.RevisionSearch{
-		Page: page,
+	req := &schema.RevisionSearch{}
+	if handler.BindAndCheck(ctx, req) {
+		return
 	}
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	if !userinfo.IsAdmin {
-		userID := middleware.GetLoginUserIDFromContext(ctx)
-		if can, err := rc.rankService.CheckRankPermission(ctx, userID, rank.UnreviewedRevisionListRank, ""); err != nil || !can {
-			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
-			return
-		}
+
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+
+	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, rank.UnreviewedRevisionListRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
 	}
 
 	resp, count, err := rc.revisionListService.GetUnreviewedRevisionList(ctx, req)
@@ -98,14 +100,16 @@ func (rc *RevisionController) RevisionAudit(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	userinfo := middleware.GetUserInfoFromContext(ctx)
-	if !userinfo.IsAdmin {
-		if can, err := rc.rankService.CheckRankPermission(ctx, req.UserID, rank.RevisionAuditRank, ""); err != nil || !can {
-			handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
-			return
-		}
+	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, rank.RevisionAuditRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
 	}
 
-	err := rc.revisionListService.RevisionAudit(ctx, req)
+	err = rc.revisionListService.RevisionAudit(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{})
 }
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index 59f2ca83..41ad52ab 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -63,12 +63,17 @@ func (tc *TagController) RemoveTag(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagDeleteRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := tc.rankService.CheckOperationPermission(ctx, req.UserID, rank.TagDeleteRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := tc.tagService.RemoveTag(ctx, req.TagID)
+	err = tc.tagService.RemoveTag(ctx, req.TagID)
 	handler.HandleResponse(ctx, err, nil)
 }
 
@@ -88,12 +93,21 @@ func (tc *TagController) UpdateTag(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagEditRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	canList, err := tc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.TagEditRank,
+		rank.TagEditWithoutReviewRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
 		return
 	}
+	if !canList[0] {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+	req.NoNeedReview = canList[1]
 
-	err := tc.tagService.UpdateTag(ctx, req)
+	err = tc.tagService.UpdateTag(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 
@@ -190,11 +204,16 @@ func (tc *TagController) UpdateTagSynonym(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	if can, err := tc.rankService.CheckRankPermission(ctx, req.UserID, rank.TagSynonymRank, ""); err != nil || !can {
-		handler.HandleResponse(ctx, err, errors.Forbidden(reason.RankFailToMeetTheCondition))
+	can, err := tc.rankService.CheckOperationPermission(ctx, req.UserID, rank.TagSynonymRank, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
 
-	err := tc.tagService.UpdateTagSynonym(ctx, req)
+	err = tc.tagService.UpdateTagSynonym(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index fb523164..3384c8da 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -22,14 +22,15 @@ type AnswerAddReq struct {
 }
 
 type AnswerUpdateReq struct {
-	ID          string `json:"id"`                                // id
-	QuestionID  string `json:"question_id" `                      // question_id
-	UserID      string `json:"-" `                                // user_id
-	Title       string `json:"title" `                            // title
-	Content     string `json:"content"`                           // content
-	HTML        string `json:"html" `                             // html
-	EditSummary string `validate:"omitempty" json:"edit_summary"` // edit_summary
-	IsAdmin     bool   `json:"-"`
+	ID           string `json:"id"`                                // id
+	QuestionID   string `json:"question_id" `                      // question_id
+	UserID       string `json:"-" `                                // user_id
+	Title        string `json:"title" `                            // title
+	Content      string `json:"content"`                           // content
+	HTML         string `json:"html" `                             // html
+	EditSummary  string `validate:"omitempty" json:"edit_summary"` // edit_summary
+	IsAdmin      bool   `json:"-"`
+	NoNeedReview bool   `json:"-"`
 }
 
 type AnswerList struct {
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 8efb61b9..750af485 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -56,8 +56,9 @@ type QuestionUpdate struct {
 	// edit summary
 	EditSummary string `validate:"omitempty" json:"edit_summary"`
 	// user id
-	UserID  string `json:"-"`
-	IsAdmin bool   `json:"-"`
+	UserID       string `json:"-"`
+	IsAdmin      bool   `json:"-"`
+	NoNeedReview bool   `json:"-"`
 }
 
 type QuestionBaseInfo struct {
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 234c4ce5..3d05f7e1 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -38,7 +38,8 @@ type RevisionAuditReq struct {
 }
 
 type RevisionSearch struct {
-	Page int `json:"page" form:"page"` // Query number of pages
+	Page   int    `json:"page" form:"page"` // Query number of pages
+	UserID string `json:"-"`
 }
 
 type GetUnreviewedRevisionResp struct {
diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go
index a6147822..16dcdaea 100644
--- a/internal/schema/tag_schema.go
+++ b/internal/schema/tag_schema.go
@@ -152,8 +152,9 @@ type UpdateTagReq struct {
 	// edit summary
 	EditSummary string `validate:"omitempty" json:"edit_summary"`
 	// user id
-	UserID  string `json:"-"`
-	IsAdmin bool   `json:"-"`
+	UserID       string `json:"-"`
+	IsAdmin      bool   `json:"-"`
+	NoNeedReview bool   `json:"-"`
 }
 
 func (r *UpdateTagReq) Check() (errFields []*validator.FormErrorField, err error) {
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 10e18ea9..3cc7fded 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -3,7 +3,6 @@ package rank
 import (
 	"context"
 
-	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/pager"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
@@ -18,29 +17,32 @@ import (
 )
 
 const (
-	QuestionAddRank            = "rank.question.add"
-	QuestionEditRank           = "rank.question.edit"
-	QuestionDeleteRank         = "rank.question.delete"
-	QuestionVoteUpRank         = "rank.question.vote_up"
-	QuestionVoteDownRank       = "rank.question.vote_down"
-	AnswerAddRank              = "rank.answer.add"
-	AnswerEditRank             = "rank.answer.edit"
-	AnswerDeleteRank           = "rank.answer.delete"
-	AnswerAcceptRank           = "rank.answer.accept"
-	AnswerVoteUpRank           = "rank.answer.vote_up"
-	AnswerVoteDownRank         = "rank.answer.vote_down"
-	CommentAddRank             = "rank.comment.add"
-	CommentEditRank            = "rank.comment.edit"
-	CommentDeleteRank          = "rank.comment.delete"
-	ReportAddRank              = "rank.report.add"
-	TagAddRank                 = "rank.tag.add"
-	TagEditRank                = "rank.tag.edit"
-	TagDeleteRank              = "rank.tag.delete"
-	TagSynonymRank             = "rank.tag.synonym"
-	LinkUrlLimitRank           = "rank.link.url_limit"
-	VoteDetailRank             = "rank.vote.detail"
-	RevisionAuditRank          = "rank.revision.audit"
-	UnreviewedRevisionListRank = "rank.revision.unreviewed_list"
+	QuestionAddRank               = "rank.question.add"
+	QuestionEditRank              = "rank.question.edit"
+	QuestionEditWithoutReviewRank = "rank.question.edit_without_review"
+	QuestionDeleteRank            = "rank.question.delete"
+	QuestionVoteUpRank            = "rank.question.vote_up"
+	QuestionVoteDownRank          = "rank.question.vote_down"
+	AnswerAddRank                 = "rank.answer.add"
+	AnswerEditRank                = "rank.answer.edit"
+	AnswerEditWithoutReviewRank   = "rank.answer.edit_without_review"
+	AnswerDeleteRank              = "rank.answer.delete"
+	AnswerAcceptRank              = "rank.answer.accept"
+	AnswerVoteUpRank              = "rank.answer.vote_up"
+	AnswerVoteDownRank            = "rank.answer.vote_down"
+	CommentAddRank                = "rank.comment.add"
+	CommentEditRank               = "rank.comment.edit"
+	CommentDeleteRank             = "rank.comment.delete"
+	ReportAddRank                 = "rank.report.add"
+	TagAddRank                    = "rank.tag.add"
+	TagEditRank                   = "rank.tag.edit"
+	TagEditWithoutReviewRank      = "rank.tag.edit_without_review"
+	TagDeleteRank                 = "rank.tag.delete"
+	TagSynonymRank                = "rank.tag.synonym"
+	LinkUrlLimitRank              = "rank.link.url_limit"
+	VoteDetailRank                = "rank.vote.detail"
+	RevisionAuditRank             = "rank.revision.audit"
+	UnreviewedRevisionListRank    = "rank.revision.unreviewed_list"
 )
 
 type UserRankRepo interface {
@@ -70,8 +72,8 @@ func NewRankService(
 	}
 }
 
-// CheckRankPermission check whether the user reputation meets the permission
-func (rs *RankService) CheckRankPermission(ctx context.Context, userID string, action string, objectID string) (
+// CheckOperationPermission verify that the user has operation
+func (rs *RankService) CheckOperationPermission(ctx context.Context, userID string, action string, objectID string) (
 	can bool, err error) {
 	if len(userID) == 0 {
 		return false, nil
@@ -93,24 +95,74 @@ func (rs *RankService) CheckRankPermission(ctx context.Context, userID string, a
 	if len(objectID) > 0 {
 		objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
 		if err != nil {
-			return false, err
+			log.Error(err)
 		}
 		// if the user is this object creator, the user can operate this object.
-		// but if this object is tag, only users who have reached the rank level can operate.
-		if objectInfo.ObjectCreatorUserID == userID && objectInfo.ObjectType != constant.TagObjectType {
+		if objectInfo != nil &&
+			objectInfo.ObjectCreatorUserID == userID {
 			return true, nil
 		}
 	}
 
+	return rs.checkUserRank(ctx, userInfo.ID, userInfo.Rank, action)
+}
+
+// CheckOperationPermissions verify that the user has operation
+func (rs *RankService) CheckOperationPermissions(ctx context.Context, userID string, actions []string, objectID string) (
+	can []bool, err error) {
+	can = make([]bool, len(actions))
+	if len(userID) == 0 {
+		return can, nil
+	}
+
+	// get the rank of the current user
+	userInfo, exist, err := rs.userCommon.GetUserBasicInfoByID(ctx, userID)
+	if err != nil {
+		return can, err
+	}
+	if !exist {
+		return can, nil
+	}
+
+	objectOwner := false
+	if len(objectID) > 0 {
+		objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
+		if err != nil {
+			log.Error(err)
+		}
+		// if the user is this object creator, the user can operate this object.
+		if objectInfo != nil &&
+			objectInfo.ObjectCreatorUserID == userID {
+			objectOwner = true
+		}
+	}
+
+	for idx, action := range actions {
+		if userInfo.IsAdmin || objectOwner {
+			can[idx] = true
+			continue
+		}
+		meetRank, err := rs.checkUserRank(ctx, userInfo.ID, userInfo.Rank, action)
+		if err != nil {
+			log.Error(err)
+		}
+		can[idx] = meetRank
+	}
+	return can, nil
+}
+
+// CheckRankPermission verify that the user meets the prestige criteria
+func (rs *RankService) checkUserRank(ctx context.Context, userID string, userRank int, action string) (
+	can bool, err error) {
 	// get the amount of rank required for the current operation
 	requireRank, err := rs.configRepo.GetInt(action)
 	if err != nil {
 		return false, err
 	}
-	currentUserRank := userInfo.Rank
+	currentUserRank := userRank
 	if currentUserRank < requireRank {
 		log.Debugf("user %s want to do action %s, but rank %d < %d",
-			userInfo.DisplayName, action, currentUserRank, requireRank)
+			userID, action, currentUserRank, requireRank)
 		return false, nil
 	}
 	return true, nil
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 1d63eb14..0c720fc3 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -627,9 +627,7 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 		Log:      req.EditSummary,
 	}
 
-	if !req.IsAdmin {
-		revisionDTO.Status = entity.RevisionUnreviewedStatus
-	} else {
+	if req.IsAdmin || req.NoNeedReview {
 		canUpdate = true
 		err = ts.tagRepo.UpdateTag(ctx, tagInfo)
 		if err != nil {
@@ -651,6 +649,8 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 			}
 		}
 		revisionDTO.Status = entity.RevisionReviewPassStatus
+	} else {
+		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	}
 
 	tagInfoJson, _ := json.Marshal(tagInfo)

From c08a9c852e093184353b9a444c2b90a8597e9883 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:05:56 +0800
Subject: [PATCH 080/194] fix NoNeedReview

---
 internal/service/answer_service.go   |  8 ++++++--
 internal/service/question_service.go | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 0efb0ea9..d3a1ca84 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -190,6 +190,7 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 }
 
 func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq) (string, error) {
+	//req.NoNeedReview //true 不需要审核
 	var canUpdate bool
 	_, existUnreviewed, err := as.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
 	if err != nil {
@@ -232,10 +233,13 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 		Log:      req.EditSummary,
 	}
 
-	if answerInfo.UserID != req.UserID && !req.IsAdmin {
+	if req.NoNeedReview || req.IsAdmin || answerInfo.UserID == req.UserID {
+		canUpdate = true
+	}
+
+	if !canUpdate {
 		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	} else {
-		canUpdate = true
 		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
 			return "", err
 		}
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 526945ba..815af781 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -264,7 +264,7 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 
 // UpdateQuestion update question
 func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
-	var canUpdateQuestion bool
+	var canUpdate bool
 	questionInfo = &schema.QuestionInfo{}
 
 	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
@@ -345,11 +345,15 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		Title:    question.Title,
 		Log:      req.EditSummary,
 	}
+
+	if req.NoNeedReview || req.IsAdmin || dbinfo.UserID == req.UserID {
+		canUpdate = true
+	}
+
 	// It's not you or the administrator that needs to be reviewed
-	if dbinfo.UserID != req.UserID && !req.IsAdmin {
+	if !canUpdate {
 		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	} else {
-		canUpdateQuestion = true
 		//Direct modification
 		revisionDTO.Status = entity.RevisionReviewPassStatus
 		//update question to db
@@ -377,7 +381,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if err != nil {
 		return
 	}
-	if canUpdateQuestion {
+	if canUpdate {
 		activity_queue.AddActivity(&schema.ActivityMsg{
 			UserID:           req.UserID,
 			ObjectID:         question.ID,

From fdb7ceb26e6e3b5519bd15b1a0d7cd97ff59da45 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:07:41 +0800
Subject: [PATCH 081/194] fix

---
 internal/controller/tag_controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index f29cc1a5..0bed7ffd 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -73,7 +73,7 @@ func (tc *TagController) RemoveTag(ctx *gin.Context) {
 		return
 	}
 
-	err := tc.tagService.RemoveTag(ctx, req)
+	err = tc.tagService.RemoveTag(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
 

From 06d358438dad0507e6e08d4dffe9820217dd3919 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 10:27:13 +0800
Subject: [PATCH 082/194] feat: version upgrade add rank limiting condition

---
 cmd/answer/main.go               |  4 +--
 internal/entity/config_entity.go |  2 +-
 internal/migrations/v3.go        | 46 +++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/cmd/answer/main.go b/cmd/answer/main.go
index 8d1481ba..cea99db9 100644
--- a/cmd/answer/main.go
+++ b/cmd/answer/main.go
@@ -35,12 +35,12 @@ var (
 // @in header
 // @name Authorization
 func main() {
+	log.SetLogger(zap.NewLogger(
+		log.ParseLevel(logLevel), zap.WithName("answer"), zap.WithPath(logPath), zap.WithCallerFullPath()))
 	Execute()
 }
 
 func runApp() {
-	log.SetLogger(zap.NewLogger(
-		log.ParseLevel(logLevel), zap.WithName("answer"), zap.WithPath(logPath), zap.WithCallerFullPath()))
 	c, err := conf.ReadConfig(cli.GetConfigFilePath())
 	if err != nil {
 		panic(err)
diff --git a/internal/entity/config_entity.go b/internal/entity/config_entity.go
index 1d716a2d..361e7acc 100644
--- a/internal/entity/config_entity.go
+++ b/internal/entity/config_entity.go
@@ -3,7 +3,7 @@ package entity
 // Config config
 type Config struct {
 	ID    int    `xorm:"not null pk autoincr INT(11) id"`
-	Key   string `xorm:"unique VARCHAR(32) key"`
+	Key   string `xorm:"unique VARCHAR(128) key"`
 	Value string `xorm:"TEXT value"`
 }
 
diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index 47dce2f2..2a252d0c 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -4,11 +4,41 @@ import (
 	"time"
 
 	"github.com/answerdev/answer/internal/entity"
+	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
 )
 
 func addActivityTimeline(x *xorm.Engine) error {
+	// only increasing field length to 128
+	type Config struct {
+		Key string `xorm:"unique VARCHAR(128) key"`
+	}
+	if err := x.Sync(new(Config)); err != nil {
+		return err
+	}
 	defaultConfigTable := []*entity.Config{
+		{ID: 36, Key: "rank.question.add", Value: `1`},
+		{ID: 37, Key: "rank.question.edit", Value: `200`},
+		{ID: 38, Key: "rank.question.delete", Value: `0`},
+		{ID: 39, Key: "rank.question.vote_up", Value: `15`},
+		{ID: 40, Key: "rank.question.vote_down", Value: `125`},
+		{ID: 41, Key: "rank.answer.add", Value: `1`},
+		{ID: 42, Key: "rank.answer.edit", Value: `200`},
+		{ID: 43, Key: "rank.answer.delete", Value: `0`},
+		{ID: 44, Key: "rank.answer.accept", Value: `1`},
+		{ID: 45, Key: "rank.answer.vote_up", Value: `15`},
+		{ID: 46, Key: "rank.answer.vote_down", Value: `125`},
+		{ID: 47, Key: "rank.comment.add", Value: `1`},
+		{ID: 48, Key: "rank.comment.edit", Value: `1`},
+		{ID: 49, Key: "rank.comment.delete", Value: `0`},
+		{ID: 50, Key: "rank.report.add", Value: `1`},
+		{ID: 51, Key: "rank.tag.add", Value: `1`},
+		{ID: 52, Key: "rank.tag.edit", Value: `100`},
+		{ID: 53, Key: "rank.tag.delete", Value: `0`},
+		{ID: 54, Key: "rank.tag.synonym", Value: `20000`},
+		{ID: 55, Key: "rank.link.url_limit", Value: `10`},
+		{ID: 56, Key: "rank.vote.detail", Value: `0`},
+
 		{ID: 87, Key: "question.asked", Value: `0`},
 		{ID: 88, Key: "question.closed", Value: `0`},
 		{ID: 89, Key: "question.reopened", Value: `0`},
@@ -29,6 +59,15 @@ func addActivityTimeline(x *xorm.Engine) error {
 		{ID: 104, Key: "tag.rollback", Value: `0`},
 		{ID: 105, Key: "tag.deleted", Value: `0`},
 		{ID: 106, Key: "tag.undeleted", Value: `0`},
+
+		{ID: 107, Key: "rank.comment.vote_up", Value: `1`},
+		{ID: 108, Key: "rank.comment.vote_down", Value: `1`},
+		{ID: 109, Key: "rank.question.edit_without_review", Value: `2000`},
+		{ID: 110, Key: "rank.answer.edit_without_review", Value: `2000`},
+		{ID: 111, Key: "rank.tag.edit_without_review", Value: `20000`},
+		{ID: 112, Key: "rank.answer.audit", Value: `2000`},
+		{ID: 113, Key: "rank.question.audit", Value: `2000`},
+		{ID: 114, Key: "rank.tag.audit", Value: `20000`},
 	}
 	for _, c := range defaultConfigTable {
 		exist, err := x.Get(&entity.Config{ID: c.ID, Key: c.Key})
@@ -36,9 +75,14 @@ func addActivityTimeline(x *xorm.Engine) error {
 			return err
 		}
 		if exist {
+			if _, err = x.Update(c, &entity.Config{ID: c.ID, Key: c.Key}); err != nil {
+				log.Errorf("update %+v config failed: %s", c, err)
+				return err
+			}
 			continue
 		}
-		if _, err := x.Insert(&entity.Config{ID: c.ID, Key: c.Key, Value: c.Value}); err != nil {
+		if _, err = x.Insert(&entity.Config{ID: c.ID, Key: c.Key, Value: c.Value}); err != nil {
+			log.Errorf("insert %+v config failed: %s", c, err)
 			return err
 		}
 	}

From 6ea8013df3153df18d6094f18109d4c5308e3ed9 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 10:45:30 +0800
Subject: [PATCH 083/194] feat: handles audit permissions for different types
 of objects

---
 internal/controller/revision_controller.go | 27 +++++++++++++---------
 internal/schema/revision_schema.go         | 17 +++++++++-----
 internal/service/rank/rank_service.go      |  7 ++++--
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index d9f80939..f9693c19 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -67,16 +67,18 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-
-	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, rank.UnreviewedRevisionListRank, "")
+	canList, err := rc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAuditRank,
+		rank.AnswerAuditRank,
+		rank.TagAuditRank,
+	}, "")
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !can {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
-		return
-	}
+	req.CanReviewQuestion = canList[0]
+	req.CanReviewAnswer = canList[1]
+	req.CanReviewTag = canList[2]
 
 	resp, count, err := rc.revisionListService.GetUnreviewedRevisionList(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{
@@ -100,15 +102,18 @@ func (rc *RevisionController) RevisionAudit(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, rank.RevisionAuditRank, "")
+	canList, err := rc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAuditRank,
+		rank.AnswerAuditRank,
+		rank.TagAuditRank,
+	}, "")
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !can {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
-		return
-	}
+	req.CanReviewQuestion = canList[0]
+	req.CanReviewAnswer = canList[1]
+	req.CanReviewTag = canList[2]
 
 	err = rc.revisionListService.RevisionAudit(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{})
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 3d05f7e1..01f05828 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -31,15 +31,20 @@ const RevisionAuditReject = "reject"
 
 type RevisionAuditReq struct {
 	// object id
-	ID        string `validate:"required" comment:"id" form:"id"`
-	Operation string `validate:"required" comment:"operation" form:"operation"` //approve or reject
-	UserID    string `json:"-" `                                                // user_id
-	// IsAdmin   bool   `json:"-"`
+	ID                string `validate:"required" comment:"id" form:"id"`
+	Operation         string `validate:"required" comment:"operation" form:"operation"` //approve or reject
+	UserID            string `json:"-"`
+	CanReviewQuestion bool   `json:"-"`
+	CanReviewAnswer   bool   `json:"-"`
+	CanReviewTag      bool   `json:"-"`
 }
 
 type RevisionSearch struct {
-	Page   int    `json:"page" form:"page"` // Query number of pages
-	UserID string `json:"-"`
+	Page              int    `json:"page" form:"page"` // Query number of pages
+	CanReviewQuestion bool   `json:"-"`
+	CanReviewAnswer   bool   `json:"-"`
+	CanReviewTag      bool   `json:"-"`
+	UserID            string `json:"-"`
 }
 
 type GetUnreviewedRevisionResp struct {
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 3cc7fded..4e257e30 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -33,6 +33,8 @@ const (
 	CommentAddRank                = "rank.comment.add"
 	CommentEditRank               = "rank.comment.edit"
 	CommentDeleteRank             = "rank.comment.delete"
+	CommentVoteUpRank             = "rank.comment.vote_up"
+	CommentVoteDownRank           = "rank.comment.vote_down"
 	ReportAddRank                 = "rank.report.add"
 	TagAddRank                    = "rank.tag.add"
 	TagEditRank                   = "rank.tag.edit"
@@ -41,8 +43,9 @@ const (
 	TagSynonymRank                = "rank.tag.synonym"
 	LinkUrlLimitRank              = "rank.link.url_limit"
 	VoteDetailRank                = "rank.vote.detail"
-	RevisionAuditRank             = "rank.revision.audit"
-	UnreviewedRevisionListRank    = "rank.revision.unreviewed_list"
+	AnswerAuditRank               = "rank.answer.audit"
+	QuestionAuditRank             = "rank.question.audit"
+	TagAuditRank                  = "rank.tag.audit"
 )
 
 type UserRankRepo interface {

From 3d532533cccf6779e802bacc22d233a367e6525f Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 10:46:39 +0800
Subject: [PATCH 084/194] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i18n/en_US.yaml                      | 3 +++
 internal/base/reason/reason.go       | 1 +
 internal/service/question_service.go | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 66fa7e1b..9b02de6f 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -95,6 +95,9 @@ backend:
     theme:
       not_found:
         other: "Theme not found."
+    revision:
+      review_underway:
+        other: "Revision review underway."
     user:
       email_or_password_wrong:
         other: *email_or_password_wrong
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 274cc1cc..4d05da4c 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -55,4 +55,5 @@ const (
 	UploadFileSourceUnsupported      = "error.upload.source_unsupported"
 	RecommendTagNotExist             = "error.tag.recommend_tag_not_found"
 	RecommendTagEnter                = "error.tag.recommend_tag_enter"
+	RevisionReviewUnderway           = "error.revision.review_underway"
 )
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 815af781..c0da1ca1 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -840,5 +840,9 @@ func (qs *QuestionService) CheckCanUpdate(ctx context.Context, req *schema.Check
 	if err != nil {
 		return false, err
 	}
+	if existUnreviewed {
+		err = errors.BadRequest(reason.RevisionReviewUnderway)
+		return existUnreviewed, err
+	}
 	return existUnreviewed, nil
 }

From d819ef24eca9ddf89001fb134f0d5ead401fa172 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:08:19 +0800
Subject: [PATCH 085/194] update revision list

---
 internal/entity/revision_entity.go      |  5 ++++-
 internal/repo/revision/revision_repo.go | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index 09c5e815..ae09cecd 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -27,7 +27,10 @@ type Revision struct {
 }
 
 type RevisionSearch struct {
-	Page int `json:"page" form:"page"` // Query number of pages
+	Page              int  `json:"page" form:"page"` // Query number of pages
+	CanReviewQuestion bool `json:"-"`
+	CanReviewAnswer   bool `json:"-"`
+	CanReviewTag      bool `json:"-"`
 }
 
 // TableName revision table name
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index a905c95a..f5a1b170 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -176,8 +176,21 @@ func (rr *revisionRepo) SearchUnreviewedList(ctx context.Context, search *entity
 	}
 	PageSize := 1
 	offset := search.Page * PageSize
+	objectType := make([]int, 0)
+	if search.CanReviewAnswer {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.AnswerObjectType])
+	}
+	if search.CanReviewQuestion {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.QuestionObjectType])
+	}
+	if search.CanReviewTag {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.TagObjectType])
+	}
+
 	session := rr.data.DB.Where("")
 	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
+	session = session.In("object_type", objectType)
+	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
 	session = session.OrderBy("created_at desc")
 	session = session.Limit(PageSize, offset)
 	count, err = session.FindAndCount(&rows)

From e445415ab9fe940ecac5619df312593a3d6cf96e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:13:58 +0800
Subject: [PATCH 086/194]  update review permission

---
 i18n/en_US.yaml                      |  2 ++
 internal/base/reason/reason.go       |  1 +
 internal/service/revision_service.go | 18 +++++++++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 9b02de6f..28073b70 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -98,6 +98,8 @@ backend:
     revision:
       review_underway:
         other: "Revision review underway."
+      no_permission:
+        other: "No permission to Revision."
     user:
       email_or_password_wrong:
         other: *email_or_password_wrong
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 4d05da4c..21dbf341 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -56,4 +56,5 @@ const (
 	RecommendTagNotExist             = "error.tag.recommend_tag_not_found"
 	RecommendTagEnter                = "error.tag.recommend_tag_enter"
 	RevisionReviewUnderway           = "error.revision.review_underway"
+	RevisionNoPermission             = "error.revision.no_permission"
 )
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 9272641f..bdaff7c0 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -89,11 +89,23 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		var saveErr error
 		switch objectType {
 		case constant.QuestionObjectType:
-			saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
+			if !req.CanReviewQuestion {
+				saveErr = errors.BadRequest(reason.RevisionNoPermission)
+			} else {
+				saveErr = rs.revisionAuditQuestion(ctx, revisionitem)
+			}
 		case constant.AnswerObjectType:
-			saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
+			if !req.CanReviewAnswer {
+				saveErr = errors.BadRequest(reason.RevisionNoPermission)
+			} else {
+				saveErr = rs.revisionAuditAnswer(ctx, revisionitem)
+			}
 		case constant.TagObjectType:
-			saveErr = rs.revisionAuditTag(ctx, revisionitem)
+			if !req.CanReviewTag {
+				saveErr = errors.BadRequest(reason.RevisionNoPermission)
+			} else {
+				saveErr = rs.revisionAuditTag(ctx, revisionitem)
+			}
 		}
 		if saveErr != nil {
 			return saveErr

From f6911df6d9e1ca63cee51dfc52e1b30d6d086ab9 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:22:29 +0800
Subject: [PATCH 087/194] update GetUnreviewedRevisionList add userinfo

---
 internal/service/revision_service.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index bdaff7c0..6d41e5c3 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -270,6 +270,18 @@ func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *s
 		_ = copier.Copy(revisionitem, revision)
 		rs.parseItem(ctx, revisionitem)
 		item.UnreviewedInfo = revisionitem
+
+		// get user info
+		userInfo, exists, e := rs.userCommon.GetUserBasicInfoByID(ctx, revisionitem.UserID)
+		if e != nil {
+			return resp, 0, e
+		}
+		if exists {
+			var uinfo schema.UserBasicInfo
+			err = copier.Copy(&uinfo, userInfo)
+			item.UnreviewedInfo.UserInfo = uinfo
+		}
+
 		resp = append(resp, item)
 	}
 	return

From ee7428cba5ff13a1e52cc0f2ec138f6a35620816 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 12:07:56 +0800
Subject: [PATCH 088/194] feat: add question answer tag comment permission
 Control

---
 internal/controller/answer_controller.go      |  18 ++-
 internal/controller/comment_controller.go     |  31 ++++-
 internal/controller/question_controller.go    |  53 ++++++--
 internal/controller/tag_controller.go         |  10 ++
 internal/schema/answer_schema.go              |  18 +--
 internal/schema/comment_schema.go             |  14 +++
 internal/schema/question_schema.go            |  13 ++
 internal/schema/tag_schema.go                 |   4 +
 internal/service/answer_service.go            |  51 ++++----
 internal/service/comment/comment_service.go   |   8 +-
 .../service/permission/comment_permission.go  | 118 +++++++++---------
 internal/service/question_service.go          |  38 +++---
 internal/service/tag/tag_service.go           |   2 +-
 13 files changed, 253 insertions(+), 125 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index daae2ebd..9fd43b4c 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -202,16 +202,28 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 // @Security ApiKeyAuth
 // @Accept  json
 // @Produce  json
-// @Param data body schema.AnswerList  true "AnswerList"
+// @Param data body schema.AnswerListReq  true "AnswerListReq"
 // @Success 200 {string} string ""
 // @Router /answer/api/v1/answer/list [get]
 func (ac *AnswerController) AnswerList(ctx *gin.Context) {
-	req := &schema.AnswerList{}
+	req := &schema.AnswerListReq{}
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
+
+	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.AnswerEditRank,
+		rank.AnswerDeleteRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
+
 	list, count, err := ac.answerService.SearchList(ctx, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go
index 29ab36a1..27cbe06c 100644
--- a/internal/controller/comment_controller.go
+++ b/internal/controller/comment_controller.go
@@ -41,12 +41,19 @@ func (cc *CommentController) AddComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentAddRank, "")
+	canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.CommentAddRank,
+		rank.CommentEditRank,
+		rank.CommentDeleteRank,
+	}, "")
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !can {
+	req.CanAdd = canList[0]
+	req.CanEdit = canList[1]
+	req.CanDelete = canList[2]
+	if !req.CanAdd {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
@@ -135,6 +142,16 @@ func (cc *CommentController) GetCommentWithPage(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.CommentEditRank,
+		rank.CommentDeleteRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
 
 	resp, err := cc.commentService.GetCommentWithPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
@@ -177,6 +194,16 @@ func (cc *CommentController) GetComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.CommentEditRank,
+		rank.CommentDeleteRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
 
 	resp, err := cc.commentService.GetComment(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 88da05a5..da37a0f7 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -91,8 +91,26 @@ func (qc *QuestionController) CloseQuestion(ctx *gin.Context) {
 func (qc *QuestionController) GetQuestion(ctx *gin.Context) {
 	id := ctx.Query("id")
 	userID := middleware.GetLoginUserIDFromContext(ctx)
-	isAdmin := middleware.GetIsAdminFromContext(ctx)
-	info, err := qc.questionService.GetQuestion(ctx, id, userID, true, isAdmin)
+	req := &schema.QuestionPermission{}
+	canList, err := qc.rankService.CheckOperationPermissions(ctx, userID, []string{
+		rank.QuestionAddRank,
+		rank.QuestionEditRank,
+		rank.QuestionDeleteRank,
+	}, id)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanAdd = canList[0]
+	req.CanEdit = canList[1]
+	req.CanDelete = canList[2]
+	req.CanClose = middleware.GetIsAdminFromContext(ctx)
+	if !req.CanAdd {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+
+	info, err := qc.questionService.GetQuestionAndAddPV(ctx, id, userID, req)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
@@ -195,12 +213,20 @@ func (qc *QuestionController) AddQuestion(ctx *gin.Context) {
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
-	can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, rank.QuestionAddRank, "")
+	canList, err := qc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAddRank,
+		rank.QuestionEditRank,
+		rank.QuestionDeleteRank,
+	}, "")
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !can {
+	req.CanAdd = canList[0]
+	req.CanEdit = canList[1]
+	req.CanDelete = canList[2]
+	req.CanClose = middleware.GetIsAdminFromContext(ctx)
+	if !req.CanAdd {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
@@ -225,20 +251,31 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
+
 	canList, err := qc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAddRank,
 		rank.QuestionEditRank,
+		rank.QuestionDeleteRank,
 		rank.QuestionEditWithoutReviewRank,
-	}, "")
+	}, req.ID)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !canList[0] {
+	req.CanAdd = canList[0]
+	req.CanEdit = canList[1]
+	req.CanDelete = canList[2]
+	req.NoNeedReview = canList[3]
+	req.CanClose = middleware.GetIsAdminFromContext(ctx)
+	if !req.CanAdd {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
+	if !req.CanEdit {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
-	req.NoNeedReview = canList[1]
 
 	resp, err := qc.questionService.UpdateQuestion(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index 41ad52ab..b1d6661b 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -128,6 +128,16 @@ func (tc *TagController) GetTagInfo(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := tc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.TagEditRank,
+		rank.TagDeleteRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
 
 	resp, err := tc.tagService.GetTagInfo(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 3384c8da..ed80aed6 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -33,13 +33,17 @@ type AnswerUpdateReq struct {
 	NoNeedReview bool   `json:"-"`
 }
 
-type AnswerList struct {
-	QuestionID  string `json:"question_id" form:"question_id"` // question_id
-	Order       string `json:"order" form:"order"`             // 1 Default 2 time
-	Page        int    `json:"page" form:"page"`               // Query number of pages
-	PageSize    int    `json:"page_size" form:"page_size"`     // Search page size
-	LoginUserID string `json:"-" `
-	IsAdmin     bool   `json:"-"`
+type AnswerListReq struct {
+	QuestionID string `json:"question_id" form:"question_id"` // question_id
+	Order      string `json:"order" form:"order"`             // 1 Default 2 time
+	Page       int    `json:"page" form:"page"`               // Query number of pages
+	PageSize   int    `json:"page_size" form:"page_size"`     // Search page size
+	UserID     string `json:"-" `
+	IsAdmin    bool   `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 type AnswerInfo struct {
diff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.go
index 53ebf445..84c93d08 100644
--- a/internal/schema/comment_schema.go
+++ b/internal/schema/comment_schema.go
@@ -19,6 +19,12 @@ type AddCommentReq struct {
 	MentionUsernameList []string `validate:"omitempty" json:"mention_username_list"`
 	// user id
 	UserID string `json:"-"`
+	// whether user can add it
+	CanAdd bool `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 // RemoveCommentReq remove comment
@@ -73,6 +79,10 @@ type GetCommentWithPageReq struct {
 	QueryCond string `validate:"omitempty,oneof=vote" form:"query_cond"`
 	// user id
 	UserID string `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 // GetCommentReq get comment list page request
@@ -81,6 +91,10 @@ type GetCommentReq struct {
 	ID string `validate:"required" form:"id"`
 	// user id
 	UserID string `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 // GetCommentResp comment response
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 750af485..313e399d 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -32,6 +32,18 @@ type QuestionAdd struct {
 	Tags []*TagItem `validate:"required,dive" json:"tags"`
 	// user id
 	UserID string `json:"-"`
+	*QuestionPermission
+}
+
+type QuestionPermission struct {
+	// whether user can add it
+	CanAdd bool `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
+	// whether user can close it
+	CanClose bool `json:"-"`
 }
 
 type CheckCanQuestionUpdate struct {
@@ -59,6 +71,7 @@ type QuestionUpdate struct {
 	UserID       string `json:"-"`
 	IsAdmin      bool   `json:"-"`
 	NoNeedReview bool   `json:"-"`
+	*QuestionPermission
 }
 
 type QuestionBaseInfo struct {
diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go
index 16dcdaea..964509b8 100644
--- a/internal/schema/tag_schema.go
+++ b/internal/schema/tag_schema.go
@@ -23,6 +23,10 @@ type GetTagInfoReq struct {
 	Name string `validate:"omitempty,gt=0,lte=35" form:"name"`
 	// user id
 	UserID string `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 func (r *GetTagInfoReq) Check() (errFields []*validator.FormErrorField, err error) {
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index d3a1ca84..f34508aa 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -425,39 +425,39 @@ func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, answerID stri
 	return nil
 }
 
-func (as *AnswerService) SearchList(ctx context.Context, search *schema.AnswerList) ([]*schema.AnswerInfo, int64, error) {
+func (as *AnswerService) SearchList(ctx context.Context, req *schema.AnswerListReq) ([]*schema.AnswerInfo, int64, error) {
 	list := make([]*schema.AnswerInfo, 0)
 	dbSearch := entity.AnswerSearch{}
-	dbSearch.QuestionID = search.QuestionID
-	dbSearch.Page = search.Page
-	dbSearch.PageSize = search.PageSize
-	dbSearch.Order = search.Order
-	dblist, count, err := as.answerRepo.SearchList(ctx, &dbSearch)
+	dbSearch.QuestionID = req.QuestionID
+	dbSearch.Page = req.Page
+	dbSearch.PageSize = req.PageSize
+	dbSearch.Order = req.Order
+	answerOriginalList, count, err := as.answerRepo.SearchList(ctx, &dbSearch)
 	if err != nil {
 		return list, count, err
 	}
-	AnswerList, err := as.SearchFormatInfo(ctx, dblist, search.LoginUserID, search.IsAdmin)
+	answerList, err := as.SearchFormatInfo(ctx, answerOriginalList, req)
 	if err != nil {
-		return AnswerList, count, err
+		return answerList, count, err
 	}
-	return AnswerList, count, nil
+	return answerList, count, nil
 }
 
-func (as *AnswerService) SearchFormatInfo(ctx context.Context, dblist []*entity.Answer, loginUserID string, isAdmin bool) ([]*schema.AnswerInfo, error) {
+func (as *AnswerService) SearchFormatInfo(ctx context.Context, answers []*entity.Answer, req *schema.AnswerListReq) (
+	[]*schema.AnswerInfo, error) {
 	list := make([]*schema.AnswerInfo, 0)
-	objectIds := make([]string, 0)
-	userIds := make([]string, 0)
-	for _, dbitem := range dblist {
-		item := as.ShowFormat(ctx, dbitem)
+	objectIDs := make([]string, 0)
+	userIDs := make([]string, 0)
+	for _, info := range answers {
+		item := as.ShowFormat(ctx, info)
 		list = append(list, item)
-		objectIds = append(objectIds, dbitem.ID)
-		userIds = append(userIds, dbitem.UserID)
-		if loginUserID != "" {
-			// item.VoteStatus = as.activityFunc.GetVoteStatus(ctx, item.TagID, loginUserId)
-			item.VoteStatus = as.voteRepo.GetVoteStatus(ctx, item.ID, loginUserID)
+		objectIDs = append(objectIDs, info.ID)
+		userIDs = append(userIDs, info.UserID)
+		if req.UserID != "" {
+			item.VoteStatus = as.voteRepo.GetVoteStatus(ctx, item.ID, req.UserID)
 		}
 	}
-	userInfoMap, err := as.userCommon.BatchUserBasicInfoByID(ctx, userIds)
+	userInfoMap, err := as.userCommon.BatchUserBasicInfoByID(ctx, userIDs)
 	if err != nil {
 		return list, err
 	}
@@ -469,26 +469,25 @@ func (as *AnswerService) SearchFormatInfo(ctx context.Context, dblist []*entity.
 		}
 	}
 
-	if loginUserID == "" {
+	if req.UserID == "" {
 		return list, nil
 	}
 
-	CollectedMap, err := as.collectionCommon.SearchObjectCollected(ctx, loginUserID, objectIds)
+	searchObjectCollected, err := as.collectionCommon.SearchObjectCollected(ctx, req.UserID, objectIDs)
 	if err != nil {
-		log.Error("CollectionFunc.SearchObjectCollected error", err)
+		return nil, err
 	}
 
 	for _, item := range list {
-		_, ok := CollectedMap[item.ID]
+		_, ok := searchObjectCollected[item.ID]
 		if ok {
 			item.Collected = true
 		}
 	}
 
 	for _, item := range list {
-		item.MemberActions = permission.GetAnswerPermission(ctx, loginUserID, item.UserID, isAdmin)
+		item.MemberActions = permission.GetAnswerPermission(ctx, req.UserID, item.UserID, req.CanEdit, req.CanDelete)
 	}
-
 	return list, nil
 }
 
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index de96efd0..1af7afa3 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -12,7 +12,7 @@ import (
 	"github.com/answerdev/answer/internal/service/activity_queue"
 	"github.com/answerdev/answer/internal/service/comment_common"
 	"github.com/answerdev/answer/internal/service/notice_queue"
-	object_info "github.com/answerdev/answer/internal/service/object_info"
+	"github.com/answerdev/answer/internal/service/object_info"
 	"github.com/answerdev/answer/internal/service/permission"
 	usercommon "github.com/answerdev/answer/internal/service/user_common"
 	"github.com/jinzhu/copier"
@@ -122,7 +122,7 @@ func (cs *CommentService) AddComment(ctx context.Context, req *schema.AddComment
 
 	resp = &schema.GetCommentResp{}
 	resp.SetFromComment(comment)
-	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID)
+	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID, req.CanEdit, req.CanDelete)
 
 	// get reply user info
 	if len(resp.ReplyUserID) > 0 {
@@ -230,7 +230,7 @@ func (cs *CommentService) GetComment(ctx context.Context, req *schema.GetComment
 	// check if current user vote this comment
 	resp.IsVote = cs.checkIsVote(ctx, req.UserID, resp.CommentID)
 
-	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID)
+	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID, req.CanEdit, req.CanDelete)
 	return resp, nil
 }
 
@@ -290,7 +290,7 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 		// check if current user vote this comment
 		commentResp.IsVote = cs.checkIsVote(ctx, req.UserID, commentResp.CommentID)
 
-		commentResp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, commentResp.UserID)
+		commentResp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, commentResp.UserID, req.CanEdit, req.CanDelete)
 		resp = append(resp, commentResp)
 	}
 	return pager.NewPageModel(total, resp), nil
diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go
index b73dab9f..a7510271 100644
--- a/internal/service/permission/comment_permission.go
+++ b/internal/service/permission/comment_permission.go
@@ -6,8 +6,8 @@ import (
 	"github.com/answerdev/answer/internal/schema"
 )
 
-// TODO: There is currently no permission management
-func GetCommentPermission(ctx context.Context, userID string, commentCreatorUserID string) (
+// GetCommentPermission get comment permission
+func GetCommentPermission(ctx context.Context, userID string, creatorUserID string, canEdit, canDelete bool) (
 	actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
 	if len(userID) > 0 {
@@ -17,103 +17,105 @@ func GetCommentPermission(ctx context.Context, userID string, commentCreatorUser
 			Type:   "reason",
 		})
 	}
-	if userID != commentCreatorUserID {
-		return actions
-	}
-	actions = append(actions, []*schema.PermissionMemberAction{
-		{
+	if canEdit || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "edit",
 			Name:   "Edit",
 			Type:   "edit",
-		},
-		{
+		})
+	}
+
+	if canDelete || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "delete",
 			Name:   "Delete",
 			Type:   "reason",
-		},
-	}...)
+		})
+	}
 	return actions
 }
 
-func GetTagPermission(ctx context.Context, userID string, tagCreatorUserID string) (
+// GetTagPermission get tag permission
+func GetTagPermission(ctx context.Context, canEdit, canDelete bool) (
 	actions []*schema.PermissionMemberAction) {
-	if userID != tagCreatorUserID {
-		return []*schema.PermissionMemberAction{}
-	}
-	return []*schema.PermissionMemberAction{
-		{
+	if canEdit {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "edit",
 			Name:   "Edit",
 			Type:   "edit",
-		},
-		{
+		})
+	}
+
+	if canDelete {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "delete",
 			Name:   "Delete",
 			Type:   "reason",
-		},
+		})
 	}
+	return actions
 }
 
-func GetAnswerPermission(ctx context.Context, userID string, answerAuthID string, isAdmin bool) (
+// GetAnswerPermission get answer permission
+func GetAnswerPermission(ctx context.Context, userID string, creatorUserID string, canEdit, canDelete bool) (
 	actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
-	if !isAdmin {
-		if len(userID) > 0 {
-			actions = append(actions, &schema.PermissionMemberAction{
-				Action: "report",
-				Name:   "Flag",
-				Type:   "reason",
-			})
-		}
-		if userID != answerAuthID {
-			return actions
-		}
+	if len(userID) > 0 {
+		actions = append(actions, &schema.PermissionMemberAction{
+			Action: "report",
+			Name:   "Flag",
+			Type:   "reason",
+		})
 	}
-	actions = append(actions, []*schema.PermissionMemberAction{
-		{
+	if canEdit || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "edit",
 			Name:   "Edit",
 			Type:   "edit",
-		},
-		{
+		})
+	}
+
+	if canDelete || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "delete",
 			Name:   "Delete",
 			Type:   "confirm",
-		},
-	}...)
+		})
+	}
 	return actions
 }
 
-func GetQuestionPermission(ctx context.Context, userID string, questionAuthID string, isAdmin bool) (actions []*schema.PermissionMemberAction) {
+// GetQuestionPermission get question permission
+func GetQuestionPermission(ctx context.Context, userID string, creatorUserID string, canEdit, canDelete, canClose bool) (
+	actions []*schema.PermissionMemberAction) {
 	actions = make([]*schema.PermissionMemberAction, 0)
-	if !isAdmin {
-		if len(userID) > 0 {
-			actions = append(actions, &schema.PermissionMemberAction{
-				Action: "report",
-				Name:   "Flag",
-				Type:   "reason",
-			})
-		}
-		if userID != questionAuthID {
-			return actions
-		}
+	if len(userID) > 0 {
+		actions = append(actions, &schema.PermissionMemberAction{
+			Action: "report",
+			Name:   "Flag",
+			Type:   "reason",
+		})
 	}
-	actions = append(actions, []*schema.PermissionMemberAction{
-		{
+	if canEdit || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "edit",
 			Name:   "Edit",
 			Type:   "edit",
-		},
-		{
+		})
+	}
+	if canClose {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "close",
 			Name:   "Close",
 			Type:   "confirm",
-		},
-		{
+		})
+	}
+	if canDelete || userID == creatorUserID {
+		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "delete",
 			Name:   "Delete",
 			Type:   "confirm",
-		},
-	}...)
+		})
+	}
 	return actions
 }
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index c0da1ca1..27434b1f 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -197,7 +197,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		RevisionID:       revisionID,
 	})
 
-	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false, false)
+	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, req.QuestionPermission)
 	return
 }
 
@@ -391,27 +391,33 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		})
 	}
 
-	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, false, false)
+	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, req.QuestionPermission)
 	return
 }
 
 // GetQuestion get question one
-func (qs *QuestionService) GetQuestion(ctx context.Context, id, loginUserID string, addpv bool, isAdmin bool) (resp *schema.QuestionInfo, err error) {
-	question, err := qs.questioncommon.Info(ctx, id, loginUserID)
+func (qs *QuestionService) GetQuestion(ctx context.Context, questionID, userID string,
+	per *schema.QuestionPermission) (resp *schema.QuestionInfo, err error) {
+	question, err := qs.questioncommon.Info(ctx, questionID, userID)
 	if err != nil {
 		return
 	}
-	if addpv {
-		err = qs.questioncommon.UpdataPv(ctx, id)
-		if err != nil {
-			log.Error("UpdataPv", err)
-		}
-	}
-
-	question.MemberActions = permission.GetQuestionPermission(ctx, loginUserID, question.UserID, isAdmin)
+	question.MemberActions = permission.GetQuestionPermission(ctx, userID, question.UserID,
+		per.CanEdit, per.CanDelete, per.CanClose)
 	return question, nil
 }
 
+// GetQuestionAndAddPV get question one
+func (qs *QuestionService) GetQuestionAndAddPV(ctx context.Context, questionID, loginUserID string,
+	per *schema.QuestionPermission) (
+	resp *schema.QuestionInfo, err error) {
+	err = qs.questioncommon.UpdataPv(ctx, questionID)
+	if err != nil {
+		log.Error(err)
+	}
+	return qs.GetQuestion(ctx, questionID, loginUserID, per)
+}
+
 func (qs *QuestionService) ChangeTag(ctx context.Context, objectTagData *schema.TagChange) error {
 	return qs.tagCommon.ObjectChangeTag(ctx, objectTagData)
 }
@@ -635,12 +641,12 @@ func (qs *QuestionService) SearchByTitleLike(ctx context.Context, title string,
 // SimilarQuestion
 func (qs *QuestionService) SimilarQuestion(ctx context.Context, questionID string, loginUserID string) ([]*schema.QuestionInfo, int64, error) {
 	list := make([]*schema.QuestionInfo, 0)
-	questionInfo, err := qs.GetQuestion(ctx, questionID, loginUserID, false, false)
+	question, err := qs.questioncommon.Info(ctx, questionID, loginUserID)
 	if err != nil {
-		return list, 0, err
+		return list, 0, nil
 	}
-	tagNames := make([]string, 0, len(questionInfo.Tags))
-	for _, tag := range questionInfo.Tags {
+	tagNames := make([]string, 0, len(question.Tags))
+	for _, tag := range question.Tags {
 		tagNames = append(tagNames, tag.SlugName)
 	}
 	search := &schema.QuestionSearch{}
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index 057e1de8..10ae1a4a 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -106,7 +106,7 @@ func (ts *TagService) GetTagInfo(ctx context.Context, req *schema.GetTagInfoReq)
 	resp.Recommend = tagInfo.Recommend
 	resp.Reserved = tagInfo.Reserved
 	resp.IsFollower = ts.checkTagIsFollow(ctx, req.UserID, tagInfo.ID)
-	resp.MemberActions = permission.GetTagPermission(ctx, req.UserID, req.UserID)
+	resp.MemberActions = permission.GetTagPermission(ctx, req.CanEdit, req.CanDelete)
 	resp.GetExcerpt()
 	return resp, nil
 }

From e54ebacc22d2ded3f88df8c5cda660f5546ec560 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 12:20:50 +0800
Subject: [PATCH 089/194] feat: set question answer comment delete rank -1

---
 internal/migrations/v3.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index 2a252d0c..651b6dd0 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -19,22 +19,22 @@ func addActivityTimeline(x *xorm.Engine) error {
 	defaultConfigTable := []*entity.Config{
 		{ID: 36, Key: "rank.question.add", Value: `1`},
 		{ID: 37, Key: "rank.question.edit", Value: `200`},
-		{ID: 38, Key: "rank.question.delete", Value: `0`},
+		{ID: 38, Key: "rank.question.delete", Value: `-1`},
 		{ID: 39, Key: "rank.question.vote_up", Value: `15`},
 		{ID: 40, Key: "rank.question.vote_down", Value: `125`},
 		{ID: 41, Key: "rank.answer.add", Value: `1`},
 		{ID: 42, Key: "rank.answer.edit", Value: `200`},
-		{ID: 43, Key: "rank.answer.delete", Value: `0`},
+		{ID: 43, Key: "rank.answer.delete", Value: `-1`},
 		{ID: 44, Key: "rank.answer.accept", Value: `1`},
 		{ID: 45, Key: "rank.answer.vote_up", Value: `15`},
 		{ID: 46, Key: "rank.answer.vote_down", Value: `125`},
 		{ID: 47, Key: "rank.comment.add", Value: `1`},
 		{ID: 48, Key: "rank.comment.edit", Value: `1`},
-		{ID: 49, Key: "rank.comment.delete", Value: `0`},
+		{ID: 49, Key: "rank.comment.delete", Value: `-1`},
 		{ID: 50, Key: "rank.report.add", Value: `1`},
 		{ID: 51, Key: "rank.tag.add", Value: `1`},
 		{ID: 52, Key: "rank.tag.edit", Value: `100`},
-		{ID: 53, Key: "rank.tag.delete", Value: `0`},
+		{ID: 53, Key: "rank.tag.delete", Value: `-1`},
 		{ID: 54, Key: "rank.tag.synonym", Value: `20000`},
 		{ID: 55, Key: "rank.link.url_limit", Value: `10`},
 		{ID: 56, Key: "rank.vote.detail", Value: `0`},

From 645df9d20f2a3035c867a8d92c402fc0e296163d Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 12:22:53 +0800
Subject: [PATCH 090/194] feat: No operation is allowed when the reputation
 requirement is less than 0

---
 internal/service/rank/rank_service.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 4e257e30..9fa06cdb 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -162,10 +162,9 @@ func (rs *RankService) checkUserRank(ctx context.Context, userID string, userRan
 	if err != nil {
 		return false, err
 	}
-	currentUserRank := userRank
-	if currentUserRank < requireRank {
+	if userRank < requireRank || requireRank < 0 {
 		log.Debugf("user %s want to do action %s, but rank %d < %d",
-			userID, action, currentUserRank, requireRank)
+			userID, action, userRank, requireRank)
 		return false, nil
 	}
 	return true, nil

From fa00ea38282788281c024c38bb14f9e6b41f3fd9 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 14:55:56 +0800
Subject: [PATCH 091/194] fix: incorrect question permission setting

---
 internal/controller/question_controller.go | 22 +++++-----------------
 internal/repo/user/user_repo.go            | 10 +++++-----
 internal/service/rank/rank_service.go      |  4 ++--
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index da37a0f7..7ab5deae 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -93,7 +93,6 @@ func (qc *QuestionController) GetQuestion(ctx *gin.Context) {
 	userID := middleware.GetLoginUserIDFromContext(ctx)
 	req := &schema.QuestionPermission{}
 	canList, err := qc.rankService.CheckOperationPermissions(ctx, userID, []string{
-		rank.QuestionAddRank,
 		rank.QuestionEditRank,
 		rank.QuestionDeleteRank,
 	}, id)
@@ -101,14 +100,9 @@ func (qc *QuestionController) GetQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	req.CanAdd = canList[0]
-	req.CanEdit = canList[1]
-	req.CanDelete = canList[2]
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
 	req.CanClose = middleware.GetIsAdminFromContext(ctx)
-	if !req.CanAdd {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
-		return
-	}
 
 	info, err := qc.questionService.GetQuestionAndAddPV(ctx, id, userID, req)
 	if err != nil {
@@ -253,7 +247,6 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	canList, err := qc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
-		rank.QuestionAddRank,
 		rank.QuestionEditRank,
 		rank.QuestionDeleteRank,
 		rank.QuestionEditWithoutReviewRank,
@@ -262,15 +255,10 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	req.CanAdd = canList[0]
-	req.CanEdit = canList[1]
-	req.CanDelete = canList[2]
-	req.NoNeedReview = canList[3]
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
+	req.NoNeedReview = canList[2]
 	req.CanClose = middleware.GetIsAdminFromContext(ctx)
-	if !req.CanAdd {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
-		return
-	}
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if !req.CanEdit {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.go
index fb93c53c..fc18c46b 100644
--- a/internal/repo/user/user_repo.go
+++ b/internal/repo/user/user_repo.go
@@ -28,7 +28,7 @@ func NewUserRepo(data *data.Data, configRepo config.ConfigRepo) usercommon.UserR
 
 // AddUser add user
 func (ur *userRepo) AddUser(ctx context.Context, user *entity.User) (err error) {
-	_, err = ur.data.DB.Insert(user)
+	_, err = ur.data.DB.UseBool("is_admin").Insert(user)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -122,7 +122,7 @@ func (ur *userRepo) UpdateInfo(ctx context.Context, userInfo *entity.User) (err
 // GetByUserID get user info by user id
 func (ur *userRepo) GetByUserID(ctx context.Context, userID string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("id = ?", userID).Get(userInfo)
+	exist, err = ur.data.DB.Where("id = ?", userID).UseBool("is_admin").Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -131,7 +131,7 @@ func (ur *userRepo) GetByUserID(ctx context.Context, userID string) (userInfo *e
 
 func (ur *userRepo) BatchGetByID(ctx context.Context, ids []string) ([]*entity.User, error) {
 	list := make([]*entity.User, 0)
-	err := ur.data.DB.In("id", ids).Find(&list)
+	err := ur.data.DB.In("id", ids).UseBool("is_admin").Find(&list)
 	if err != nil {
 		return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -141,7 +141,7 @@ func (ur *userRepo) BatchGetByID(ctx context.Context, ids []string) ([]*entity.U
 // GetByUsername get user by username
 func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("username = ?", username).Get(userInfo)
+	exist, err = ur.data.DB.Where("username = ?", username).UseBool("is_admin").Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -151,7 +151,7 @@ func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInf
 // GetByEmail get user by email
 func (ur *userRepo) GetByEmail(ctx context.Context, email string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("e_mail = ?", email).Get(userInfo)
+	exist, err = ur.data.DB.Where("e_mail = ?", email).UseBool("is_admin").Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 9fa06cdb..7e828d20 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -98,7 +98,7 @@ func (rs *RankService) CheckOperationPermission(ctx context.Context, userID stri
 	if len(objectID) > 0 {
 		objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
 		if err != nil {
-			log.Error(err)
+			return can, err
 		}
 		// if the user is this object creator, the user can operate this object.
 		if objectInfo != nil &&
@@ -131,7 +131,7 @@ func (rs *RankService) CheckOperationPermissions(ctx context.Context, userID str
 	if len(objectID) > 0 {
 		objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
 		if err != nil {
-			log.Error(err)
+			return can, err
 		}
 		// if the user is this object creator, the user can operate this object.
 		if objectInfo != nil &&

From d30cae05c7b59c7b7dfef74ee7a62908445e652c Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 14:59:52 +0800
Subject: [PATCH 092/194] fix: incorrect answer permission setting

---
 internal/controller/answer_controller.go | 7 +++----
 internal/schema/answer_schema.go         | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 9fd43b4c..c1b658e0 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -158,7 +158,6 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 
 	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
 		rank.AnswerEditRank,
@@ -168,11 +167,12 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !canList[0] {
+	req.CanEdit = canList[0]
+	req.NoNeedReview = canList[1]
+	if !req.CanEdit {
 		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
 		return
 	}
-	req.NoNeedReview = canList[1]
 
 	_, err = ac.answerService.Update(ctx, req)
 	if err != nil {
@@ -211,7 +211,6 @@ func (ac *AnswerController) AnswerList(ctx *gin.Context) {
 		return
 	}
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 
 	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
 		rank.AnswerEditRank,
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index ed80aed6..ef886b4d 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -31,6 +31,8 @@ type AnswerUpdateReq struct {
 	EditSummary  string `validate:"omitempty" json:"edit_summary"` // edit_summary
 	IsAdmin      bool   `json:"-"`
 	NoNeedReview bool   `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
 }
 
 type AnswerListReq struct {

From 60a5c4015f18d943652af01a5a2392f66c3932e4 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:30:29 +0800
Subject: [PATCH 093/194] swagger

---
 docs/docs.go                         | 6 +++---
 docs/swagger.json                    | 6 +++---
 docs/swagger.yaml                    | 6 +++---
 internal/service/revision_service.go | 2 --
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 936f0c5c..119db1fe 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1314,12 +1314,12 @@ const docTemplate = `{
                 "summary": "AnswerList",
                 "parameters": [
                     {
-                        "description": "AnswerList",
+                        "description": "AnswerListReq",
                         "name": "data",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/schema.AnswerList"
+                            "$ref": "#/definitions/schema.AnswerListReq"
                         }
                     }
                 ],
@@ -4860,7 +4860,7 @@ const docTemplate = `{
                 }
             }
         },
-        "schema.AnswerList": {
+        "schema.AnswerListReq": {
             "type": "object",
             "properties": {
                 "order": {
diff --git a/docs/swagger.json b/docs/swagger.json
index c0182ab4..097f3938 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1302,12 +1302,12 @@
                 "summary": "AnswerList",
                 "parameters": [
                     {
-                        "description": "AnswerList",
+                        "description": "AnswerListReq",
                         "name": "data",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/schema.AnswerList"
+                            "$ref": "#/definitions/schema.AnswerListReq"
                         }
                     }
                 ],
@@ -4848,7 +4848,7 @@
                 }
             }
         },
-        "schema.AnswerList": {
+        "schema.AnswerListReq": {
             "type": "object",
             "properties": {
                 "order": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 842c9b4f..a3f3ce70 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -202,7 +202,7 @@ definitions:
         description: question_id
         type: string
     type: object
-  schema.AnswerList:
+  schema.AnswerListReq:
     properties:
       order:
         description: 1 Default 2 time
@@ -2431,12 +2431,12 @@ paths:
       - application/json
       description: AnswerList <br> <b>order</b> (default or updated)
       parameters:
-      - description: AnswerList
+      - description: AnswerListReq
         in: body
         name: data
         required: true
         schema:
-          $ref: '#/definitions/schema.AnswerList'
+          $ref: '#/definitions/schema.AnswerListReq'
       produces:
       - application/json
       responses:
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 6d41e5c3..bfe28508 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -205,8 +205,6 @@ func (rs *RevisionService) revisionAuditTag(ctx context.Context, revisionitem *s
 	if ok {
 		tag := &entity.Tag{}
 		tag.ID = taginfo.TagID
-		tag.DisplayName = taginfo.DisplayName
-		tag.SlugName = taginfo.SlugName
 		tag.OriginalText = taginfo.OriginalText
 		tag.ParsedText = taginfo.ParsedText
 		saveerr := rs.tagRepo.UpdateTag(ctx, tag)

From b09e693d8b7d3701cd892184f1bc04bd817647fc Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 15:34:36 +0800
Subject: [PATCH 094/194] feat: tag add user id

---
 internal/entity/tag_entity.go             | 1 +
 internal/service/tag/tag_service.go       | 1 +
 internal/service/tag_common/tag_common.go | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/internal/entity/tag_entity.go b/internal/entity/tag_entity.go
index 4d934e2d..2aa4dbac 100644
--- a/internal/entity/tag_entity.go
+++ b/internal/entity/tag_entity.go
@@ -24,6 +24,7 @@ type Tag struct {
 	Recommend       bool      `xorm:"not null default false BOOL recommend"`
 	Reserved        bool      `xorm:"not null default false BOOL reserved"`
 	RevisionID      string    `xorm:"not null default 0 BIGINT(20) revision_id"`
+	UserID          string    `xorm:"not null default 0 BIGINT(20) user_id"`
 }
 
 // TableName tag table name
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index 10ae1a4a..ffb347bc 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -233,6 +233,7 @@ func (ts *TagService) UpdateTagSynonym(ctx context.Context, req *schema.UpdateTa
 		item.OriginalText = tag.OriginalText
 		item.ParsedText = tag.ParsedText
 		item.Status = entity.TagStatusAvailable
+		item.UserID = req.UserID
 		needAddTagList = append(needAddTagList, item)
 	}
 
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 0c720fc3..557b61d9 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -404,6 +404,7 @@ func (ts *TagCommonService) CheckTag(ctx context.Context, tags []string, userID
 		item.OriginalText = ""
 		item.ParsedText = ""
 		item.Status = entity.TagStatusAvailable
+		item.UserID = userID
 		addTagList = append(addTagList, item)
 		addTagMsgList = append(addTagMsgList, tag)
 	}
@@ -478,6 +479,7 @@ func (ts *TagCommonService) ObjectChangeTag(ctx context.Context, objectTagData *
 		item.OriginalText = tag.OriginalText
 		item.ParsedText = tag.ParsedText
 		item.Status = entity.TagStatusAvailable
+		item.UserID = objectTagData.UserID
 		addTagList = append(addTagList, item)
 	}
 

From 381c61d3120c115cb79ad248e95e792572c3b2f4 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 15:35:12 +0800
Subject: [PATCH 095/194] feat: tag add user id

---
 internal/migrations/v3.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index 651b6dd0..0f955e8d 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -95,5 +95,8 @@ func addActivityTimeline(x *xorm.Engine) error {
 		RevisionID       int64     `xorm:"not null default 0 BIGINT(20) revision_id"`
 		OriginalObjectID string    `xorm:"not null default 0 BIGINT(20) original_object_id"`
 	}
-	return x.Sync(new(Activity), new(Revision))
+	type Tag struct {
+		UserID string `xorm:"not null default 0 BIGINT(20) user_id"`
+	}
+	return x.Sync(new(Activity), new(Revision), new(Tag))
 }

From 7513a4412ee32d0df512a730c9908ef1f0569560 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 15:57:24 +0800
Subject: [PATCH 096/194] fix: remove is admin query condition

---
 internal/repo/user/user_repo.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.go
index fc18c46b..10324baa 100644
--- a/internal/repo/user/user_repo.go
+++ b/internal/repo/user/user_repo.go
@@ -122,7 +122,7 @@ func (ur *userRepo) UpdateInfo(ctx context.Context, userInfo *entity.User) (err
 // GetByUserID get user info by user id
 func (ur *userRepo) GetByUserID(ctx context.Context, userID string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("id = ?", userID).UseBool("is_admin").Get(userInfo)
+	exist, err = ur.data.DB.Where("id = ?", userID).Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -131,7 +131,7 @@ func (ur *userRepo) GetByUserID(ctx context.Context, userID string) (userInfo *e
 
 func (ur *userRepo) BatchGetByID(ctx context.Context, ids []string) ([]*entity.User, error) {
 	list := make([]*entity.User, 0)
-	err := ur.data.DB.In("id", ids).UseBool("is_admin").Find(&list)
+	err := ur.data.DB.In("id", ids).Find(&list)
 	if err != nil {
 		return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -141,7 +141,7 @@ func (ur *userRepo) BatchGetByID(ctx context.Context, ids []string) ([]*entity.U
 // GetByUsername get user by username
 func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("username = ?", username).UseBool("is_admin").Get(userInfo)
+	exist, err = ur.data.DB.Where("username = ?", username).Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -151,7 +151,7 @@ func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInf
 // GetByEmail get user by email
 func (ur *userRepo) GetByEmail(ctx context.Context, email string) (userInfo *entity.User, exist bool, err error) {
 	userInfo = &entity.User{}
-	exist, err = ur.data.DB.Where("e_mail = ?", email).UseBool("is_admin").Get(userInfo)
+	exist, err = ur.data.DB.Where("e_mail = ?", email).Get(userInfo)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}

From ad8dafd7aff5472a87eca89bcd3901019e9fcbf4 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 16:37:16 +0800
Subject: [PATCH 097/194] fix question questionPermission

---
 internal/controller/question_controller.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 7ab5deae..c2ee2e3d 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -255,9 +255,12 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	req.CanEdit = canList[0]
-	req.CanDelete = canList[1]
+	questionPermission := &schema.QuestionPermission{}
+	questionPermission.CanEdit = canList[0]
+	questionPermission.CanDelete = canList[1]
 	req.NoNeedReview = canList[2]
+	req.QuestionPermission = questionPermission
+
 	req.CanClose = middleware.GetIsAdminFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
 	if !req.CanEdit {

From 594f57112e1d77c6078e73476c4170644751e86f Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 16:43:00 +0800
Subject: [PATCH 098/194] =?UTF-8?q?fix:=20question=20permission=20set=20is?=
 =?UTF-8?q?=20struct=CB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/controller/question_controller.go | 8 +++-----
 internal/schema/question_schema.go         | 4 ++--
 internal/service/question_service.go       | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index c2ee2e3d..68995496 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -91,7 +91,7 @@ func (qc *QuestionController) CloseQuestion(ctx *gin.Context) {
 func (qc *QuestionController) GetQuestion(ctx *gin.Context) {
 	id := ctx.Query("id")
 	userID := middleware.GetLoginUserIDFromContext(ctx)
-	req := &schema.QuestionPermission{}
+	req := schema.QuestionPermission{}
 	canList, err := qc.rankService.CheckOperationPermissions(ctx, userID, []string{
 		rank.QuestionEditRank,
 		rank.QuestionDeleteRank,
@@ -255,11 +255,9 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	questionPermission := &schema.QuestionPermission{}
-	questionPermission.CanEdit = canList[0]
-	questionPermission.CanDelete = canList[1]
+	req.CanEdit = canList[0]
+	req.CanDelete = canList[1]
 	req.NoNeedReview = canList[2]
-	req.QuestionPermission = questionPermission
 
 	req.CanClose = middleware.GetIsAdminFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 313e399d..1c483a33 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -32,7 +32,7 @@ type QuestionAdd struct {
 	Tags []*TagItem `validate:"required,dive" json:"tags"`
 	// user id
 	UserID string `json:"-"`
-	*QuestionPermission
+	QuestionPermission
 }
 
 type QuestionPermission struct {
@@ -71,7 +71,7 @@ type QuestionUpdate struct {
 	UserID       string `json:"-"`
 	IsAdmin      bool   `json:"-"`
 	NoNeedReview bool   `json:"-"`
-	*QuestionPermission
+	QuestionPermission
 }
 
 type QuestionBaseInfo struct {
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 27434b1f..8ae2d1da 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -397,7 +397,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 
 // GetQuestion get question one
 func (qs *QuestionService) GetQuestion(ctx context.Context, questionID, userID string,
-	per *schema.QuestionPermission) (resp *schema.QuestionInfo, err error) {
+	per schema.QuestionPermission) (resp *schema.QuestionInfo, err error) {
 	question, err := qs.questioncommon.Info(ctx, questionID, userID)
 	if err != nil {
 		return
@@ -409,7 +409,7 @@ func (qs *QuestionService) GetQuestion(ctx context.Context, questionID, userID s
 
 // GetQuestionAndAddPV get question one
 func (qs *QuestionService) GetQuestionAndAddPV(ctx context.Context, questionID, loginUserID string,
-	per *schema.QuestionPermission) (
+	per schema.QuestionPermission) (
 	resp *schema.QuestionInfo, err error) {
 	err = qs.questioncommon.UpdataPv(ctx, questionID)
 	if err != nil {

From ceb0ee48c6197e217e927811e29b0c6846ebdc2a Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 16:49:53 +0800
Subject: [PATCH 099/194] fix: tag query condition is incorrect

---
 internal/service/tag/tag_service.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index ffb347bc..b301ca18 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -299,6 +299,7 @@ func (ts *TagService) UpdateTagSynonym(ctx context.Context, req *schema.UpdateTa
 func (ts *TagService) GetTagWithPage(ctx context.Context, req *schema.GetTagWithPageReq) (pageModel *pager.PageModel, err error) {
 	tag := &entity.Tag{}
 	_ = copier.Copy(tag, req)
+	tag.UserID = ""
 
 	page := req.Page
 	pageSize := req.PageSize

From dd5671d5f9949dc3d8e7862deb86a7a0b5ab5071 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 17:08:55 +0800
Subject: [PATCH 100/194] fix: Initializes the comment permission list

---
 internal/service/permission/comment_permission.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go
index a7510271..b841078f 100644
--- a/internal/service/permission/comment_permission.go
+++ b/internal/service/permission/comment_permission.go
@@ -38,6 +38,7 @@ func GetCommentPermission(ctx context.Context, userID string, creatorUserID stri
 // GetTagPermission get tag permission
 func GetTagPermission(ctx context.Context, canEdit, canDelete bool) (
 	actions []*schema.PermissionMemberAction) {
+	actions = make([]*schema.PermissionMemberAction, 0)
 	if canEdit {
 		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "edit",

From fee838665f6c84b8a889b215d538564d18dd1bab Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 17:14:24 +0800
Subject: [PATCH 101/194] fix: update comment use incorrect comment id

---
 internal/controller/comment_controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go
index 27cbe06c..b7a161e1 100644
--- a/internal/controller/comment_controller.go
+++ b/internal/controller/comment_controller.go
@@ -110,7 +110,7 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentEditRank, req.UserID)
+	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, rank.CommentEditRank, req.CommentID)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return

From 4a993e3847fd877db49df60989757c679e437594 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 25 Nov 2022 17:15:02 +0800
Subject: [PATCH 102/194] add notification

---
 cmd/answer/wire_gen.go                        |  4 +-
 .../controller/notification_controller.go     | 49 +++++++++++++++++--
 internal/schema/notification_schema.go        | 16 +++++-
 .../notification/notification_service.go      | 33 ++++++++++---
 .../revision_common/revision_service.go       |  8 +++
 5 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 217edea1..8ab960e5 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -182,8 +182,8 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	siteinfoController := controller.NewSiteinfoController(siteInfoCommonService)
 	notificationRepo := notification.NewNotificationRepo(dataData)
 	notificationCommon := notificationcommon.NewNotificationCommon(dataData, notificationRepo, userCommon, activityRepo, followRepo, objService)
-	notificationService := notification2.NewNotificationService(dataData, notificationRepo, notificationCommon)
-	notificationController := controller.NewNotificationController(notificationService)
+	notificationService := notification2.NewNotificationService(dataData, notificationRepo, notificationCommon, revisionService)
+	notificationController := controller.NewNotificationController(notificationService, rankService)
 	dashboardController := controller.NewDashboardController(dashboardService)
 	uploadController := controller.NewUploadController(uploaderService)
 	activityCommon := activity_common2.NewActivityCommon(activityRepo)
diff --git a/internal/controller/notification_controller.go b/internal/controller/notification_controller.go
index 7c3afdae..91422555 100644
--- a/internal/controller/notification_controller.go
+++ b/internal/controller/notification_controller.go
@@ -5,17 +5,25 @@ import (
 	"github.com/answerdev/answer/internal/base/middleware"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service/notification"
+	"github.com/answerdev/answer/internal/service/rank"
 	"github.com/gin-gonic/gin"
 )
 
 // NotificationController notification controller
 type NotificationController struct {
 	notificationService *notification.NotificationService
+	rankService         *rank.RankService
 }
 
 // NewNotificationController new controller
-func NewNotificationController(notificationService *notification.NotificationService) *NotificationController {
-	return &NotificationController{notificationService: notificationService}
+func NewNotificationController(
+	notificationService *notification.NotificationService,
+	rankService *rank.RankService,
+) *NotificationController {
+	return &NotificationController{
+		notificationService: notificationService,
+		rankService:         rankService,
+	}
 }
 
 // GetRedDot
@@ -28,8 +36,26 @@ func NewNotificationController(notificationService *notification.NotificationSer
 // @Success 200 {object} handler.RespBody
 // @Router /answer/api/v1/notification/status [get]
 func (nc *NotificationController) GetRedDot(ctx *gin.Context) {
+
+	req := &schema.GetRedDot{}
+
 	userID := middleware.GetLoginUserIDFromContext(ctx)
-	RedDot, err := nc.notificationService.GetRedDot(ctx, userID)
+	req.UserID = userID
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := nc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAuditRank,
+		rank.AnswerAuditRank,
+		rank.TagAuditRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanReviewQuestion = canList[0]
+	req.CanReviewAnswer = canList[1]
+	req.CanReviewTag = canList[2]
+
+	RedDot, err := nc.notificationService.GetRedDot(ctx, req)
 	handler.HandleResponse(ctx, err, RedDot)
 }
 
@@ -48,8 +74,21 @@ func (nc *NotificationController) ClearRedDot(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-	userID := middleware.GetLoginUserIDFromContext(ctx)
-	RedDot, err := nc.notificationService.ClearRedDot(ctx, userID, req.TypeStr)
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := nc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.QuestionAuditRank,
+		rank.AnswerAuditRank,
+		rank.TagAuditRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanReviewQuestion = canList[0]
+	req.CanReviewAnswer = canList[1]
+	req.CanReviewTag = canList[2]
+
+	RedDot, err := nc.notificationService.ClearRedDot(ctx, req)
 	handler.HandleResponse(ctx, err, RedDot)
 }
 
diff --git a/internal/schema/notification_schema.go b/internal/schema/notification_schema.go
index 6a8f470f..8688af37 100644
--- a/internal/schema/notification_schema.go
+++ b/internal/schema/notification_schema.go
@@ -27,6 +27,13 @@ type NotificationContent struct {
 	UpdateTime         int64          `json:"update_time"`
 }
 
+type GetRedDot struct {
+	CanReviewQuestion bool   `json:"-"`
+	CanReviewAnswer   bool   `json:"-"`
+	CanReviewTag      bool   `json:"-"`
+	UserID            string `json:"-"`
+}
+
 // NotificationMsg notification message
 type NotificationMsg struct {
 	// trigger notification user id
@@ -57,6 +64,8 @@ type ObjectInfo struct {
 type RedDot struct {
 	Inbox       int64 `json:"inbox"`
 	Achievement int64 `json:"achievement"`
+	Revision    int64 `json:"revision"`
+	CanRevision bool  `json:"can_revision"`
 }
 
 type NotificationSearch struct {
@@ -68,8 +77,11 @@ type NotificationSearch struct {
 }
 
 type NotificationClearRequest struct {
-	UserID  string `json:"-"`
-	TypeStr string `json:"type" form:"type"` // inbox achievement
+	UserID            string `json:"-"`
+	TypeStr           string `json:"type" form:"type"` // inbox achievement
+	CanReviewQuestion bool   `json:"-"`
+	CanReviewAnswer   bool   `json:"-"`
+	CanReviewTag      bool   `json:"-"`
 }
 
 type NotificationClearIDRequest struct {
diff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.go
index f0a9cc1f..17534f8c 100644
--- a/internal/service/notification/notification_service.go
+++ b/internal/service/notification/notification_service.go
@@ -11,6 +11,8 @@ import (
 	"github.com/answerdev/answer/internal/base/translator"
 	"github.com/answerdev/answer/internal/schema"
 	notficationcommon "github.com/answerdev/answer/internal/service/notification_common"
+	"github.com/answerdev/answer/internal/service/revision_common"
+	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/i18n"
 	"github.com/segmentfault/pacman/log"
 )
@@ -20,24 +22,28 @@ type NotificationService struct {
 	data               *data.Data
 	notificationRepo   notficationcommon.NotificationRepo
 	notificationCommon *notficationcommon.NotificationCommon
+	revisionService    *revision_common.RevisionService
 }
 
 func NewNotificationService(
 	data *data.Data,
 	notificationRepo notficationcommon.NotificationRepo,
 	notificationCommon *notficationcommon.NotificationCommon,
+	revisionService *revision_common.RevisionService,
+
 ) *NotificationService {
 	return &NotificationService{
 		data:               data,
 		notificationRepo:   notificationRepo,
 		notificationCommon: notificationCommon,
+		revisionService:    revisionService,
 	}
 }
 
-func (ns *NotificationService) GetRedDot(ctx context.Context, userID string) (*schema.RedDot, error) {
+func (ns *NotificationService) GetRedDot(ctx context.Context, req *schema.GetRedDot) (*schema.RedDot, error) {
 	redBot := &schema.RedDot{}
-	inboxKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeInbox, userID)
-	achievementKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeAchievement, userID)
+	inboxKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeInbox, req.UserID)
+	achievementKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeAchievement, req.UserID)
 	inboxValue, err := ns.data.Cache.GetInt64(ctx, inboxKey)
 	if err != nil {
 		redBot.Inbox = 0
@@ -50,19 +56,32 @@ func (ns *NotificationService) GetRedDot(ctx context.Context, userID string) (*s
 	} else {
 		redBot.Achievement = achievementValue
 	}
+	revisionCount := &schema.RevisionSearch{}
+	_ = copier.Copy(revisionCount, req)
+	if req.CanReviewAnswer || req.CanReviewQuestion || req.CanReviewTag {
+		redBot.CanRevision = true
+		revisionCountNum, err := ns.revisionService.GetUnreviewedRevisionCount(ctx, revisionCount)
+		if err != nil {
+			return redBot, err
+		}
+		redBot.Revision = revisionCountNum
+	}
+
 	return redBot, nil
 }
 
-func (ns *NotificationService) ClearRedDot(ctx context.Context, userID string, botTypeStr string) (*schema.RedDot, error) {
-	botType, ok := schema.NotificationType[botTypeStr]
+func (ns *NotificationService) ClearRedDot(ctx context.Context, req *schema.NotificationClearRequest) (*schema.RedDot, error) {
+	botType, ok := schema.NotificationType[req.TypeStr]
 	if ok {
-		key := fmt.Sprintf("answer_RedDot_%d_%s", botType, userID)
+		key := fmt.Sprintf("answer_RedDot_%d_%s", botType, req.UserID)
 		err := ns.data.Cache.Del(ctx, key)
 		if err != nil {
 			log.Error("ClearRedDot del cache error", err.Error())
 		}
 	}
-	return ns.GetRedDot(ctx, userID)
+	getRedDotreq := &schema.GetRedDot{}
+	_ = copier.Copy(getRedDotreq, req)
+	return ns.GetRedDot(ctx, getRedDotreq)
 }
 
 func (ns *NotificationService) ClearUnRead(ctx context.Context, userID string, botTypeStr string) error {
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index 4383d94c..13e4d5ef 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -26,6 +26,14 @@ func NewRevisionService(revisionRepo revision.RevisionRepo, userRepo usercommon.
 	}
 }
 
+func (rs *RevisionService) GetUnreviewedRevisionCount(ctx context.Context, req *schema.RevisionSearch) (count int64, err error) {
+	search := &entity.RevisionSearch{}
+	search.Page = 1
+	_ = copier.Copy(search, req)
+	_, count, err = rs.revisionRepo.SearchUnreviewedList(ctx, search)
+	return count, err
+}
+
 // AddRevision add revision
 //
 // autoUpdateRevisionID bool : if autoUpdateRevisionID is true , the object.revision_id will be updated,

From 079513e8b6f11969bfd0f228be7334cf2f179e2c Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Fri, 25 Nov 2022 17:55:13 +0800
Subject: [PATCH 103/194] feat(review): ready for testing

---
 i18n/en_US.yaml                               |   3 +
 ui/src/common/interface.ts                    |  34 ++-
 ui/src/components/DiffContent/index.tsx       |  21 +-
 .../Header/components/NavItems/index.tsx      |  13 +-
 ui/src/components/Operate/index.tsx           |  12 +-
 ui/src/components/Tag/index.tsx               |   5 +-
 ui/src/pages/Review/index.tsx                 | 249 ++++++++++++++----
 ui/src/pages/Search/components/Head/index.tsx |   5 +-
 ui/src/pages/Tags/Detail/index.tsx            |   9 +-
 ui/src/pages/Tags/Edit/index.tsx              |   4 +-
 ui/src/pages/Tags/Info/index.tsx              |  12 +-
 ui/src/router/pathFactory.ts                  |  28 ++
 ui/src/router/routes.ts                       |   1 -
 ui/src/services/client/index.ts               |   1 +
 ui/src/services/client/notification.ts        |   2 +-
 ui/src/services/client/revision.ts            |  31 +++
 16 files changed, 358 insertions(+), 72 deletions(-)
 create mode 100644 ui/src/router/pathFactory.ts
 create mode 100644 ui/src/services/client/revision.ts

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index e9b98f40..0f1a7311 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1190,6 +1190,9 @@ ui:
     answer_edit: Answer edit
     tag_edit: Tag edit
     edit_summary: Edit summary
+    edit_question: Edit question
+    edit_answer: Edit answer
+    edit_tag: Edit tag
     empty: No review tasks left.
   timeline:
     undeleted: undeleted
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 4d0d9bb3..4d6de991 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -157,6 +157,13 @@ export interface SetNoticeReq {
   notice_switch: boolean;
 }
 
+export interface NotificationStatus {
+  inbox: number;
+  achievement: number;
+  revision: number;
+  can_revision: boolean;
+}
+
 export interface QuestionDetailRes {
   id: string;
   title: string;
@@ -192,7 +199,6 @@ export interface AnswerItem {
   create_time: string;
   update_time: string;
   user_info: UserInfoBase;
-
   [prop: string]: any;
 }
 
@@ -406,3 +412,29 @@ export interface TimelineRes {
   object_info: TimelineObject;
   timeline: TimelineItem[];
 }
+
+export interface ReviewItem {
+  type: 'question' | 'answer' | 'tag';
+  info: {
+    object_id: string;
+    title: string;
+    content: string;
+    html: string;
+    tags: Tag[];
+  };
+  unreviewed_info: {
+    id: string;
+    use_id: string;
+    object_id: string;
+    title: string;
+    status: 0 | 1;
+    create_at: number;
+    user_info: UserInfoBase;
+    reason: string;
+    content: Tag | QuestionDetailRes | AnswerItem;
+  };
+}
+export interface ReviewResp {
+  count: number;
+  list: ReviewItem[];
+}
diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 77386664..36f87de2 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -4,13 +4,26 @@ import { Tag } from '@/components';
 import { diffText } from '@/utils';
 
 interface Props {
-  objectType: string;
+  objectType: string | 'question' | 'answer' | 'tag';
   newData: Record<string, any>;
   oldData?: Record<string, any>;
   className?: string;
+  opts?: Partial<{
+    showTitle: boolean;
+    showTagUrlSlug: boolean;
+  }>;
 }
 
-const Index: FC<Props> = ({ objectType, newData, oldData, className = '' }) => {
+const Index: FC<Props> = ({
+  objectType,
+  newData,
+  oldData,
+  className = '',
+  opts = {
+    showTitle: true,
+    showTagUrlSlug: true,
+  },
+}) => {
   if (!newData?.original_text) return null;
 
   let tag = newData.tags;
@@ -51,7 +64,7 @@ const Index: FC<Props> = ({ objectType, newData, oldData, className = '' }) => {
 
   return (
     <div className={className}>
-      {objectType !== 'answer' && (
+      {objectType !== 'answer' && opts?.showTitle && (
         <h5
           dangerouslySetInnerHTML={{
             __html: diffText(newData.title, oldData?.title),
@@ -73,7 +86,7 @@ const Index: FC<Props> = ({ objectType, newData, oldData, className = '' }) => {
           })}
         </div>
       )}
-      {objectType === 'tag' && (
+      {objectType === 'tag' && opts?.showTagUrlSlug && (
         <div className="mb-4">
           {`/tags/${
             newData?.main_tag_slug_name
diff --git a/ui/src/components/Header/components/NavItems/index.tsx b/ui/src/components/Header/components/NavItems/index.tsx
index 147d3d58..17a3a683 100644
--- a/ui/src/components/Header/components/NavItems/index.tsx
+++ b/ui/src/components/Header/components/NavItems/index.tsx
@@ -3,10 +3,11 @@ import { Nav, Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link, NavLink } from 'react-router-dom';
 
+import type * as Type from '@/common/interface';
 import { Avatar, Icon } from '@/components';
 
 interface Props {
-  redDot;
+  redDot: Type.NotificationStatus | undefined;
   userInfo;
   logOut: () => void;
 }
@@ -56,10 +57,14 @@ const Index: FC<Props> = ({ redDot, userInfo, logOut }) => {
           {userInfo?.is_admin ? (
             <Dropdown.Item href="/admin">{t('header.nav.admin')}</Dropdown.Item>
           ) : null}
-          {/* TODO: use review permission */}
-          {userInfo?.is_admin ? (
-            <Dropdown.Item href="/review">
+          {redDot?.can_revision ? (
+            <Dropdown.Item href="/review" className="position-relative">
               {t('header.nav.review')}
+              {redDot?.revision > 0 && (
+                <span className="position-absolute top-50 translate-middle-y end-0 me-3 p-2 bg-danger border border-light rounded-circle">
+                  <span className="visually-hidden">New Review</span>
+                </span>
+              )}
             </Dropdown.Item>
           ) : null}
           <Dropdown.Divider />
diff --git a/ui/src/components/Operate/index.tsx b/ui/src/components/Operate/index.tsx
index cdacc751..da27b7f4 100644
--- a/ui/src/components/Operate/index.tsx
+++ b/ui/src/components/Operate/index.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Modal } from '@/components';
 import { useReportModal, useToast } from '@/hooks';
 import Share from '../Share';
-import { deleteQuestion, deleteAnswer } from '@/services';
+import { deleteQuestion, deleteAnswer, editCheck } from '@/services';
 import { tryNormalLogged } from '@/utils/guard';
 
 interface IProps {
@@ -96,6 +96,15 @@ const Index: FC<IProps> = ({
       });
     }
   };
+  const handleEdit = async (evt) => {
+    let checkObjectId = qid;
+    if (type === 'answer') {
+      checkObjectId = aid;
+    }
+    editCheck(checkObjectId).catch(() => {
+      evt.preventDefault();
+    });
+  };
 
   const handleAction = (action) => {
     if (!tryNormalLogged(true)) {
@@ -124,6 +133,7 @@ const Index: FC<IProps> = ({
               key={item.action}
               to={editUrl}
               className="link-secondary p-0 fs-14 me-3"
+              onClick={handleEdit}
               style={{ lineHeight: '23px' }}>
               {item.name}
             </Link>
diff --git a/ui/src/components/Tag/index.tsx b/ui/src/components/Tag/index.tsx
index 2891232f..64e9f25b 100644
--- a/ui/src/components/Tag/index.tsx
+++ b/ui/src/components/Tag/index.tsx
@@ -3,6 +3,7 @@ import React, { memo, FC } from 'react';
 import classNames from 'classnames';
 
 import { Tag } from '@/common/interface';
+import { pathFactory } from '@/router/pathFactory';
 
 interface IProps {
   data: Tag;
@@ -17,9 +18,7 @@ const Index: FC<IProps> = ({
   className = '',
   textClassName = '',
 }) => {
-  href ||= `/tags/${encodeURIComponent(
-    data.main_tag_slug_name || data.slug_name,
-  )}`.toLowerCase();
+  href ||= pathFactory.tagLanding(data);
 
   return (
     <a
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 6bb008ea..54e295e0 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { FC, useEffect, useState } from 'react';
 import {
   Container,
   Row,
@@ -11,61 +11,218 @@ import {
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
-import { BaseUserCard, FormatTime, Empty } from '@/components';
-import { loggedUserInfoStore } from '@/stores';
+import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
+import { useReviewList, revisionAudit } from '@/services';
+import { pathFactory } from '@/router/pathFactory';
+import type * as Type from '@/common/interface';
 
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [isLoading, setIsLoading] = useState(false);
+  const [noTasks, setNoTasks] = useState(false);
+  const [page, setPage] = useState(1);
+  const { data: reviewResp, mutate: mutateList } = useReviewList(page);
+  const ro = reviewResp?.list[0];
+  const { info, type, unreviewed_info } = ro || {
+    info: null,
+    type: '',
+    unreviewed_info: null,
+  };
+  const reviewInfo = unreviewed_info?.content;
+  const mutateNextPage = () => {
+    const count = reviewResp?.count;
+    if (count && page < count) {
+      setPage(page + 1);
+    } else {
+      setNoTasks(true);
+    }
+  };
+  const handlingSkip = () => {
+    mutateNextPage();
+  };
+  const handlingApprove = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'approve')
+      .then(() => {
+        mutateList();
+      })
+      .catch((ex) => {
+        console.log('ex: ', ex);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+  const handlingReject = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'reject')
+      .then(() => {
+        mutateList();
+      })
+      .catch((ex) => {
+        console.log('ex: ', ex);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
 
-  const { user } = loggedUserInfoStore.getState();
+  let itemLink = '';
+  let itemTitle = '';
+  let editBadge = '';
+  let editSummary = unreviewed_info?.reason;
+  const editor = unreviewed_info?.user_info;
+  const editTime = unreviewed_info?.create_at;
+  if (type === 'question') {
+    itemLink = pathFactory.questionLanding(info?.object_id);
+    itemTitle = info?.title;
+    editBadge = t('question_edit');
+    editSummary ||= t('edit_question');
+  } else if (type === 'answer') {
+    itemLink = pathFactory.answerLanding(
+      // @ts-ignore
+      unreviewed_info.content.question_id,
+      unreviewed_info.object_id,
+    );
+    itemTitle = info?.title;
+    editBadge = t('answer_edit');
+    editSummary ||= t('edit_answer');
+  } else if (type === 'tag') {
+    const tagInfo = unreviewed_info.content as Type.Tag;
+    itemLink = pathFactory.tagLanding(tagInfo);
+    itemTitle = tagInfo.display_name;
+    editBadge = t('tag_edit');
+    editSummary ||= t('edit_tag');
+  }
+  useEffect(() => {
+    if (!reviewResp) {
+      return;
+    }
+    window.scrollTo({ top: 0 });
+    if (!reviewResp.list || !reviewResp.list.length) {
+      setNoTasks(true);
+    }
+  }, [reviewResp]);
   return (
     <Container className="pt-2 mt-4 mb-5">
       <Row>
         <Col lg={{ span: 7, offset: 1 }}>
           <h3 className="mb-4">{t('review')}</h3>
-          <Alert variant="secondary">
-            <Stack className="align-items-start">
-              <Badge bg="secondary" className="mb-2">
-                {t('question_edit')}
-              </Badge>
-              <Link to="/review">
-                How do I test whether variable against multiple
-              </Link>
-              <p className="mb-0">
-                {t('edit_summary')}: Editing part of the code and correcting the
-                grammar.
-              </p>
-            </Stack>
-            <Stack
-              direction="horizontal"
-              gap={1}
-              className="align-items-baseline mt-2">
-              <BaseUserCard data={user} avatarSize="24" />
-              <FormatTime
-                time={Date.now()}
-                className="small text-secondary"
-                preFix={t('proposed')}
-              />
-            </Stack>
-          </Alert>
-        </Col>
-        <Col lg={{ span: 7, offset: 1 }}>Content</Col>
-        <Col lg={{ span: 7, offset: 1 }}>
-          <Stack direction="horizontal" gap={2}>
-            <Button variant="outline-primary">
-              {t('approve', { keyPrefix: 'btns' })}
-            </Button>
-            <Button variant="outline-primary">
-              {t('reject', { keyPrefix: 'btns' })}
-            </Button>
-            <Button variant="outline-primary">
-              {t('skip', { keyPrefix: 'btns' })}
-            </Button>
-          </Stack>
-        </Col>
-        <Col lg={{ span: 7, offset: 1 }}>
-          <Empty>{t('empty')}</Empty>
         </Col>
+        {!noTasks && ro && (
+          <>
+            <Col lg={{ span: 7, offset: 1 }}>
+              <Alert variant="secondary">
+                <Stack className="align-items-start">
+                  <Badge bg="secondary" className="mb-2">
+                    {editBadge}
+                  </Badge>
+                  <Link to={itemLink} target="_blank">
+                    {itemTitle}
+                  </Link>
+                  <p className="mb-0">
+                    {t('edit_summary')}: {editSummary}
+                  </p>
+                </Stack>
+                <Stack
+                  direction="horizontal"
+                  gap={1}
+                  className="align-items-baseline mt-2">
+                  <BaseUserCard data={editor} avatarSize="24" />
+                  {editTime && (
+                    <FormatTime
+                      time={editTime}
+                      className="small text-secondary"
+                      preFix={t('proposed')}
+                    />
+                  )}
+                </Stack>
+              </Alert>
+            </Col>
+            <Col lg={{ span: 7, offset: 1 }}>
+              {type === 'question' &&
+                info &&
+                reviewInfo &&
+                'content' in reviewInfo && (
+                  <DiffContent
+                    className="mt-2"
+                    objectType={type}
+                    oldData={{
+                      title: info.title,
+                      original_text: info.content,
+                      tags: info.tags,
+                    }}
+                    newData={{
+                      title: reviewInfo.title,
+                      original_text: reviewInfo.content,
+                      tags: reviewInfo.tags,
+                    }}
+                  />
+                )}
+              {type === 'answer' &&
+                info &&
+                reviewInfo &&
+                'content' in reviewInfo && (
+                  <DiffContent
+                    className="mt-2"
+                    objectType={type}
+                    newData={{
+                      original_text: reviewInfo.content,
+                    }}
+                    oldData={{
+                      original_text: info.content,
+                    }}
+                  />
+                )}
+              {type === 'tag' && info && reviewInfo && (
+                <DiffContent
+                  className="mt-2"
+                  objectType={type}
+                  newData={{
+                    original_text: reviewInfo.original_text,
+                  }}
+                  oldData={{
+                    original_text: info.content,
+                  }}
+                  opts={{ showTitle: false, showTagUrlSlug: false }}
+                />
+              )}
+            </Col>
+            <Col lg={{ span: 7, offset: 1 }}>
+              <Stack direction="horizontal" gap={2} className="mt-4">
+                <Button
+                  variant="outline-primary"
+                  disabled={isLoading}
+                  onClick={handlingApprove}>
+                  {t('approve', { keyPrefix: 'btns' })}
+                </Button>
+                <Button
+                  variant="outline-primary"
+                  disabled={isLoading}
+                  onClick={handlingReject}>
+                  {t('reject', { keyPrefix: 'btns' })}
+                </Button>
+                <Button
+                  variant="outline-primary"
+                  disabled={isLoading}
+                  onClick={handlingSkip}>
+                  {t('skip', { keyPrefix: 'btns' })}
+                </Button>
+              </Stack>
+            </Col>
+          </>
+        )}
+        {noTasks && (
+          <Col lg={{ span: 7, offset: 1 }}>
+            <Empty>{t('empty')}</Empty>
+          </Col>
+        )}
       </Row>
     </Container>
   );
diff --git a/ui/src/pages/Search/components/Head/index.tsx b/ui/src/pages/Search/components/Head/index.tsx
index 260ecc65..ec1d1dc4 100644
--- a/ui/src/pages/Search/components/Head/index.tsx
+++ b/ui/src/pages/Search/components/Head/index.tsx
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { following } from '@/services';
 import { tryNormalLogged } from '@/utils/guard';
 import { escapeRemove } from '@/utils';
+import { pathFactory } from '@/router/pathFactory';
 
 interface Props {
   data;
@@ -53,7 +54,9 @@ const Index: FC<Props> = ({ data }) => {
           {data.excerpt && (
             <p className="text-break">
               {escapeRemove(data.excerpt)}
-              <Link to={`/tags/${data.slug_name}/info`}> [{t('more')}]</Link>
+              <Link className="ms-1" to={pathFactory.tagInfo(data.slug_name)}>
+                [{t('more')}]
+              </Link>
             </p>
           )}
 
diff --git a/ui/src/pages/Tags/Detail/index.tsx b/ui/src/pages/Tags/Detail/index.tsx
index c49e1ebd..1c32621a 100644
--- a/ui/src/pages/Tags/Detail/index.tsx
+++ b/ui/src/pages/Tags/Detail/index.tsx
@@ -9,6 +9,7 @@ import { useTagInfo, useFollow } from '@/services';
 import QuestionList from '@/components/QuestionList';
 import HotQuestions from '@/components/HotQuestions';
 import { escapeRemove } from '@/utils';
+import { pathFactory } from '@/router/pathFactory';
 
 const Questions: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'tags' });
@@ -30,7 +31,7 @@ const Questions: FC = () => {
     if (tagResp) {
       const info = { ...tagResp };
       if (info.main_tag_slug_name) {
-        navigate(`/tags/${info.main_tag_slug_name}`, { replace: true });
+        navigate(pathFactory.tagLanding(info), { replace: true });
         return;
       }
       if (followResp) {
@@ -62,7 +63,7 @@ const Questions: FC = () => {
             <div className="tag-box mb-5">
               <h3 className="mb-3">
                 <Link
-                  to={`/tags/${tagInfo?.slug_name}`}
+                  to={pathFactory.tagLanding(tagInfo)}
                   replace
                   className="link-dark">
                   {tagInfo.display_name}
@@ -71,9 +72,7 @@ const Questions: FC = () => {
 
               <p className="text-break">
                 {escapeRemove(tagInfo.excerpt) || t('no_description')}
-                <Link
-                  to={`/tags/${encodeURIComponent(curTagName)}/info`}
-                  className="ms-1">
+                <Link to={pathFactory.tagInfo(curTagName)} className="ms-1">
                   [{t('more')}]
                 </Link>
               </p>
diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx
index e01225e7..c3612768 100644
--- a/ui/src/pages/Tags/Edit/index.tsx
+++ b/ui/src/pages/Tags/Edit/index.tsx
@@ -175,7 +175,7 @@ const Ask = () => {
                 <Form.Control
                   value={formData.displayName.value}
                   isInvalid={formData.displayName.isInvalid}
-                  disabled={is_admin}
+                  disabled={!is_admin}
                   onChange={handleDisplayNameChange}
                 />
 
@@ -188,7 +188,7 @@ const Ask = () => {
                 <Form.Control
                   value={formData.slugName.value}
                   isInvalid={formData.slugName.isInvalid}
-                  disabled={is_admin}
+                  disabled={!is_admin}
                   onChange={handleSlugNameChange}
                 />
                 <Form.Text as="div">
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index 6477030a..f9430280 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -11,7 +11,9 @@ import {
   useQuerySynonymsTags,
   saveSynonymsTags,
   deleteTag,
+  editCheck,
 } from '@/services';
+import { pathFactory } from '@/router/pathFactory';
 import { loggedUserInfoStore } from '@/stores';
 
 const TagIntroduction = () => {
@@ -27,7 +29,9 @@ const TagIntroduction = () => {
     return null;
   }
   if (tagInfo.main_tag_slug_name) {
-    navigate(`/tags/${tagInfo.main_tag_slug_name}/info`, { replace: true });
+    navigate(pathFactory.tagInfo(tagInfo.main_tag_slug_name), {
+      replace: true,
+    });
     return null;
   }
   const handleEdit = () => {
@@ -51,7 +55,9 @@ const TagIntroduction = () => {
   };
 
   const handleEditTag = () => {
-    navigate(`/tags/${tagInfo?.tag_id}/edit`);
+    editCheck(tagInfo?.tag_id).then(() => {
+      navigate(pathFactory.tagEdit(tagInfo?.tag_id));
+    });
   };
   const handleDeleteTag = () => {
     if (synonymsTags && synonymsTags.length > 0) {
@@ -93,7 +99,7 @@ const TagIntroduction = () => {
           <Col xxl={7} lg={8} sm={12}>
             <h3 className="mb-3">
               <Link
-                to={`/tags/${tagInfo?.slug_name}`}
+                to={pathFactory.tagLanding(tagInfo)}
                 replace
                 className="link-dark">
                 {tagInfo.display_name}
diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.ts
new file mode 100644
index 00000000..6d2725ce
--- /dev/null
+++ b/ui/src/router/pathFactory.ts
@@ -0,0 +1,28 @@
+import type * as Type from '@/common/interface';
+
+const tagLanding = (tag: Type.Tag) => {
+  let slugName = tag.main_tag_slug_name || tag.slug_name || '';
+  slugName = slugName.toLowerCase();
+  return `/tags/${encodeURIComponent(slugName)}`;
+};
+const tagInfo = (slugName: string) => {
+  slugName = slugName.toLowerCase();
+  return `/tags/${encodeURIComponent(slugName)}/info`;
+};
+const tagEdit = (tagId: string) => {
+  return `/tags/${tagId}/edit`;
+};
+const questionLanding = (question_id: string) => {
+  return `/questions/${question_id}`;
+};
+const answerLanding = (question_id: string, answer_id: string) => {
+  return `/questions/${question_id}/${answer_id}`;
+};
+
+export const pathFactory = {
+  tagLanding,
+  tagInfo,
+  tagEdit,
+  questionLanding,
+  answerLanding,
+};
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index d797be8b..04daf448 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -192,7 +192,6 @@ const routes: RouteNode[] = [
       {
         path: '/users/confirm-new-email',
         page: 'pages/Users/ConfirmNewEmail',
-        //  TODO: guard this
       },
       {
         path: '/users/account-suspended',
diff --git a/ui/src/services/client/index.ts b/ui/src/services/client/index.ts
index a9b3b8b3..33756e76 100644
--- a/ui/src/services/client/index.ts
+++ b/ui/src/services/client/index.ts
@@ -7,3 +7,4 @@ export * from './tag';
 export * from './settings';
 export * from './legal';
 export * from './timeline';
+export * from './revision';
diff --git a/ui/src/services/client/notification.ts b/ui/src/services/client/notification.ts
index c4e535c8..b499bbda 100644
--- a/ui/src/services/client/notification.ts
+++ b/ui/src/services/client/notification.ts
@@ -32,7 +32,7 @@ export const readNotification = (id) => {
 export const useQueryNotificationStatus = () => {
   const apiUrl = '/answer/api/v1/notification/status';
 
-  return useSWR<{ inbox: number; achievement: number }>(
+  return useSWR<Type.NotificationStatus>(
     tryLoggedAndActivated().ok ? apiUrl : null,
     request.instance.get,
     {
diff --git a/ui/src/services/client/revision.ts b/ui/src/services/client/revision.ts
new file mode 100644
index 00000000..28110ae9
--- /dev/null
+++ b/ui/src/services/client/revision.ts
@@ -0,0 +1,31 @@
+import useSWR from 'swr';
+
+import request from '@/utils/request';
+import * as Type from '@/common/interface';
+
+export const editCheck = (id: string) => {
+  const apiUrl = `/answer/api/v1/revisions/edit/check?id=${id}`;
+  return request.get(apiUrl);
+};
+
+export const revisionAudit = (id: string, operation: 'approve' | 'reject') => {
+  const apiUrl = `/answer/api/v1/revisions/audit`;
+  return request.put(apiUrl, {
+    id,
+    operation,
+  });
+};
+
+export const useReviewList = (page: number) => {
+  const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
+  const { data, error, mutate } = useSWR<Type.ReviewResp, Error>(
+    apiUrl,
+    request.instance.get,
+  );
+  return {
+    data,
+    isLoading: !data && !error,
+    error,
+    mutate,
+  };
+};

From 820d87e318bffb9558af65de1c841469971ebbd0 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 25 Nov 2022 18:35:35 +0800
Subject: [PATCH 104/194] feat: Added a vote reputation limit

---
 cmd/answer/wire_gen.go                 |  2 +-
 go.mod                                 |  2 +
 go.sum                                 |  2 +
 internal/controller/vote_controller.go | 34 +++++++++++++---
 internal/schema/vote_schema.go         |  1 +
 internal/service/rank/rank_service.go  | 54 +++++++++++++++++++++++++-
 6 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go
index 8ab960e5..a48ecaf2 100644
--- a/cmd/answer/wire_gen.go
+++ b/cmd/answer/wire_gen.go
@@ -135,7 +135,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	reportController := controller.NewReportController(reportService, rankService)
 	serviceVoteRepo := activity.NewVoteRepo(dataData, uniqueIDRepo, configRepo, activityRepo, userRankRepo, voteRepo)
 	voteService := service.NewVoteService(serviceVoteRepo, uniqueIDRepo, configRepo, questionRepo, answerRepo, commentCommonRepo, objService)
-	voteController := controller.NewVoteController(voteService)
+	voteController := controller.NewVoteController(voteService, rankService)
 	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
 	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService)
 	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
diff --git a/go.mod b/go.mod
index 95796a93..13bd9f47 100644
--- a/go.mod
+++ b/go.mod
@@ -65,6 +65,7 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/subcommands v1.0.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -105,6 +106,7 @@ require (
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/image v0.1.0 // indirect
+	golang.org/x/mod v0.6.0 // indirect
 	golang.org/x/sys v0.1.0 // indirect
 	golang.org/x/text v0.4.0 // indirect
 	golang.org/x/tools v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index f12aeb7a..8bfba639 100644
--- a/go.sum
+++ b/go.sum
@@ -284,6 +284,7 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
 github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -779,6 +780,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
+golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.go
index 7fcdf232..21783c86 100644
--- a/internal/controller/vote_controller.go
+++ b/internal/controller/vote_controller.go
@@ -3,20 +3,24 @@ package controller
 import (
 	"github.com/answerdev/answer/internal/base/handler"
 	"github.com/answerdev/answer/internal/base/middleware"
+	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
+	"github.com/answerdev/answer/internal/service/rank"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/copier"
+	"github.com/segmentfault/pacman/errors"
 )
 
 // VoteController activity controller
 type VoteController struct {
 	VoteService *service.VoteService
+	rankService *rank.RankService
 }
 
 // NewVoteController new controller
-func NewVoteController(voteService *service.VoteService) *VoteController {
-	return &VoteController{VoteService: voteService}
+func NewVoteController(voteService *service.VoteService, rankService *rank.RankService) *VoteController {
+	return &VoteController{VoteService: voteService, rankService: rankService}
 }
 
 // VoteUp godoc
@@ -34,9 +38,19 @@ func (vc *VoteController) VoteUp(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	can, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, true)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+
 	dto := &schema.VoteDTO{}
 	_ = copier.Copy(dto, req)
-	dto.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	resp, err := vc.VoteService.VoteUp(ctx, dto)
 	if err != nil {
 		handler.HandleResponse(ctx, err, schema.ErrTypeToast)
@@ -60,10 +74,20 @@ func (vc *VoteController) VoteDown(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
+
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	can, err := vc.rankService.CheckVotePermission(ctx, req.UserID, req.ObjectID, false)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+
 	dto := &schema.VoteDTO{}
 	_ = copier.Copy(dto, req)
-
-	dto.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	resp, err := vc.VoteService.VoteDown(ctx, dto)
 	if err != nil {
 		handler.HandleResponse(ctx, err, schema.ErrTypeToast)
diff --git a/internal/schema/vote_schema.go b/internal/schema/vote_schema.go
index ec37ebc8..8a17666f 100644
--- a/internal/schema/vote_schema.go
+++ b/internal/schema/vote_schema.go
@@ -3,6 +3,7 @@ package schema
 type VoteReq struct {
 	ObjectID string `validate:"required" form:"object_id" json:"object_id"`  //	 id
 	IsCancel bool   `validate:"omitempty" form:"is_cancel" json:"is_cancel"` // is cancel
+	UserID   string `json:"-"`
 }
 
 type VoteDTO struct {
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 7e828d20..22bae247 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -3,6 +3,7 @@ package rank
 import (
 	"context"
 
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/pager"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
@@ -75,7 +76,7 @@ func NewRankService(
 	}
 }
 
-// CheckOperationPermission verify that the user has operation
+// CheckOperationPermission verify that the user has permission
 func (rs *RankService) CheckOperationPermission(ctx context.Context, userID string, action string, objectID string) (
 	can bool, err error) {
 	if len(userID) == 0 {
@@ -110,7 +111,7 @@ func (rs *RankService) CheckOperationPermission(ctx context.Context, userID stri
 	return rs.checkUserRank(ctx, userInfo.ID, userInfo.Rank, action)
 }
 
-// CheckOperationPermissions verify that the user has operation
+// CheckOperationPermissions verify that the user has permission
 func (rs *RankService) CheckOperationPermissions(ctx context.Context, userID string, actions []string, objectID string) (
 	can []bool, err error) {
 	can = make([]bool, len(actions))
@@ -154,6 +155,55 @@ func (rs *RankService) CheckOperationPermissions(ctx context.Context, userID str
 	return can, nil
 }
 
+// CheckVotePermission verify that the user has vote permission
+func (rs *RankService) CheckVotePermission(ctx context.Context, userID, objectID string, voteUp bool) (
+	can bool, err error) {
+	if len(userID) == 0 || len(objectID) == 0 {
+		return false, nil
+	}
+
+	// get the rank of the current user
+	userInfo, exist, err := rs.userCommon.GetUserBasicInfoByID(ctx, userID)
+	if err != nil {
+		return can, err
+	}
+	if !exist {
+		return can, nil
+	}
+
+	objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
+	if err != nil {
+		return can, err
+	}
+
+	action := ""
+	switch objectInfo.ObjectType {
+	case constant.QuestionObjectType:
+		if voteUp {
+			action = QuestionVoteUpRank
+		} else {
+			action = QuestionVoteDownRank
+		}
+	case constant.AnswerObjectType:
+		if voteUp {
+			action = AnswerVoteUpRank
+		} else {
+			action = AnswerVoteDownRank
+		}
+	case constant.CommentObjectType:
+		if voteUp {
+			action = CommentVoteUpRank
+		} else {
+			action = CommentVoteDownRank
+		}
+	}
+	meetRank, err := rs.checkUserRank(ctx, userInfo.ID, userInfo.Rank, action)
+	if err != nil {
+		log.Error(err)
+	}
+	return meetRank, nil
+}
+
 // CheckRankPermission verify that the user meets the prestige criteria
 func (rs *RankService) checkUserRank(ctx context.Context, userID string, userRank int, action string) (
 	can bool, err error) {

From 3f910b76a2c8947bf5352d0d6a8fba1add2e4f8f Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 28 Nov 2022 14:32:50 +0800
Subject: [PATCH 105/194] fix(footer): use the official website url of answer.
 #1321

---
 ui/src/components/Footer/index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsx
index 916fe094..d7664e85 100644
--- a/ui/src/components/Footer/index.tsx
+++ b/ui/src/components/Footer/index.tsx
@@ -9,7 +9,10 @@ const Index = () => {
         <p className="text-center mb-0 fs-14 text-secondary">
           <Trans i18nKey="footer.build_on">
             Built on
-            <a href="/"> Answer </a>
+            {/* eslint-disable-next-line react/jsx-no-target-blank */}
+            <a href="https://answer.dev/" target="_blank">
+              Answer
+            </a>
             - the open-source software that powers Q&A communities.
             <br />
             Made with love. © 2022 Answer .

From a6ace8b38dd4fc4c20ea7ee6f6e8c6b81e83dbd6 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 28 Nov 2022 16:00:29 +0800
Subject: [PATCH 106/194] feat: add change user role modal

---
 i18n/en_US.yaml                               |  19 ++
 ui/src/common/interface.ts                    |   7 +-
 ui/src/components/BaseUserCard/index.tsx      |   6 +-
 ui/src/hooks/index.ts                         |   2 +
 ui/src/hooks/useChangeUserRoleModal/index.tsx | 194 ++++++++++++++++++
 ui/src/pages/Admin/Users/index.tsx            |  64 +++++-
 6 files changed, 278 insertions(+), 14 deletions(-)
 create mode 100644 ui/src/hooks/useChangeUserRoleModal/index.tsx

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index e9b98f40..77a0e33b 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1018,6 +1018,19 @@ ui:
       btn_cancel: Cancel
       btn_submit: Submit
       btn_next: Next
+    user_role_modal:
+      title: Change user role to...
+      btn_cancel: Cancel
+      btn_submit: Submit
+      user:
+        name: User
+        description: Default with no special access.
+      admin:
+        name: Admin
+        description: Have the full power to access the site.
+      moderator:
+        name: Moderator
+        description: Has access to all posts except admin settings.
     users:
       title: Users
       name: Name
@@ -1027,15 +1040,21 @@ ui:
       delete_at: Deleted Time
       suspend_at: Suspended Time
       status: Status
+      role: Role
       action: Action
       change: Change
       all: All
+      staff: Staff
       inactive: Inactive
       suspended: Suspended
       deleted: Deleted
       normal: Normal
       filter:
         placeholder: "Filter by name, user:id"
+      set_new_password: Set new password
+      change_status: Change status
+      change_role: Change role
+      show_logs: Show logs
     questions:
       page_title: Questions
       normal: Normal
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 4d0d9bb3..a3271e2c 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -246,7 +246,12 @@ export type AdminAnswerStatus = 'available' | 'deleted';
 /**
  * @description interface for Users
  */
-export type UserFilterBy = 'all' | 'inactive' | 'suspended' | 'deleted';
+export type UserFilterBy =
+  | 'all'
+  | 'staff'
+  | 'inactive'
+  | 'suspended'
+  | 'deleted';
 
 /**
  * @description interface for Flags
diff --git a/ui/src/components/BaseUserCard/index.tsx b/ui/src/components/BaseUserCard/index.tsx
index f1eb54b6..f729b3d6 100644
--- a/ui/src/components/BaseUserCard/index.tsx
+++ b/ui/src/components/BaseUserCard/index.tsx
@@ -11,11 +11,13 @@ interface Props {
   showReputation?: boolean;
   avatarSearchStr?: string;
   className?: string;
+  avatarClass?: string;
 }
 
 const Index: FC<Props> = ({
   data,
   showAvatar = true,
+  avatarClass = '',
   avatarSize = '20px',
   className = 'fs-14',
   avatarSearchStr = 's=48',
@@ -29,7 +31,7 @@ const Index: FC<Props> = ({
             <Avatar
               avatar={data?.avatar}
               size={avatarSize}
-              className="me-1"
+              className={`me-1 ${avatarClass}`}
               searchStr={avatarSearchStr}
             />
           )}
@@ -41,7 +43,7 @@ const Index: FC<Props> = ({
             <Avatar
               avatar={data?.avatar}
               size={avatarSize}
-              className="me-1"
+              className={`me-1 ${avatarClass}`}
               searchStr={avatarSearchStr}
             />
           )}
diff --git a/ui/src/hooks/index.ts b/ui/src/hooks/index.ts
index 6b6bb5a9..eaff57de 100644
--- a/ui/src/hooks/index.ts
+++ b/ui/src/hooks/index.ts
@@ -4,6 +4,7 @@ import useReportModal from './useReportModal';
 import usePageUsers from './usePageUsers';
 import useChangeModal from './useChangeModal';
 import useEditStatusModal from './useEditStatusModal';
+import useChangeUserRoleModal from './useChangeUserRoleModal';
 
 export {
   useTagModal,
@@ -12,4 +13,5 @@ export {
   usePageUsers,
   useChangeModal,
   useEditStatusModal,
+  useChangeUserRoleModal,
 };
diff --git a/ui/src/hooks/useChangeUserRoleModal/index.tsx b/ui/src/hooks/useChangeUserRoleModal/index.tsx
new file mode 100644
index 00000000..ef3b5edb
--- /dev/null
+++ b/ui/src/hooks/useChangeUserRoleModal/index.tsx
@@ -0,0 +1,194 @@
+import { useLayoutEffect, useState } from 'react';
+import { Modal, Form, Button, FormCheck } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import ReactDOM from 'react-dom/client';
+
+import { Modal as AnswerModal } from '@/components';
+import { changeUserStatus } from '@/services';
+
+const div = document.createElement('div');
+const root = ReactDOM.createRoot(div);
+
+interface Props {
+  callback?: () => void;
+}
+
+const useChangeUserRoleModal = ({ callback }: Props) => {
+  const { t } = useTranslation('translation', {
+    keyPrefix: 'admin.user_role_modal',
+  });
+  const [id, setId] = useState('');
+  const [defaultType, setDefaultType] = useState('');
+  const [isInvalid, setInvalidState] = useState(false);
+  const [changeType, setChangeType] = useState({
+    type: '',
+    haveContent: false,
+  });
+  const [content, setContent] = useState({
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  });
+  const [show, setShow] = useState(false);
+  const [list] = useState<any[]>([
+    {
+      type: 'user',
+      name: t('user.name'),
+      description: t('user.description'),
+    },
+    {
+      type: 'admin',
+      name: t('admin.name'),
+      description: t('admin.description'),
+    },
+    {
+      type: 'moderator',
+      name: t('moderator.name'),
+      description: t('moderator.description'),
+    },
+  ]);
+
+  const handleRadio = (val) => {
+    setInvalidState(false);
+    setContent({
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    });
+    setChangeType({
+      type: val.type,
+      haveContent: val.have_content,
+    });
+  };
+
+  const onClose = () => {
+    setChangeType({
+      type: '',
+      haveContent: false,
+    });
+    setContent({
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    });
+    setContent({
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    });
+    setShow(false);
+  };
+
+  const handleSubmit = () => {
+    if (changeType.type === '') {
+      setInvalidState(true);
+      return;
+    }
+    if (changeType.haveContent && !content.value) {
+      setContent({
+        value: content.value,
+        isInvalid: true,
+        errorMsg: t('remark.empty'),
+      });
+      return;
+    }
+    if (defaultType === changeType.type) {
+      onClose();
+
+      return;
+    }
+    if (changeType.type === 'deleted') {
+      onClose();
+
+      AnswerModal.confirm({
+        title: t('confirm_title'),
+        content: t('confirm_content'),
+        confirmText: t('confirm_btn'),
+        confirmBtnVariant: 'danger',
+        onConfirm: () => {
+          changeUserStatus({
+            user_id: id,
+            status: changeType.type,
+          }).then(() => {
+            callback?.();
+            onClose();
+          });
+        },
+      });
+      return;
+    }
+    changeUserStatus({
+      user_id: id,
+      status: changeType.type,
+    }).then(() => {
+      callback?.();
+      onClose();
+    });
+  };
+
+  const onShow = (params) => {
+    setId(params.id);
+    setChangeType({
+      ...changeType,
+      type: params.type,
+    });
+    setDefaultType(params.type);
+    setShow(true);
+  };
+  useLayoutEffect(() => {
+    root.render(
+      <Modal show={show} onHide={onClose}>
+        <Modal.Header closeButton>
+          <Modal.Title as="h5">{t('title')}</Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          <Form>
+            {list.map((item) => {
+              return (
+                <div key={item?.type}>
+                  <Form.Group controlId={item.type} className="mb-3">
+                    <FormCheck>
+                      <FormCheck.Input
+                        id={item.type}
+                        type="radio"
+                        checked={changeType.type === item.type}
+                        onChange={() => handleRadio(item)}
+                        isInvalid={isInvalid}
+                      />
+                      <FormCheck.Label htmlFor={item.type}>
+                        <span className="fw-bold">{item.name}</span>
+                        <br />
+                        <span className="text-secondary">
+                          {item.description}
+                        </span>
+                      </FormCheck.Label>
+                      <Form.Control.Feedback type="invalid">
+                        {t('msg.empty')}
+                      </Form.Control.Feedback>
+                    </FormCheck>
+                  </Form.Group>
+                </div>
+              );
+            })}
+          </Form>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="link" onClick={() => onClose()}>
+            {t('btn_cancel')}
+          </Button>
+          <Button variant="primary" onClick={handleSubmit}>
+            {t('btn_submit')}
+          </Button>
+        </Modal.Footer>
+      </Modal>,
+    );
+  });
+
+  return {
+    onClose,
+    onShow,
+  };
+};
+
+export default useChangeUserRoleModal;
diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index 58b849d1..d261844e 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { Button, Form, Table, Badge } from 'react-bootstrap';
+import { Form, Table, Badge, Dropdown } from 'react-bootstrap';
 import { useSearchParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
@@ -9,15 +9,17 @@ import {
   BaseUserCard,
   Empty,
   QueryGroup,
+  Icon,
 } from '@/components';
 import * as Type from '@/common/interface';
-import { useChangeModal } from '@/hooks';
+import { useChangeModal, useChangeUserRoleModal } from '@/hooks';
 import { useQueryUsers } from '@/services';
 
 import '../index.scss';
 
 const UserFilterKeys: Type.UserFilterBy[] = [
   'all',
+  'staff',
   'inactive',
   'suspended',
   'deleted',
@@ -52,6 +54,10 @@ const Users: FC = () => {
     callback: refreshUsers,
   });
 
+  const changeUserRoleModal = useChangeUserRoleModal({
+    callback: refreshUsers,
+  });
+
   const handleClick = ({ user_id, status }) => {
     changeModal.onShow({
       id: user_id,
@@ -59,6 +65,13 @@ const Users: FC = () => {
     });
   };
 
+  const handleClickRole = ({ user_id, role }) => {
+    changeUserRoleModal.onShow({
+      id: user_id,
+      role,
+    });
+  };
+
   const handleFilter = (e) => {
     urlSearchParams.set('query', e.target.value);
     urlSearchParams.delete('page');
@@ -87,20 +100,23 @@ const Users: FC = () => {
         <thead>
           <tr>
             <th>{t('name')}</th>
-            <th style={{ width: '12%' }}>{t('reputation')}</th>
+            {/* <th style={{ width: '12%' }}>{t('reputation')}</th> */}
             <th style={{ width: '20%' }}>{t('email')}</th>
             <th className="text-nowrap" style={{ width: '15%' }}>
               {t('created_at')}
             </th>
             {(curFilter === 'deleted' || curFilter === 'suspended') && (
-              <th className="text-nowrap" style={{ width: '10%' }}>
+              <th className="text-nowrap" style={{ width: '15%' }}>
                 {curFilter === 'deleted' ? t('delete_at') : t('suspend_at')}
               </th>
             )}
 
-            <th style={{ width: '10%' }}>{t('status')}</th>
+            <th style={{ width: '12%' }}>{t('status')}</th>
+            <th style={{ width: '12%' }}>{t('role')}</th>
             {curFilter !== 'deleted' ? (
-              <th style={{ width: '10%' }}>{t('action')}</th>
+              <th style={{ width: '8%' }} className="text-end">
+                {t('action')}
+              </th>
             ) : null}
           </tr>
         </thead>
@@ -112,11 +128,13 @@ const Users: FC = () => {
                   <BaseUserCard
                     data={user}
                     className="fs-6"
-                    avatarSize="24px"
+                    avatarSize="32px"
                     avatarSearchStr="s=48"
+                    avatarClass="me-2"
+                    showReputation={false}
                   />
                 </td>
-                <td>{user.rank}</td>
+                {/* <td>{user.rank}</td> */}
                 <td className="text-break">{user.e_mail}</td>
                 <td>
                   <FormatTime time={user.created_at} />
@@ -134,16 +152,40 @@ const Users: FC = () => {
                 <td>
                   <Badge bg={bgMap[user.status]}>{t(user.status)}</Badge>
                 </td>
+                <td>
+                  <Badge bg="light" className="text-body">
+                    Admin
+                  </Badge>
+                </td>
                 {curFilter !== 'deleted' ? (
-                  <td>
-                    {user.status !== 'deleted' && (
+                  <td className="text-end">
+                    <Dropdown>
+                      <Dropdown.Toggle
+                        variant="link"
+                        className="no-toggle link-secondary">
+                        <Icon name="three-dots-vertical" />
+                      </Dropdown.Toggle>
+                      <Dropdown.Menu>
+                        <Dropdown.Item>{t('set_new_password')}</Dropdown.Item>
+                        <Dropdown.Item onClick={() => handleClick(user)}>
+                          {t('change_status')}
+                        </Dropdown.Item>
+                        <Dropdown.Item onClick={() => handleClickRole(user)}>
+                          {t('change_role')}
+                        </Dropdown.Item>
+                        <Dropdown.Divider />
+                        <Dropdown.Item>{t('show_logs')}</Dropdown.Item>
+                      </Dropdown.Menu>
+                    </Dropdown>
+
+                    {/* {user.status !== 'deleted' && (
                       <Button
                         className="p-0 btn-no-border"
                         variant="link"
                         onClick={() => handleClick(user)}>
                         {t('change')}
                       </Button>
-                    )}
+                    )} */}
                   </td>
                 ) : null}
               </tr>

From 32d64b40b9ba19a83c50d83c65b6711329879849 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 28 Nov 2022 16:08:12 +0800
Subject: [PATCH 107/194] chore(users): remove unnecessary route guard & log

---
 .../pages/Users/ChangeEmail/components/sendEmail.tsx   | 10 ----------
 ui/src/pages/Users/Settings/Profile/index.tsx          |  1 -
 ui/src/router/routes.ts                                | 10 ----------
 3 files changed, 21 deletions(-)

diff --git a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
index 037b98c1..51901ca9 100644
--- a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
+++ b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
@@ -76,7 +76,6 @@ const Index: FC = () => {
       params.captcha_code = formData.captcha_code.value;
       params.captcha_id = imgCode.captcha_id;
     }
-
     changeEmail(params)
       .then(() => {
         userInfo.e_mail = formData.e_mail.value;
@@ -85,14 +84,6 @@ const Index: FC = () => {
         setModalState(false);
       })
       .catch((err) => {
-        // if (err.isError && err.key) {
-        //   formData[err.key].isInvalid = true;
-        //   formData[err.key].errorMsg = err.value;
-        //   if (err.key.indexOf('captcha') < 0) {
-        //     setModalState(false);
-        //   }
-        // }
-        // setFormData({ ...formData });
         if (err.isError) {
           const data = handleFormError(err, formData);
           if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
@@ -109,7 +100,6 @@ const Index: FC = () => {
   const handleSubmit = async (event: any) => {
     event.preventDefault();
     event.stopPropagation();
-
     if (!checkValidated()) {
       return;
     }
diff --git a/ui/src/pages/Users/Settings/Profile/index.tsx b/ui/src/pages/Users/Settings/Profile/index.tsx
index 03d5639f..aa3dd84b 100644
--- a/ui/src/pages/Users/Settings/Profile/index.tsx
+++ b/ui/src/pages/Users/Settings/Profile/index.tsx
@@ -196,7 +196,6 @@ const Index: React.FC = () => {
       if (res.e_mail) {
         const str = res.e_mail.toLowerCase().trim();
         const hash = MD5(str);
-        console.log(str, hash, mailHash);
         setMailHash(hash);
       }
     });
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index 04daf448..2780db2f 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -153,9 +153,6 @@ const routes: RouteNode[] = [
       {
         path: 'users/change-email',
         page: 'pages/Users/ChangeEmail',
-        guard: async () => {
-          return guard.notActivated();
-        },
       },
       {
         path: 'users/password-reset',
@@ -167,13 +164,6 @@ const routes: RouteNode[] = [
       {
         path: 'users/account-activation',
         page: 'pages/Users/ActiveEmail',
-        // guard: async () => {
-        //   const notActivated = guard.notActivated();
-        //   if (notActivated.ok) {
-        //     return notActivated;
-        //   }
-        //   return guard.notLogged();
-        // },
       },
       {
         path: 'users/account-activation/success',

From 6ca8b81230c8ac2136016ae799807f6b7a4c5c21 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 28 Nov 2022 16:27:18 +0800
Subject: [PATCH 108/194] feat: email form error

---
 .../pages/Users/AccountForgot/components/sendEmail.tsx | 10 +---------
 .../pages/Users/ChangeEmail/components/sendEmail.tsx   | 10 +---------
 ui/src/pages/Users/Login/index.tsx                     |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx b/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx
index 7d6f11be..8c6aa161 100644
--- a/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx
+++ b/ui/src/pages/Users/AccountForgot/components/sendEmail.tsx
@@ -84,17 +84,9 @@ const Index: FC<IProps> = ({ visible = false, callback }) => {
         setModalState(false);
       })
       .catch((err) => {
-        // if (err.isError && err.key) {
-        //   formData[err.key].isInvalid = true;
-        //   formData[err.key].errorMsg = err.value;
-        //   if (err.key.indexOf('captcha') < 0) {
-        //     setModalState(false);
-        //   }
-        // }
-
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });
diff --git a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
index 037b98c1..9ccda773 100644
--- a/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
+++ b/ui/src/pages/Users/ChangeEmail/components/sendEmail.tsx
@@ -85,17 +85,9 @@ const Index: FC = () => {
         setModalState(false);
       })
       .catch((err) => {
-        // if (err.isError && err.key) {
-        //   formData[err.key].isInvalid = true;
-        //   formData[err.key].errorMsg = err.value;
-        //   if (err.key.indexOf('captcha') < 0) {
-        //     setModalState(false);
-        //   }
-        // }
-        // setFormData({ ...formData });
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });
diff --git a/ui/src/pages/Users/Login/index.tsx b/ui/src/pages/Users/Login/index.tsx
index 2f5b9180..6b9b233e 100644
--- a/ui/src/pages/Users/Login/index.tsx
+++ b/ui/src/pages/Users/Login/index.tsx
@@ -131,7 +131,7 @@ const Index: React.FC = () => {
         // }
         if (err.isError) {
           const data = handleFormError(err, formData);
-          if (err.list.filter((v) => v.error_field.indexOf('captcha') < 0)) {
+          if (!err.list.find((v) => v.error_field.indexOf('captcha') >= 0)) {
             setModalState(false);
           }
           setFormData({ ...data });

From 2f4b57e57fd4749518e7e19438cfccb0e7fb4c34 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 28 Nov 2022 16:34:21 +0800
Subject: [PATCH 109/194] fix: prompt form error when user enters email
 repeatedly

---
 internal/base/handler/lang.go          | 11 +++++++++++
 internal/controller/user_controller.go |  3 ---
 internal/service/user_service.go       |  9 +++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/internal/base/handler/lang.go b/internal/base/handler/lang.go
index a6b2122c..4f4a0763 100644
--- a/internal/base/handler/lang.go
+++ b/internal/base/handler/lang.go
@@ -1,6 +1,8 @@
 package handler
 
 import (
+	"context"
+
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/i18n"
@@ -18,3 +20,12 @@ func GetLang(ctx *gin.Context) i18n.Language {
 		return i18n.DefaultLang
 	}
 }
+
+// GetLangByCtx get language from header
+func GetLangByCtx(ctx context.Context) i18n.Language {
+	acceptLanguage, ok := ctx.Value(constant.AcceptLanguageFlag).(i18n.Language)
+	if ok {
+		return acceptLanguage
+	}
+	return i18n.DefaultLang
+}
diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go
index dfafba07..099adc42 100644
--- a/internal/controller/user_controller.go
+++ b/internal/controller/user_controller.go
@@ -441,9 +441,6 @@ func (uc *UserController) UserChangeEmailSendCode(ctx *gin.Context) {
 	_, _ = uc.actionService.ActionRecordAdd(ctx, schema.ActionRecordTypeEmail, ctx.ClientIP())
 	resp, err := uc.userService.UserChangeEmailSendCode(ctx, req)
 	if err != nil {
-		if resp != nil {
-			resp.ErrorMsg = translator.GlobalTrans.Tr(handler.GetLang(ctx), resp.ErrorMsg)
-		}
 		handler.HandleResponse(ctx, err, resp)
 		return
 	}
diff --git a/internal/service/user_service.go b/internal/service/user_service.go
index 8d50bfec..3466170e 100644
--- a/internal/service/user_service.go
+++ b/internal/service/user_service.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/Chain-Zhang/pinyin"
+	"github.com/answerdev/answer/internal/base/handler"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/base/translator"
 	"github.com/answerdev/answer/internal/base/validator"
@@ -486,7 +487,7 @@ func (us *UserService) encryptPassword(ctx context.Context, Pass string) (string
 
 // UserChangeEmailSendCode user change email verification
 func (us *UserService) UserChangeEmailSendCode(ctx context.Context, req *schema.UserChangeEmailSendCodeReq) (
-	resp *validator.FormErrorField, err error) {
+	resp []*validator.FormErrorField, err error) {
 	userInfo, exist, err := us.userRepo.GetByUserID(ctx, req.UserID)
 	if err != nil {
 		return nil, err
@@ -500,10 +501,10 @@ func (us *UserService) UserChangeEmailSendCode(ctx context.Context, req *schema.
 		return nil, err
 	}
 	if exist {
-		resp = &validator.FormErrorField{
+		resp = append([]*validator.FormErrorField{}, &validator.FormErrorField{
 			ErrorField: "e_mail",
-			ErrorMsg:   reason.EmailDuplicate,
-		}
+			ErrorMsg:   translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.EmailDuplicate),
+		})
 		return resp, errors.BadRequest(reason.EmailDuplicate)
 	}
 

From 4eaab3d005643d83e31df7b0af97a6db6bd0bd04 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 28 Nov 2022 16:48:26 +0800
Subject: [PATCH 110/194] fix(question): initFormData not cleared correctly in
 form Ask

---
 ui/src/pages/Questions/Ask/index.tsx | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 648eb79c..6b2dca45 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -27,35 +27,35 @@ interface FormDataItem {
   answer: Type.FormValue<string>;
   edit_summary: Type.FormValue<string>;
 }
-const initFormData = {
-  title: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  tags: {
-    value: [],
-    isInvalid: false,
-    errorMsg: '',
-  },
-  content: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  answer: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-  edit_summary: {
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  },
-};
 
 const Ask = () => {
+  const initFormData = {
+    title: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    tags: {
+      value: [],
+      isInvalid: false,
+      errorMsg: '',
+    },
+    content: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    answer: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    edit_summary: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+  };
   const { t } = useTranslation('translation', { keyPrefix: 'ask' });
   const [formData, setFormData] = useState<FormDataItem>(initFormData);
   const [checked, setCheckState] = useState(false);

From 224b569013aeaa1cec9bdceecfc2361df0f327c3 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Mon, 28 Nov 2022 17:09:52 +0800
Subject: [PATCH 111/194] feat: activity object info return username

---
 internal/schema/activity.go           |  1 +
 internal/service/activity/activity.go | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index 196e9198..e1e6e3c3 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -46,6 +46,7 @@ type ActObjectInfo struct {
 	ObjectType string `json:"object_type"`
 	QuestionID string `json:"question_id"`
 	AnswerID   string `json:"answer_id"`
+	Username   string `json:"username"`
 }
 
 // GetObjectTimelineDetailReq get object timeline detail request
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index 73fce527..72fc0ad6 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -72,6 +72,16 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 	resp.ObjectInfo.ObjectType = objInfo.ObjectType
 	resp.ObjectInfo.QuestionID = objInfo.QuestionID
 	resp.ObjectInfo.AnswerID = objInfo.AnswerID
+	if len(objInfo.ObjectCreatorUserID) > 0 {
+		// get object creator user info
+		userBasicInfo, exist, err := as.userCommon.GetUserBasicInfoByID(ctx, objInfo.ObjectCreatorUserID)
+		if err != nil {
+			return nil, err
+		}
+		if exist {
+			resp.ObjectInfo.Username = userBasicInfo.Username
+		}
+	}
 
 	activityList, err := as.activityRepo.GetObjectAllActivity(ctx, req.ObjectID, req.ShowVote)
 	if err != nil {

From 9af3067e8fd22eb10271aab8b999ffad7069ab94 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 28 Nov 2022 17:54:57 +0800
Subject: [PATCH 112/194] fix(users): adjust layout for user overview page

---
 ui/src/pages/Users/Personal/components/TopList/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/pages/Users/Personal/components/TopList/index.tsx b/ui/src/pages/Users/Personal/components/TopList/index.tsx
index 86179305..4af1da3c 100644
--- a/ui/src/pages/Users/Personal/components/TopList/index.tsx
+++ b/ui/src/pages/Users/Personal/components/TopList/index.tsx
@@ -16,7 +16,7 @@ const Index: FC<Props> = ({ data, type }) => {
       {data?.map((item) => {
         return (
           <ListGroupItem
-            className="p-0 border-0 mb-2 d-flex flex-wrap align-items-center"
+            className="p-0 border-0 mb-2"
             key={type === 'answer' ? item.answer_id : item.question_id}>
             <a
               href={`/questions/${
@@ -26,13 +26,13 @@ const Index: FC<Props> = ({ data, type }) => {
               }`}>
               {type === 'answer' ? item.question_info.title : item.title}
             </a>
-            <div className="text-secondary ms-3 fs-14">
+            <div className="d-inline-block text-secondary ms-3 fs-14">
               <Icon name="hand-thumbs-up-fill" />
               <span> {item.vote_count}</span>
             </div>
             {type === 'question' && (
               <div
-                className={`text-secondary ms-3 fs-14 ${
+                className={`d-inline-block text-secondary ms-3 fs-14 ${
                   Number(item.accepted_answer_id) > 0 ? 'text-success' : ''
                 }`}>
                 {Number(item.accepted_answer_id) > 0 ? (
@@ -46,7 +46,7 @@ const Index: FC<Props> = ({ data, type }) => {
             )}
 
             {type === 'answer' && item.adopted === 2 && (
-              <div className="text-success ms-3 fs-14">
+              <div className="d-inline-block text-success ms-3 fs-14">
                 <Icon name="check-circle-fill" />
                 <span> {t('accepted')}</span>
               </div>

From bd8b36e84272cc04797527dd0c6a13f03d9f1c6b Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 28 Nov 2022 18:10:07 +0800
Subject: [PATCH 113/194] fix: timline page adjustment

---
 i18n/en_US.yaml                               |  3 +-
 ui/src/common/interface.ts                    |  1 +
 ui/src/components/DiffContent/index.tsx       |  2 +-
 .../pages/Timeline/components/Item/index.tsx  |  3 +-
 ui/src/pages/Timeline/index.tsx               | 44 +++++++++++++------
 ui/src/services/client/timeline.ts            | 31 ++++++++-----
 6 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 0f1a7311..c3e3085e 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1212,7 +1212,8 @@ ui:
     title: "History for"
     show_votes: "Show votes"
     n_or_a: N/A
-    title_for: "Timeline for"
+    title_for_question: "Timeline for"
+    title_for_answer: "Timeline for answers to {{ title }} by {{ author }}"
     title_for_tag: "Title for tag"
     datetime: Datetime
     type: Type
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 4d6de991..e5d711f5 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -406,6 +406,7 @@ export interface TimelineObject {
   question_id: string;
   answer_id: string;
   main_tag_slug_name?: string;
+  username?: string;
 }
 
 export interface TimelineRes {
diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 36f87de2..336f71a8 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -102,7 +102,7 @@ const Index: FC<Props> = ({
         dangerouslySetInnerHTML={{
           __html: diffText(newData.original_text, oldData?.original_text),
         }}
-        className="pre-line text-break font-monospace"
+        className="pre-line text-break font-monospace fs-14"
       />
     </div>
   );
diff --git a/ui/src/pages/Timeline/components/Item/index.tsx b/ui/src/pages/Timeline/components/Item/index.tsx
index bdc637f3..657f4708 100644
--- a/ui/src/pages/Timeline/components/Item/index.tsx
+++ b/ui/src/pages/Timeline/components/Item/index.tsx
@@ -70,7 +70,8 @@ const Index: FC<Props> = ({ data, isAdmin, objectInfo, revisionList }) => {
             </Button>
           )}
           {data.activity_type === 'accept' && (
-            <Link to={`/questions/${objectInfo.question_id}`}>
+            <Link
+              to={`/questions/${objectInfo.question_id}/${data?.object_id}`}>
               {t(data.activity_type)}
             </Link>
           )}
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 8c592a56..933eebd2 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -1,11 +1,12 @@
-import { FC, useState } from 'react';
+import { FC, useState, useEffect } from 'react';
 import { Container, Row, Col, Form, Table } from 'react-bootstrap';
 import { Link, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import { loggedUserInfoStore } from '@/stores';
-import { useTimelineData } from '@/services';
+import { getTimelineData } from '@/services';
 import { PageTitle, Empty } from '@/components';
+import * as Type from '@/common/interface';
 
 import HistoryItem from './components/Item';
 
@@ -14,23 +15,45 @@ const Index: FC = () => {
   const { qid = '', aid = '', tid = '' } = useParams();
   const { is_admin } = loggedUserInfoStore((state) => state.user);
   const [showVotes, setShowVotes] = useState(false);
+  const [isLoading, setLoading] = useState(false);
+  const [timelineData, setTimelineData] = useState<Type.TimelineRes>();
 
-  const { data: timelineData, isLoading } = useTimelineData({
-    object_id: tid || aid || qid,
-    show_vote: showVotes,
-  });
+  const getPageData = () => {
+    setLoading(true);
+    getTimelineData({
+      object_id: tid || aid || qid,
+      show_vote: showVotes,
+    })
+      .then((res) => {
+        setTimelineData(res);
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
 
   const handleSwitch = (bol: boolean) => {
     setShowVotes(bol);
+    getPageData();
   };
 
+  useEffect(() => {
+    getPageData();
+  }, []);
+
   let linkUrl = '';
+  let pageTitle = '';
   if (timelineData?.object_info.object_type === 'question') {
     linkUrl = `/questions/${timelineData?.object_info.question_id}`;
+    pageTitle = `${t('title_for_question')} ${timelineData?.object_info.title}`;
   }
 
   if (timelineData?.object_info.object_type === 'answer') {
     linkUrl = `/questions/${timelineData?.object_info.question_id}/${timelineData?.object_info.answer_id}`;
+    pageTitle = `${t('title_for_answer', {
+      title: timelineData?.object_info.title,
+      author: timelineData?.object_info.username,
+    })}`;
   }
 
   if (timelineData?.object_info.object_type === 'tag') {
@@ -38,6 +61,7 @@ const Index: FC = () => {
       timelineData?.object_info.main_tag_slug_name ||
       timelineData?.object_info.title
     }`;
+    pageTitle = `${t('title_for_tag')} ${timelineData?.object_info.title}`;
   }
 
   const revisionList =
@@ -45,13 +69,7 @@ const Index: FC = () => {
 
   return (
     <Container className="py-3">
-      <PageTitle
-        title={
-          timelineData?.object_info.object_type === 'tag'
-            ? `${t('title_for_tag')} ${timelineData?.object_info.title}`
-            : `${t('title_for')} ${timelineData?.object_info.title}`
-        }
-      />
+      <PageTitle title={pageTitle} />
       <Row className="py-3 justify-content-center">
         <Col xxl={10}>
           <h5 className="mb-4">
diff --git a/ui/src/services/client/timeline.ts b/ui/src/services/client/timeline.ts
index 2c6efed7..d77b2548 100644
--- a/ui/src/services/client/timeline.ts
+++ b/ui/src/services/client/timeline.ts
@@ -1,21 +1,28 @@
-import useSWR from 'swr';
 import qs from 'qs';
 
 import request from '@/utils/request';
 import type * as Type from '@/common/interface';
 
-export const useTimelineData = (params: Type.TimelineReq) => {
-  const apiUrl = '/answer/api/v1/activity/timeline';
-  const { data, error, mutate } = useSWR<Type.TimelineRes, Error>(
-    `${apiUrl}?${qs.stringify(params, { skipNulls: true })}`,
-    request.instance.get,
+// export const useTimelineData = (params: Type.TimelineReq) => {
+//   const apiUrl = '/answer/api/v1/activity/timeline';
+//   const { data, error, mutate } = useSWR<Type.TimelineRes, Error>(
+//     `${apiUrl}?${qs.stringify(params, { skipNulls: true })}`,
+//     request.instance.get,
+//   );
+//   return {
+//     data,
+//     isLoading: !data && !error,
+//     error,
+//     mutate,
+//   };
+// };
+
+export const getTimelineData = (params: Type.TimelineReq) => {
+  return request.get<Type.TimelineRes>(
+    `/answer/api/v1/activity/timeline?${qs.stringify(params, {
+      skipNulls: true,
+    })}`,
   );
-  return {
-    data,
-    isLoading: !data && !error,
-    error,
-    mutate,
-  };
 };
 
 export const getTimelineDetail = (params: {

From 712f918f9cf33237d98edb3a4e45d7716e75b028 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:19:22 +0800
Subject: [PATCH 114/194] fix question update time and tag check

---
 internal/service/answer_service.go        |  5 +++
 internal/service/question_service.go      | 38 ++++++++++++++++++-----
 internal/service/tag_common/tag_common.go | 28 +++++++++++++++++
 3 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index f34508aa..bda09447 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -217,6 +217,11 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 		return "", nil
 	}
 
+	//If the content is the same, ignore it
+	if answerInfo.OriginalText == req.Content {
+		return "", nil
+	}
+
 	now := time.Now()
 	insertData := new(entity.Answer)
 	insertData.ID = req.ID
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 8ae2d1da..08c84b0b 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -120,7 +120,7 @@ func (qs *QuestionService) CloseMsgList(ctx context.Context, lang i18n.Language)
 }
 
 // AddQuestion add question
-func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.QuestionAdd) (questionInfo *schema.QuestionInfo, err error) {
+func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.QuestionAdd) (questionInfo any, err error) {
 	recommendExist, err := qs.tagCommon.ExistRecommend(ctx, req.Tags)
 	if err != nil {
 		return
@@ -131,6 +131,16 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		return
 	}
 
+	if !recommendExist {
+		errorlist := make([]*validator.FormErrorField, 0)
+		errorlist = append(errorlist, &validator.FormErrorField{
+			ErrorField: "tags",
+			ErrorMsg:   reason.RecommendTagEnter,
+		})
+		err = errors.BadRequest(reason.RecommendTagEnter)
+		return errorlist, err
+	}
+
 	question := &entity.Question{}
 	now := time.Now()
 	question.UserID = req.UserID
@@ -143,7 +153,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	question.Status = entity.QuestionStatusAvailable
 	question.RevisionID = "0"
 	question.CreatedAt = now
-	question.UpdatedAt = now
+	// question.UpdatedAt = now
 	err = qs.questionRepo.AddQuestion(ctx, question)
 	if err != nil {
 		return
@@ -270,6 +280,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
 	if err != nil {
 		return
+
 	}
 	if existUnreviewed {
 		err = errors.BadRequest(reason.QuestionCannotUpdate)
@@ -292,10 +303,27 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 
+	oldTags, tagerr := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
+	if tagerr != nil {
+		return questionInfo, tagerr
+	}
+
 	tagNameList := make([]string, 0)
+	oldtagNameList := make([]string, 0)
 	for _, tag := range req.Tags {
 		tagNameList = append(tagNameList, tag.SlugName)
 	}
+	for _, tag := range oldTags {
+		oldtagNameList = append(oldtagNameList, tag.SlugName)
+	}
+
+	isChange := qs.tagCommon.CheckTagsIsChange(ctx, tagNameList, oldtagNameList)
+
+	//If the content is the same, ignore it
+	if dbinfo.Title == req.Title && dbinfo.OriginalText == req.Content && !isChange {
+		return
+	}
+
 	Tags, tagerr := qs.tagCommon.GetTagListByNames(ctx, tagNameList)
 	if tagerr != nil {
 		return questionInfo, tagerr
@@ -304,14 +332,10 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	// If it's not admin
 	if !req.IsAdmin {
 		//CheckChangeTag
-		oldTags, tagerr := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
-		if tagerr != nil {
-			return questionInfo, tagerr
-		}
 
 		CheckTag, CheckTaglist := qs.CheckChangeReservedTag(ctx, oldTags, Tags)
 		if !CheckTag {
-			errMsg := fmt.Sprintf(`The reserved tag %s must be present.`,
+			errMsg := fmt.Sprintf(`The reserved tag "%s" must be present.`,
 				strings.Join(CheckTaglist, ","))
 			errorlist := make([]*validator.FormErrorField, 0)
 			errorlist = append(errorlist, &validator.FormErrorField{
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 557b61d9..5a2d59fe 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -419,6 +419,30 @@ func (ts *TagCommonService) CheckTag(ctx context.Context, tags []string, userID
 	return nil
 }
 
+// CheckTagsIsChange
+func (ts *TagCommonService) CheckTagsIsChange(ctx context.Context, tagNameList, oldtagNameList []string) bool {
+	check := make(map[string]bool)
+	if len(tagNameList) != len(oldtagNameList) {
+		return true
+	}
+	for _, item := range tagNameList {
+		check[item] = false
+	}
+	for _, item := range oldtagNameList {
+		_, ok := check[item]
+		if !ok {
+			return true
+		}
+		check[item] = true
+	}
+	for _, value := range check {
+		if value == false {
+			return true
+		}
+	}
+	return false
+}
+
 func (ts *TagCommonService) CheckChangeReservedTag(ctx context.Context, oldobjectTagData, objectTagData []*entity.Tag) (bool, []string) {
 	reservedTagsMap := make(map[string]bool)
 	needTagsMap := make([]string, 0)
@@ -616,6 +640,10 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 	if !exist {
 		return errors.BadRequest(reason.TagNotFound)
 	}
+	//If the content is the same, ignore it
+	if tagInfo.OriginalText == req.OriginalText {
+		return nil
+	}
 
 	tagInfo.SlugName = req.SlugName
 	tagInfo.DisplayName = req.DisplayName

From 71f8a21032f323ce5667ac7a4664753a89fa7e7e Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 28 Nov 2022 18:46:56 +0800
Subject: [PATCH 115/194] fix: timline show votes condition

---
 ui/src/pages/Timeline/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 933eebd2..ae0b7c18 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -18,11 +18,11 @@ const Index: FC = () => {
   const [isLoading, setLoading] = useState(false);
   const [timelineData, setTimelineData] = useState<Type.TimelineRes>();
 
-  const getPageData = () => {
+  const getPageData = (bol: boolean) => {
     setLoading(true);
     getTimelineData({
       object_id: tid || aid || qid,
-      show_vote: showVotes,
+      show_vote: bol,
     })
       .then((res) => {
         setTimelineData(res);
@@ -34,11 +34,11 @@ const Index: FC = () => {
 
   const handleSwitch = (bol: boolean) => {
     setShowVotes(bol);
-    getPageData();
+    getPageData(bol);
   };
 
   useEffect(() => {
-    getPageData();
+    getPageData(false);
   }, []);
 
   let linkUrl = '';

From c455f3f02bdfa08fde83452ee67955e3529825d4 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 29 Nov 2022 10:00:23 +0800
Subject: [PATCH 116/194] feat: activity object info return display name

---
 internal/schema/activity.go           | 11 ++++++-----
 internal/service/activity/activity.go |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index e1e6e3c3..be90a845 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -42,11 +42,12 @@ type ActObjectTimeline struct {
 
 // ActObjectInfo act object info
 type ActObjectInfo struct {
-	Title      string `json:"title"`
-	ObjectType string `json:"object_type"`
-	QuestionID string `json:"question_id"`
-	AnswerID   string `json:"answer_id"`
-	Username   string `json:"username"`
+	Title       string `json:"title"`
+	ObjectType  string `json:"object_type"`
+	QuestionID  string `json:"question_id"`
+	AnswerID    string `json:"answer_id"`
+	Username    string `json:"username"`
+	DisplayName string `json:"display_name"`
 }
 
 // GetObjectTimelineDetailReq get object timeline detail request
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index 72fc0ad6..2ef56a9c 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -80,6 +80,7 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		}
 		if exist {
 			resp.ObjectInfo.Username = userBasicInfo.Username
+			resp.ObjectInfo.DisplayName = userBasicInfo.DisplayName
 		}
 	}
 

From 916dbf52cb4049739a0f7821810e458e2233a8c4 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 29 Nov 2022 10:03:37 +0800
Subject: [PATCH 117/194] feat: activity object info return display name

---
 internal/schema/activity.go           | 1 +
 internal/service/activity/activity.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index 683c0601..1bfb7f39 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -50,6 +50,7 @@ type ActObjectInfo struct {
 	AnswerID        string `json:"answer_id"`
 	MainTagSlugName string `json:"main_tag_slug_name"`
 	Username        string `json:"username"`
+	DisplayName     string `json:"display_name"`
 }
 
 // GetObjectTimelineDetailReq get object timeline detail request
diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go
index e49158af..4fe151b9 100644
--- a/internal/service/activity/activity.go
+++ b/internal/service/activity/activity.go
@@ -142,6 +142,7 @@ func (as *ActivityService) getTimelineMainObjInfo(ctx context.Context, objectID
 		}
 		if exist {
 			resp.Username = userBasicInfo.Username
+			resp.DisplayName = userBasicInfo.DisplayName
 		}
 	}
 	return resp, nil

From f693077ae53dbc61f2f90fa9fdb4cd76a978a4f5 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 29 Nov 2022 10:25:28 +0800
Subject: [PATCH 118/194] feat: When the user requests the specified comment,
 if it does not exist in the comment list then query and return it.

---
 internal/schema/comment_schema.go           |   2 +
 internal/service/comment/comment_service.go | 117 +++++++++++++-------
 2 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.go
index 53ebf445..de4a44b2 100644
--- a/internal/schema/comment_schema.go
+++ b/internal/schema/comment_schema.go
@@ -69,6 +69,8 @@ type GetCommentWithPageReq struct {
 	PageSize int `validate:"omitempty,min=1" form:"page_size"`
 	// object id
 	ObjectID string `validate:"required" form:"object_id"`
+	// comment id
+	CommentID string `validate:"omitempty" form:"comment_id"`
 	// query condition
 	QueryCond string `validate:"omitempty,oneof=vote" form:"query_cond"`
 	// user id
diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index a7156c76..7d93e4da 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -240,54 +240,87 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 	}
 	resp := make([]*schema.GetCommentResp, 0)
 	for _, comment := range commentList {
-		commentResp := &schema.GetCommentResp{
-			CommentID:      comment.ID,
-			CreatedAt:      comment.CreatedAt.Unix(),
-			UserID:         comment.UserID,
-			ReplyUserID:    comment.GetReplyUserID(),
-			ReplyCommentID: comment.GetReplyCommentID(),
-			ObjectID:       comment.ObjectID,
-			VoteCount:      comment.VoteCount,
-			OriginalText:   comment.OriginalText,
-			ParsedText:     comment.ParsedText,
+		commentResp, err := cs.convertCommentEntity2Resp(ctx, req.UserID, comment)
+		if err != nil {
+			return nil, err
 		}
-
-		// get comment user info
-		if len(commentResp.UserID) > 0 {
-			commentUser, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, commentResp.UserID)
-			if err != nil {
-				return nil, err
-			}
-			if exist {
-				commentResp.Username = commentUser.Username
-				commentResp.UserDisplayName = commentUser.DisplayName
-				commentResp.UserAvatar = commentUser.Avatar
-				commentResp.UserStatus = commentUser.Status
-			}
-		}
-
-		// get reply user info
-		if len(commentResp.ReplyUserID) > 0 {
-			replyUser, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, commentResp.ReplyUserID)
-			if err != nil {
-				return nil, err
-			}
-			if exist {
-				commentResp.ReplyUsername = replyUser.Username
-				commentResp.ReplyUserDisplayName = replyUser.DisplayName
-				commentResp.ReplyUserStatus = replyUser.Status
-			}
-		}
-
-		// check if current user vote this comment
-		commentResp.IsVote = cs.checkIsVote(ctx, req.UserID, commentResp.CommentID)
-
-		commentResp.MemberActions = permission.GetCommentPermission(req.UserID, commentResp.UserID)
 		resp = append(resp, commentResp)
 	}
+
+	// if user request the specific comment, add it if not exist.
+	if len(req.CommentID) > 0 {
+		commentExist := false
+		for _, t := range resp {
+			if t.CommentID == req.CommentID {
+				commentExist = true
+				break
+			}
+		}
+		if !commentExist {
+			comment, exist, err := cs.commentCommonRepo.GetComment(ctx, req.CommentID)
+			if err != nil {
+				return nil, err
+			}
+			if exist {
+				commentResp, err := cs.convertCommentEntity2Resp(ctx, req.UserID, comment)
+				if err != nil {
+					return nil, err
+				}
+				resp = append(resp, commentResp)
+			}
+		}
+	}
 	return pager.NewPageModel(total, resp), nil
 }
 
+func (cs *CommentService) convertCommentEntity2Resp(ctx context.Context, userID string, comment *entity.Comment) (
+	commentResp *schema.GetCommentResp, err error) {
+	commentResp = &schema.GetCommentResp{
+		CommentID:      comment.ID,
+		CreatedAt:      comment.CreatedAt.Unix(),
+		UserID:         comment.UserID,
+		ReplyUserID:    comment.GetReplyUserID(),
+		ReplyCommentID: comment.GetReplyCommentID(),
+		ObjectID:       comment.ObjectID,
+		VoteCount:      comment.VoteCount,
+		OriginalText:   comment.OriginalText,
+		ParsedText:     comment.ParsedText,
+	}
+
+	// get comment user info
+	if len(commentResp.UserID) > 0 {
+		commentUser, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, commentResp.UserID)
+		if err != nil {
+			return nil, err
+		}
+		if exist {
+			commentResp.Username = commentUser.Username
+			commentResp.UserDisplayName = commentUser.DisplayName
+			commentResp.UserAvatar = commentUser.Avatar
+			commentResp.UserStatus = commentUser.Status
+		}
+	}
+
+	// get reply user info
+	if len(commentResp.ReplyUserID) > 0 {
+		replyUser, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, commentResp.ReplyUserID)
+		if err != nil {
+			return nil, err
+		}
+		if exist {
+			commentResp.ReplyUsername = replyUser.Username
+			commentResp.ReplyUserDisplayName = replyUser.DisplayName
+			commentResp.ReplyUserStatus = replyUser.Status
+		}
+	}
+
+	// check if current user vote this comment
+	commentResp.IsVote = cs.checkIsVote(ctx, userID, commentResp.CommentID)
+
+	commentResp.MemberActions = permission.GetCommentPermission(userID, commentResp.UserID)
+	return commentResp, nil
+}
+
 func (cs *CommentService) checkCommentWhetherOwner(ctx context.Context, userID, commentID string) error {
 	// check comment if user self
 	comment, exist, err := cs.commentCommonRepo.GetComment(ctx, commentID)

From 79e7f9b599f5d6380e668d8543c9939ed452ef8a Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 29 Nov 2022 10:42:04 +0800
Subject: [PATCH 119/194] feat: return the specified comment

---
 internal/service/comment/comment_service.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index b4a5692a..c9a7cbd0 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -255,7 +255,7 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 	}
 	resp := make([]*schema.GetCommentResp, 0)
 	for _, comment := range commentList {
-		commentResp, err := cs.convertCommentEntity2Resp(ctx, req.UserID, comment)
+		commentResp, err := cs.convertCommentEntity2Resp(ctx, req, comment)
 		if err != nil {
 			return nil, err
 		}
@@ -276,8 +276,8 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 			if err != nil {
 				return nil, err
 			}
-			if exist {
-				commentResp, err := cs.convertCommentEntity2Resp(ctx, req.UserID, comment)
+			if exist && comment.ObjectID == req.ObjectID {
+				commentResp, err := cs.convertCommentEntity2Resp(ctx, req, comment)
 				if err != nil {
 					return nil, err
 				}
@@ -288,8 +288,8 @@ func (cs *CommentService) GetCommentWithPage(ctx context.Context, req *schema.Ge
 	return pager.NewPageModel(total, resp), nil
 }
 
-func (cs *CommentService) convertCommentEntity2Resp(ctx context.Context, userID string, comment *entity.Comment) (
-	commentResp *schema.GetCommentResp, err error) {
+func (cs *CommentService) convertCommentEntity2Resp(ctx context.Context, req *schema.GetCommentWithPageReq,
+	comment *entity.Comment) (commentResp *schema.GetCommentResp, err error) {
 	commentResp = &schema.GetCommentResp{
 		CommentID:      comment.ID,
 		CreatedAt:      comment.CreatedAt.Unix(),
@@ -330,9 +330,10 @@ func (cs *CommentService) convertCommentEntity2Resp(ctx context.Context, userID
 	}
 
 	// check if current user vote this comment
-	commentResp.IsVote = cs.checkIsVote(ctx, userID, commentResp.CommentID)
+	commentResp.IsVote = cs.checkIsVote(ctx, req.UserID, commentResp.CommentID)
 
-	commentResp.MemberActions = permission.GetCommentPermission(userID, commentResp.UserID)
+	commentResp.MemberActions = permission.GetCommentPermission(ctx,
+		req.UserID, commentResp.UserID, req.CanEdit, req.CanDelete)
 	return commentResp, nil
 }
 

From 3ed4b589801743574745648f3790211abd5be9db Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 29 Nov 2022 10:43:31 +0800
Subject: [PATCH 120/194] fix: add `commentId` for query target comment

---
 ui/src/components/Comment/index.tsx                      | 3 ++-
 .../pages/Questions/Detail/components/Answer/index.tsx   | 9 +++++++--
 .../pages/Questions/Detail/components/Question/index.tsx | 9 +++++++--
 ui/src/services/common.ts                                | 3 +++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index d76f94d6..f96ca77e 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -24,7 +24,7 @@ import { Form, ActionBar, Reply } from './components';
 
 import './index.scss';
 
-const Comment = ({ objectId, mode }) => {
+const Comment = ({ objectId, mode, commentId }) => {
   const pageUsers = usePageUsers();
   const [pageIndex, setPageIndex] = useState(0);
   const [comments, setComments] = useState<any>([]);
@@ -32,6 +32,7 @@ const Comment = ({ objectId, mode }) => {
   const pageSize = pageIndex === 0 ? 3 : 15;
   const { data, mutate } = useQueryComments({
     object_id: objectId,
+    commentId,
     page: pageIndex,
     page_size: pageSize,
   });
diff --git a/ui/src/pages/Questions/Detail/components/Answer/index.tsx b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
index 43e8627b..d1b76be7 100644
--- a/ui/src/pages/Questions/Detail/components/Answer/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
@@ -1,7 +1,7 @@
 import { memo, FC, useEffect, useRef } from 'react';
 import { Row, Col, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
 
 import {
   Actions,
@@ -37,6 +37,7 @@ const Index: FC<Props> = ({
   const { t } = useTranslation('translation', {
     keyPrefix: 'question_detail',
   });
+  const [searchParams] = useSearchParams();
   const answerRef = useRef<HTMLDivElement>(null);
   const acceptAnswer = () => {
     acceptanceAnswer({
@@ -152,7 +153,11 @@ const Index: FC<Props> = ({
         </Col>
       </Row>
 
-      <Comment objectId={data.id} mode="answer" />
+      <Comment
+        objectId={data.id}
+        mode="answer"
+        commentId={searchParams.get('commentId')}
+      />
     </div>
   );
 };
diff --git a/ui/src/pages/Questions/Detail/components/Question/index.tsx b/ui/src/pages/Questions/Detail/components/Question/index.tsx
index 812cb306..92bdd235 100644
--- a/ui/src/pages/Questions/Detail/components/Question/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Question/index.tsx
@@ -1,5 +1,5 @@
 import { memo, FC, useState, useEffect, useRef } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Row, Col, Button } from 'react-bootstrap';
 
@@ -26,6 +26,7 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer, isLogged }) => {
   const { t } = useTranslation('translation', {
     keyPrefix: 'question_detail',
   });
+  const [searchParams] = useSearchParams();
   const [followed, setFollowed] = useState(data?.is_followed);
   const ref = useRef<HTMLDivElement>(null);
 
@@ -164,7 +165,11 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer, isLogged }) => {
         </Col>
       </Row>
 
-      <Comment objectId={data?.id} mode="question" />
+      <Comment
+        objectId={data?.id}
+        mode="question"
+        commentId={searchParams.get('commentId')}
+      />
     </div>
   );
 };
diff --git a/ui/src/services/common.ts b/ui/src/services/common.ts
index 43437d6e..54ea69dc 100644
--- a/ui/src/services/common.ts
+++ b/ui/src/services/common.ts
@@ -38,6 +38,9 @@ export const useQueryComments = (params) => {
   if (params.page === 0) {
     params.query_cond = 'vote';
     params.page = 1;
+  } else {
+    // only first page need commentId
+    delete params.commentId;
   }
   return useSWR<Type.ListResult>(
     `/answer/api/v1/comment/page?${qs.stringify(params, {

From 463113282879dbd99e6f17a23d4e355720c84616 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 29 Nov 2022 10:49:55 +0800
Subject: [PATCH 121/194] fix(comment): change param `commentId` to
 `comment_id`

---
 ui/src/components/Comment/index.tsx | 2 +-
 ui/src/services/common.ts           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index f96ca77e..0f8da060 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -32,7 +32,7 @@ const Comment = ({ objectId, mode, commentId }) => {
   const pageSize = pageIndex === 0 ? 3 : 15;
   const { data, mutate } = useQueryComments({
     object_id: objectId,
-    commentId,
+    comment_id: commentId,
     page: pageIndex,
     page_size: pageSize,
   });
diff --git a/ui/src/services/common.ts b/ui/src/services/common.ts
index 54ea69dc..903c7aec 100644
--- a/ui/src/services/common.ts
+++ b/ui/src/services/common.ts
@@ -40,7 +40,7 @@ export const useQueryComments = (params) => {
     params.page = 1;
   } else {
     // only first page need commentId
-    delete params.commentId;
+    delete params.comment_id;
   }
   return useSWR<Type.ListResult>(
     `/answer/api/v1/comment/page?${qs.stringify(params, {

From 449db3bf5bc342e86651be4928bf29dece680067 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 29 Nov 2022 11:20:48 +0800
Subject: [PATCH 122/194] fix: axios status 403 show error msg

---
 ui/src/common/interface.ts              |  2 +-
 ui/src/components/DiffContent/index.tsx |  2 +-
 ui/src/pages/Timeline/index.tsx         |  2 +-
 ui/src/utils/request.ts                 | 19 +++++++++++++------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index e5d711f5..60e83af2 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -406,7 +406,7 @@ export interface TimelineObject {
   question_id: string;
   answer_id: string;
   main_tag_slug_name?: string;
-  username?: string;
+  display_name?: string;
 }
 
 export interface TimelineRes {
diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 336f71a8..2362e81c 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -87,7 +87,7 @@ const Index: FC<Props> = ({
         </div>
       )}
       {objectType === 'tag' && opts?.showTagUrlSlug && (
-        <div className="mb-4">
+        <div className="mb-4 fs-14 font-monospace">
           {`/tags/${
             newData?.main_tag_slug_name
               ? diffText(
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index ae0b7c18..f365fa2b 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -52,7 +52,7 @@ const Index: FC = () => {
     linkUrl = `/questions/${timelineData?.object_info.question_id}/${timelineData?.object_info.answer_id}`;
     pageTitle = `${t('title_for_answer', {
       title: timelineData?.object_info.title,
-      author: timelineData?.object_info.username,
+      author: timelineData?.object_info.display_name,
     })}`;
   }
 
diff --git a/ui/src/utils/request.ts b/ui/src/utils/request.ts
index 410992f2..13b668ea 100644
--- a/ui/src/utils/request.ts
+++ b/ui/src/utils/request.ts
@@ -48,7 +48,7 @@ class Request {
         return data;
       },
       (error) => {
-        const { status, data: respData, msg: respMsg } = error.response || {};
+        const { status, data: respData } = error.response || {};
         const { data = {}, msg = '' } = respData || {};
         if (status === 400) {
           // show error message
@@ -121,12 +121,19 @@ class Request {
             });
             return Promise.reject(false);
           }
+
+          if (msg) {
+            toastStore.getState().show({
+              msg,
+              variant: 'danger',
+            });
+          }
+          return Promise.reject(false);
         }
-        if (respMsg) {
-          toastStore.getState().show({
-            msg: `statusCode: ${status}; ${respMsg || ''}`,
-            variant: 'danger',
-          });
+        if (status >= 500) {
+          console.error(
+            `Request failed with status code ${status}, ${msg || ''}`,
+          );
         }
         return Promise.reject(false);
       },

From 4300e524be1ce2d247fc8821ccf8a019de4e5fed Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 29 Nov 2022 12:17:20 +0800
Subject: [PATCH 123/194] feat(siteinfo): set site info description is optional
 field

---
 internal/schema/siteinfo_schema.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go
index 88c767e9..d1292623 100644
--- a/internal/schema/siteinfo_schema.go
+++ b/internal/schema/siteinfo_schema.go
@@ -8,8 +8,8 @@ import (
 // SiteGeneralReq site general request
 type SiteGeneralReq struct {
 	Name             string `validate:"required,gt=1,lte=128" form:"name" json:"name"`
-	ShortDescription string `validate:"required,gt=3,lte=255" form:"short_description" json:"short_description"`
-	Description      string `validate:"required,gt=3,lte=2000" form:"description" json:"description"`
+	ShortDescription string `validate:"omitempty,gt=3,lte=255" form:"short_description" json:"short_description"`
+	Description      string `validate:"omitempty,gt=3,lte=2000" form:"description" json:"description"`
 	SiteUrl          string `validate:"required,gt=1,lte=512,url" form:"site_url" json:"site_url"`
 	ContactEmail     string `validate:"required,gt=1,lte=512,email" form:"contact_email" json:"contact_email"`
 }

From 6d5c6d346786ed813a6c04aace4b32fbef41aa73 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 29 Nov 2022 12:24:47 +0800
Subject: [PATCH 124/194] fix: axios timline for tag title change

---
 ui/src/pages/Tags/Info/index.tsx | 5 ++++-
 ui/src/pages/Timeline/index.tsx  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index f9430280..8e4a765a 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -137,7 +137,10 @@ const TagIntroduction = () => {
               {isLogged && (
                 <Link
                   to={`/tags/${tagInfo?.tag_id}/timeline`}
-                  className="link-secondary btn-no-border p-0 fs-14 ms-3">
+                  className={classNames(
+                    'link-secondary btn-no-border p-0 fs-14',
+                    tagInfo?.member_actions?.length > 0 && 'ms-3',
+                  )}>
                   {t('history')}
                 </Link>
               )}
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index f365fa2b..2ba12c42 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -61,7 +61,7 @@ const Index: FC = () => {
       timelineData?.object_info.main_tag_slug_name ||
       timelineData?.object_info.title
     }`;
-    pageTitle = `${t('title_for_tag')} ${timelineData?.object_info.title}`;
+    pageTitle = `${t('title_for_tag')} '${timelineData?.object_info.title}'`;
   }
 
   const revisionList =

From 22e683a0b85729ff277e0018ce842f50ac4b900f Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 29 Nov 2022 14:56:22 +0800
Subject: [PATCH 125/194] fix

---
 docs/docs.go                                 | 3 +++
 docs/swagger.json                            | 3 +++
 docs/swagger.yaml                            | 2 ++
 internal/entity/question_entity.go           | 4 ++--
 internal/service/question_common/question.go | 6 ++++++
 internal/service/question_service.go         | 4 ++--
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 119db1fe..eb99dfca 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4709,6 +4709,9 @@ const docTemplate = `{
                 },
                 "title": {
                     "type": "string"
+                },
+                "username": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.json b/docs/swagger.json
index 097f3938..6af9f310 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4697,6 +4697,9 @@
                 },
                 "title": {
                     "type": "string"
+                },
+                "username": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a3f3ce70..abd78c89 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -99,6 +99,8 @@ definitions:
         type: string
       title:
         type: string
+      username:
+        type: string
     type: object
   schema.ActObjectTimeline:
     properties:
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index fd459e71..93d94cd6 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -31,7 +31,7 @@ type QuestionTag struct {
 type Question struct {
 	ID               string    `xorm:"not null pk BIGINT(20) id"`
 	CreatedAt        time.Time `xorm:"not null default CURRENT_TIMESTAMP TIMESTAMP created_at"`
-	UpdatedAt        time.Time `xorm:"not null default CURRENT_TIMESTAMP TIMESTAMP updated_at"`
+	UpdatedAt        time.Time `xorm:"updated_at TIMESTAMP"`
 	UserID           string    `xorm:"not null default 0 BIGINT(20) INDEX user_id"`
 	Title            string    `xorm:"not null default '' VARCHAR(150) title"`
 	OriginalText     string    `xorm:"not null MEDIUMTEXT original_text"`
@@ -45,7 +45,7 @@ type Question struct {
 	FollowCount      int       `xorm:"not null default 0 INT(11) follow_count"`
 	AcceptedAnswerID string    `xorm:"not null default 0 BIGINT(20) accepted_answer_id"`
 	LastAnswerID     string    `xorm:"not null default 0 BIGINT(20) last_answer_id"`
-	PostUpdateTime   time.Time `xorm:"default CURRENT_TIMESTAMP TIMESTAMP post_update_time"`
+	PostUpdateTime   time.Time `xorm:"post_update_time TIMESTAMP"`
 	RevisionID       string    `xorm:"not null default 0 BIGINT(20) revision_id"`
 }
 
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 479238eb..72cfba92 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -380,7 +380,13 @@ func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question)
 	info.CreateTime = data.CreatedAt.Unix()
 	info.UpdateTime = data.UpdatedAt.Unix()
 	info.PostUpdateTime = data.PostUpdateTime.Unix()
+	if data.PostUpdateTime.Unix() < 1 {
+		info.PostUpdateTime = 0
+	}
 	info.QuestionUpdateTime = data.UpdatedAt.Unix()
+	if data.UpdatedAt.Unix() < 1 {
+		info.QuestionUpdateTime = 0
+	}
 	info.Status = data.Status
 	info.UserID = data.UserID
 	info.Tags = make([]*schema.TagResp, 0)
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 08c84b0b..1c929ece 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -149,11 +149,11 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	question.ParsedText = req.HTML
 	question.AcceptedAnswerID = "0"
 	question.LastAnswerID = "0"
-	question.PostUpdateTime = now
+	//question.PostUpdateTime = nil
 	question.Status = entity.QuestionStatusAvailable
 	question.RevisionID = "0"
 	question.CreatedAt = now
-	// question.UpdatedAt = now
+	//question.UpdatedAt = nil
 	err = qs.questionRepo.AddQuestion(ctx, question)
 	if err != nil {
 		return

From 59d4349a39742ac89466fdec8962f8364e35a57e Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:01:17 +0800
Subject: [PATCH 126/194] fix question update time

---
 internal/service/question_service.go | 3 ++-
 internal/service/revision_service.go | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 1c929ece..7dd3ad9f 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -295,6 +295,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	question.ParsedText = req.HTML
 	question.ID = req.ID
 	question.UpdatedAt = now
+	question.PostUpdateTime = now
 	dbinfo, has, err := qs.questionRepo.GetQuestion(ctx, question.ID)
 	if err != nil {
 		return
@@ -381,7 +382,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		//Direct modification
 		revisionDTO.Status = entity.RevisionReviewPassStatus
 		//update question to db
-		saveerr := qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
+		saveerr := qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time"})
 		if saveerr != nil {
 			return questionInfo, saveerr
 		}
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index bfe28508..20fb14ba 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -127,7 +127,8 @@ func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionit
 		question.OriginalText = questioninfo.Content
 		question.ParsedText = questioninfo.HTML
 		question.UpdatedAt = now
-		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at"})
+		question.PostUpdateTime = now
+		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time"})
 		if saveerr != nil {
 			return saveerr
 		}

From c1412a9ebaf2ebca7926a14d6ca36bc89c68dd76 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 29 Nov 2022 15:48:11 +0800
Subject: [PATCH 127/194] fix(comment): if with `commentId` query param, auto
 scroll to target comment

---
 ui/src/components/Comment/index.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index 0f8da060..5cc10c76 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -10,7 +10,7 @@ import { marked } from 'marked';
 import * as Types from '@/common/interface';
 import { Modal } from '@/components';
 import { usePageUsers, useReportModal } from '@/hooks';
-import { matchedUsers, parseUserInfo } from '@/utils';
+import { matchedUsers, parseUserInfo, scrollTop } from '@/utils';
 import { tryNormalLogged } from '@/utils/guard';
 import {
   useQueryComments,
@@ -40,6 +40,13 @@ const Comment = ({ objectId, mode, commentId }) => {
   const reportModal = useReportModal();
 
   const { t } = useTranslation('translation', { keyPrefix: 'comment' });
+  const scrollCallback = useCallback((el, co) => {
+    if (pageIndex === 0 && co.comment_id === commentId) {
+      setTimeout(() => {
+        scrollTop(el);
+      }, 100);
+    }
+  }, []);
 
   useEffect(() => {
     if (!data) {
@@ -224,6 +231,9 @@ const Comment = ({ objectId, mode, commentId }) => {
         return (
           <div
             key={item.comment_id}
+            ref={(el) => {
+              scrollCallback(el, item);
+            }}
             className={classNames(
               'border-bottom py-2 comment-item',
               index === 0 && 'border-top',

From c5eecd33c359a576054417e3e00678e6e9cfeb53 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:50:07 +0800
Subject: [PATCH 128/194] fix question recommend tag

---
 internal/service/question_service.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 7dd3ad9f..a6523864 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -125,12 +125,6 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	if err != nil {
 		return
 	}
-	if !recommendExist {
-		err = fmt.Errorf("recommend is not exist")
-		err = errors.BadRequest(reason.RecommendTagNotExist).WithError(err).WithStack()
-		return
-	}
-
 	if !recommendExist {
 		errorlist := make([]*validator.FormErrorField, 0)
 		errorlist = append(errorlist, &validator.FormErrorField{

From 2d3ec9173c91784ef1fb17205ea66e3b0767893e Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 29 Nov 2022 16:03:19 +0800
Subject: [PATCH 129/194] fix: timeline for tag diffcontent

---
 ui/src/components/DiffContent/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 2362e81c..2becb18d 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -24,7 +24,7 @@ const Index: FC<Props> = ({
     showTagUrlSlug: true,
   },
 }) => {
-  if (!newData?.original_text) return null;
+  if (!newData) return null;
 
   let tag = newData.tags;
   if (objectType === 'question' && oldData?.tags) {

From ac3a9a4e24d892746959966b2d2b7cd5113f7c49 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Tue, 29 Nov 2022 16:04:43 +0800
Subject: [PATCH 130/194] fix(ui): solve the problem that the checkbox cannot
 be selected

FIx: #101
---
 ui/src/components/SchemaForm/index.tsx | 21 ++++++++++++++++++++-
 ui/src/pages/Admin/Smtp/index.tsx      |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index 1d36e7e9..e9629aef 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -225,6 +225,24 @@ const SchemaForm: FC<IProps> = ({
     }
   };
 
+  const handleCheckboxChange = (
+    e: React.ChangeEvent<HTMLInputElement>,
+    index: number,
+  ) => {
+    const { name } = e.target;
+    const data = {
+      ...formData,
+      [name]: {
+        ...formData[name],
+        value: schema.properties[name]?.enum?.[index],
+        isInvalid: false,
+      },
+    };
+    if (onChange instanceof Function) {
+      onChange(data);
+    }
+  };
+
   return (
     <Form noValidate onSubmit={handleSubmit}>
       {keys.map((key) => {
@@ -265,13 +283,14 @@ const SchemaForm: FC<IProps> = ({
                       inline
                       required
                       type={widget}
-                      name={title}
+                      name={key}
                       id={String(item)}
                       label={properties[key].enumNames?.[index]}
                       checked={formData[key]?.value === item}
                       feedback={formData[key]?.errorMsg}
                       feedbackType="invalid"
                       isInvalid={formData[key].isInvalid}
+                      onChange={(e) => handleCheckboxChange(e, index)}
                     />
                   );
                 })}
diff --git a/ui/src/pages/Admin/Smtp/index.tsx b/ui/src/pages/Admin/Smtp/index.tsx
index 2af421a6..26cdd451 100644
--- a/ui/src/pages/Admin/Smtp/index.tsx
+++ b/ui/src/pages/Admin/Smtp/index.tsx
@@ -37,7 +37,7 @@ const Smtp: FC = () => {
         type: 'boolean',
         title: t('encryption.label'),
         description: t('encryption.text'),
-        enum: [true, false],
+        enum: ['SSL', ''],
         enumNames: ['SSL', ''],
       },
       smtp_port: {

From 84bca528dec03da687a56245dfe11072ee790d54 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 29 Nov 2022 17:44:44 +0800
Subject: [PATCH 131/194] fix: diffconten style adjustment

---
 ui/src/components/DiffContent/index.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 2becb18d..7f70c760 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -1,5 +1,7 @@
 import { FC, memo } from 'react';
 
+import clssnames from 'classnames';
+
 import { Tag } from '@/components';
 import { diffText } from '@/utils';
 
@@ -87,7 +89,11 @@ const Index: FC<Props> = ({
         </div>
       )}
       {objectType === 'tag' && opts?.showTagUrlSlug && (
-        <div className="mb-4 fs-14 font-monospace">
+        <div
+          className={clssnames(
+            'fs-14 font-monospace',
+            newData.original_text && 'mb-4',
+          )}>
           {`/tags/${
             newData?.main_tag_slug_name
               ? diffText(

From 8e521652294249ed55990608083cc4d52b1a6531 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 29 Nov 2022 17:49:02 +0800
Subject: [PATCH 132/194] fix(footer): gitlab#1342

---
 i18n/en_US.yaml                    |  2 +-
 ui/src/common/constants.ts         |  1 +
 ui/src/components/Footer/index.tsx | 12 ++++++++++--
 ui/src/components/Header/index.tsx |  3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index c3e3085e..98b40543 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -529,7 +529,7 @@ ui:
   footer:
     build_on: >-
       Built on <1> Answer </1>- the open-source software that power Q&A
-      communities<br />Made with love © 2022 Answer
+      communities.<br />Made with love © {{cc}}.
   upload_img:
     name: Change
     loading: loading...
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index f0a282ba..4992c200 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -1,3 +1,4 @@
+export const DEFAULT_SITE_NAME = 'Answer';
 export const DEFAULT_LANG = 'en_US';
 export const CURRENT_LANG_STORAGE_KEY = '_a_lang_';
 export const LANG_RESOURCE_STORAGE_KEY = '_a_lang_r_';
diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsx
index d7664e85..65ac6f33 100644
--- a/ui/src/components/Footer/index.tsx
+++ b/ui/src/components/Footer/index.tsx
@@ -2,12 +2,20 @@ import React from 'react';
 import { Container } from 'react-bootstrap';
 import { Trans } from 'react-i18next';
 
+import dayjs from 'dayjs';
+
+import { siteInfoStore } from '@/stores';
+import { DEFAULT_SITE_NAME } from '@/common/constants';
+
 const Index = () => {
+  const fullYear = dayjs().format('YYYY');
+  const siteName = siteInfoStore.getState().siteInfo.name || DEFAULT_SITE_NAME;
+  const cc = `${fullYear} ${siteName}`;
   return (
     <footer className="bg-light py-3">
       <Container>
         <p className="text-center mb-0 fs-14 text-secondary">
-          <Trans i18nKey="footer.build_on">
+          <Trans i18nKey="footer.build_on" values={{ cc }}>
             Built on
             {/* eslint-disable-next-line react/jsx-no-target-blank */}
             <a href="https://answer.dev/" target="_blank">
@@ -15,7 +23,7 @@ const Index = () => {
             </a>
             - the open-source software that powers Q&A communities.
             <br />
-            Made with love. © 2022 Answer .
+            Made with love. © 2022 Answer.
           </Trans>
         </p>
       </Container>
diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsx
index 0a841797..3ec00e2c 100644
--- a/ui/src/components/Header/index.tsx
+++ b/ui/src/components/Header/index.tsx
@@ -20,6 +20,7 @@ import {
 import { loggedUserInfoStore, siteInfoStore, brandingStore } from '@/stores';
 import { logout, useQueryNotificationStatus } from '@/services';
 import { RouteAlias } from '@/router/alias';
+import { DEFAULT_SITE_NAME } from '@/common/constants';
 
 import NavItems from './components/NavItems';
 
@@ -88,7 +89,7 @@ const Header: FC = () => {
                 />
               </>
             ) : (
-              <span>{siteInfo.name || 'Answer'}</span>
+              <span>{siteInfo.name || DEFAULT_SITE_NAME}</span>
             )}
           </Navbar.Brand>
 

From c4c5f4016a706e5bf0833d533bc9f0ae8a8e3657 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 29 Nov 2022 18:06:27 +0800
Subject: [PATCH 133/194] fix: diffText fucntion change

---
 ui/src/components/DiffContent/index.tsx | 2 +-
 ui/src/utils/common.ts                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/DiffContent/index.tsx b/ui/src/components/DiffContent/index.tsx
index 7f70c760..922e25c1 100644
--- a/ui/src/components/DiffContent/index.tsx
+++ b/ui/src/components/DiffContent/index.tsx
@@ -76,7 +76,7 @@ const Index: FC<Props> = ({
       )}
       {objectType === 'question' && (
         <div className="mb-4">
-          {tag.map((item) => {
+          {tag?.map((item) => {
             return (
               <Tag
                 key={item.slug_name}
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 9b2eee69..1b8ac340 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -170,7 +170,7 @@ function diffText(newText: string, oldText: string): string {
     return '';
   }
 
-  if (!oldText) {
+  if (typeof oldText !== 'string') {
     return newText
       ?.replace(/\n/gi, '<br>')
       ?.replace(/<iframe/gi, '&lt;iframe')

From ad8b301c9ee443001f495899e0f3ad1525063c71 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Tue, 29 Nov 2022 18:33:19 +0800
Subject: [PATCH 134/194] fix: solve the problem that the form does not follow
 the specification

---
 ui/src/common/interface.ts             |  4 +-
 ui/src/components/SchemaForm/index.tsx | 73 ++++++++++++++++++++------
 ui/src/pages/Admin/Smtp/index.tsx      | 54 ++++++++++++++++---
 3 files changed, 104 insertions(+), 27 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 60e83af2..c080ce76 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -287,9 +287,9 @@ export interface AdminSettingsSmtp {
   from_name: string;
   smtp_authentication: boolean;
   smtp_host: string;
-  smtp_password: string;
+  smtp_password?: string;
   smtp_port: number;
-  smtp_username: string;
+  smtp_username?: string;
   test_email_recipient?: string;
 }
 
diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index e9629aef..7fe6d219 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -2,6 +2,8 @@ import { FC } from 'react';
 import { Form, Button, Stack } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
+import classnames from 'classnames';
+
 import BrandUpload from '../BrandUpload';
 import TimeZonePicker from '../TimeZonePicker';
 import type * as Type from '@/common/interface';
@@ -51,7 +53,10 @@ export interface UISchema {
         | 'url'
         | 'week';
       empty?: string;
-      validator?: (value) => Promise<string | true | void> | true | string;
+      validator?: (
+        value,
+        formData?,
+      ) => Promise<string | true | void> | true | string;
       textRender?: () => React.ReactElement;
       imageType?: Type.UploadType;
       acceptType?: string;
@@ -141,7 +146,7 @@ const SchemaForm: FC<IProps> = ({
         const value = formData[key]?.value;
         promises.push({
           key,
-          promise: validator(value),
+          promise: validator(value, formData),
         });
       }
     });
@@ -251,7 +256,10 @@ const SchemaForm: FC<IProps> = ({
           uiSchema[key] || {};
         if (widget === 'select') {
           return (
-            <Form.Group key={title} controlId={key} className="mb-3">
+            <Form.Group
+              key={title}
+              controlId={key}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}>
               <Form.Label>{title}</Form.Label>
               <Form.Select
                 aria-label={description}
@@ -267,13 +275,18 @@ const SchemaForm: FC<IProps> = ({
               <Form.Control.Feedback type="invalid">
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
         if (widget === 'checkbox' || widget === 'radio') {
           return (
-            <Form.Group key={title} className="mb-3" controlId={key}>
+            <Form.Group
+              key={title}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}
+              controlId={key}>
               <Form.Label>{title}</Form.Label>
               <Stack direction="horizontal">
                 {properties[key].enum?.map((item, index) => {
@@ -298,15 +311,19 @@ const SchemaForm: FC<IProps> = ({
               <Form.Control.Feedback type="invalid">
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
 
         if (widget === 'switch') {
-          console.log(formData[key]?.value, 'switch=====');
           return (
-            <Form.Group key={title} className="mb-3" controlId={key}>
+            <Form.Group
+              key={title}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}
+              controlId={key}>
               <Form.Label>{title}</Form.Label>
               <Form.Check
                 required
@@ -323,13 +340,18 @@ const SchemaForm: FC<IProps> = ({
               <Form.Control.Feedback type="invalid">
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
         if (widget === 'timezone') {
           return (
-            <Form.Group key={title} className="mb-3" controlId={key}>
+            <Form.Group
+              key={title}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}
+              controlId={key}>
               <Form.Label>{title}</Form.Label>
               <TimeZonePicker
                 value={formData[key]?.value}
@@ -343,14 +365,19 @@ const SchemaForm: FC<IProps> = ({
               <Form.Control.Feedback type="invalid">
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
 
         if (widget === 'upload') {
           return (
-            <Form.Group key={title} className="mb-3" controlId={key}>
+            <Form.Group
+              key={title}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}
+              controlId={key}>
               <Form.Label>{title}</Form.Label>
               <BrandUpload
                 type={options.imageType || 'avatar'}
@@ -366,14 +393,19 @@ const SchemaForm: FC<IProps> = ({
               <Form.Control.Feedback type="invalid">
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
 
         if (widget === 'textarea') {
           return (
-            <Form.Group controlId={key} key={key} className="mb-3">
+            <Form.Group
+              controlId={key}
+              key={key}
+              className={classnames('mb-3', formData[key].hidden && 'd-none')}>
               <Form.Label>{title}</Form.Label>
               <Form.Control
                 as="textarea"
@@ -389,12 +421,17 @@ const SchemaForm: FC<IProps> = ({
                 {formData[key]?.errorMsg}
               </Form.Control.Feedback>
 
-              <Form.Text className="text-muted">{description}</Form.Text>
+              {description && (
+                <Form.Text className="text-muted">{description}</Form.Text>
+              )}
             </Form.Group>
           );
         }
         return (
-          <Form.Group controlId={key} key={key} className="mb-3">
+          <Form.Group
+            controlId={key}
+            key={key}
+            className={classnames('mb-3', formData[key].hidden && 'd-none')}>
             <Form.Label>{title}</Form.Label>
             <Form.Control
               name={key}
@@ -409,7 +446,9 @@ const SchemaForm: FC<IProps> = ({
               {formData[key]?.errorMsg}
             </Form.Control.Feedback>
 
-            <Form.Text className="text-muted">{description}</Form.Text>
+            {description && (
+              <Form.Text className="text-muted">{description}</Form.Text>
+            )}
           </Form.Group>
         );
       })}
diff --git a/ui/src/pages/Admin/Smtp/index.tsx b/ui/src/pages/Admin/Smtp/index.tsx
index 26cdd451..adfaff9b 100644
--- a/ui/src/pages/Admin/Smtp/index.tsx
+++ b/ui/src/pages/Admin/Smtp/index.tsx
@@ -37,8 +37,8 @@ const Smtp: FC = () => {
         type: 'boolean',
         title: t('encryption.label'),
         description: t('encryption.text'),
-        enum: ['SSL', ''],
-        enumNames: ['SSL', ''],
+        enum: ['SSL', 'None'],
+        enumNames: ['SSL', 'None'],
       },
       smtp_port: {
         type: 'string',
@@ -54,12 +54,10 @@ const Smtp: FC = () => {
       smtp_username: {
         type: 'string',
         title: t('smtp_username.label'),
-        description: t('smtp_username.text'),
       },
       smtp_password: {
         type: 'string',
         title: t('smtp_password.label'),
-        description: t('smtp_password.text'),
       },
       test_email_recipient: {
         type: 'string',
@@ -70,15 +68,35 @@ const Smtp: FC = () => {
   };
   const uiSchema: UISchema = {
     encryption: {
-      'ui:widget': 'radio',
+      'ui:widget': 'select',
+    },
+    smtp_username: {
+      'ui:options': {
+        validator: (value: string, formData) => {
+          if (formData.smtp_authentication.value) {
+            if (!value) {
+              return t('smtp_username.msg');
+            }
+          }
+          return true;
+        },
+      },
     },
     smtp_password: {
       'ui:options': {
         type: 'password',
+        validator: (value: string, formData) => {
+          if (formData.smtp_authentication.value) {
+            if (!value) {
+              return t('smtp_password.msg');
+            }
+          }
+          return true;
+        },
       },
     },
     smtp_authentication: {
-      'ui:widget': 'radio',
+      'ui:widget': 'switch',
     },
     smtp_port: {
       'ui:options': {
@@ -116,8 +134,12 @@ const Smtp: FC = () => {
       encryption: formData.encryption.value,
       smtp_port: Number(formData.smtp_port.value),
       smtp_authentication: formData.smtp_authentication.value,
-      smtp_username: formData.smtp_username.value,
-      smtp_password: formData.smtp_password.value,
+      ...(formData.smtp_authentication.value
+        ? { smtp_username: formData.smtp_username.value }
+        : {}),
+      ...(formData.smtp_authentication.value
+        ? { smtp_password: formData.smtp_password.value }
+        : {}),
       test_email_recipient: formData.test_email_recipient.value,
     };
 
@@ -151,6 +173,22 @@ const Smtp: FC = () => {
     setFormData(formState);
   }, [setting]);
 
+  useEffect(() => {
+    if (formData.smtp_authentication.value) {
+      setFormData({
+        ...formData,
+        smtp_username: { ...formData.smtp_username, hidden: false },
+        smtp_password: { ...formData.smtp_password, hidden: false },
+      });
+    } else {
+      setFormData({
+        ...formData,
+        smtp_username: { ...formData.smtp_username, hidden: true },
+        smtp_password: { ...formData.smtp_password, hidden: true },
+      });
+    }
+  }, [formData.smtp_authentication]);
+
   const handleOnChange = (data) => {
     setFormData(data);
   };

From 199c3524eef1e34b6912d3acd06da06696a43663 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 29 Nov 2022 19:34:36 +0800
Subject: [PATCH 135/194] fix(badge): change `Badge` to bootstrap 5.2

---
 ui/src/common/constants.ts                    | 12 +++---
 ui/src/components/AccordionNav/index.tsx      |  6 +--
 ui/src/pages/Admin/Answers/index.tsx          | 12 ++++--
 .../components/HealthStatus/index.tsx         | 39 ++++++++-----------
 ui/src/pages/Admin/Questions/index.tsx        | 12 ++++--
 ui/src/pages/Admin/Users/index.tsx            | 16 +++++---
 ui/src/pages/Review/index.tsx                 | 14 +------
 .../Search/components/SearchItem/index.tsx    |  9 ++---
 .../Personal/components/UserInfo/index.tsx    |  6 +--
 9 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 4992c200..ab06f5f9 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -10,29 +10,29 @@ export const CAPTCHA_CODE_STORAGE_KEY = '_a_captcha_';
 export const ADMIN_LIST_STATUS = {
   // normal;
   1: {
-    variant: 'success',
+    variant: 'text-bg-success',
     name: 'normal',
   },
   // closed;
   2: {
-    variant: 'warning',
+    variant: 'text-bg-warning',
     name: 'closed',
   },
   // deleted
   10: {
-    variant: 'danger',
+    variant: 'text-bg-danger',
     name: 'deleted',
   },
   normal: {
-    variant: 'success',
+    variant: 'text-bg-success',
     name: 'normal',
   },
   closed: {
-    variant: 'warning',
+    variant: 'text-bg-warning',
     name: 'closed',
   },
   deleted: {
-    variant: 'danger',
+    variant: 'text-bg-danger',
     name: 'deleted',
   },
 };
diff --git a/ui/src/components/AccordionNav/index.tsx b/ui/src/components/AccordionNav/index.tsx
index cf5620c2..dd0ef6f0 100644
--- a/ui/src/components/AccordionNav/index.tsx
+++ b/ui/src/components/AccordionNav/index.tsx
@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import { Accordion, Badge, Button, Stack } from 'react-bootstrap';
+import { Accordion, Button, Stack } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useMatch } from 'react-router-dom';
 
@@ -33,9 +33,9 @@ function MenuNode({ menu, callback, activeKey, isLeaf = false }) {
         {!isLeaf ? <Icon name="chevron-right" className="me-1" /> : null}
         {t(menu.name)}
         {menu.badgeContent ? (
-          <Badge bg="dark" className="ms-auto top-0">
+          <span className="badge text-bg-dark ms-auto top-0">
             {menu.badgeContent}
-          </Badge>
+          </span>
         ) : null}
       </Stack>
     </Button>
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index 3221f60f..c59a62b6 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -1,8 +1,10 @@
 import { FC } from 'react';
-import { Button, Form, Table, Stack, Badge } from 'react-bootstrap';
+import { Button, Form, Table, Stack } from 'react-bootstrap';
 import { useSearchParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
+import classNames from 'classnames';
+
 import {
   FormatTime,
   Icon,
@@ -159,9 +161,13 @@ const Answers: FC = () => {
                   </Stack>
                 </td>
                 <td>
-                  <Badge bg={ADMIN_LIST_STATUS[curFilter]?.variant}>
+                  <span
+                    className={classNames(
+                      'badge',
+                      ADMIN_LIST_STATUS[curFilter]?.variant,
+                    )}>
                     {t(ADMIN_LIST_STATUS[curFilter]?.name)}
-                  </Badge>
+                  </span>
                 </td>
                 {curFilter !== 'deleted' && (
                   <td>
diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
index 2193df17..ac2c78b5 100644
--- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { Card, Row, Col, Badge } from 'react-bootstrap';
+import { Card, Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
@@ -22,38 +22,31 @@ const HealthStatus: FC<IProps> = ({ data }) => {
             <span className="text-secondary me-1">{t('version')}</span>
             <strong>{version}</strong>
             {isLatest && (
-              <Badge
-                pill
-                bg="success"
-                className="ms-1"
-                as="a"
+              <a
+                className="ms-1 badge rounded-pill text-bg-success"
                 target="_blank"
-                href="https://github.com/answerdev/answer/releases">
+                href="https://github.com/answerdev/answer/releases"
+                rel="noreferrer">
                 {t('latest')}
-              </Badge>
+              </a>
             )}
             {!isLatest && remote_version && (
-              <Badge
-                pill
-                bg="warning"
-                text="dark"
-                className="ms-1"
-                as="a"
+              <a
+                className="ms-1 badge rounded-pill text-bg-warning"
                 target="_blank"
-                href="https://github.com/answerdev/answer/releases">
+                href="https://github.com/answerdev/answer/releases"
+                rel="noreferrer">
                 {t('update_to')} {remote_version}
-              </Badge>
+              </a>
             )}
             {!isLatest && !remote_version && (
-              <Badge
-                pill
-                bg="danger"
-                className="ms-1"
-                as="a"
+              <a
+                className="ms-1 badge rounded-pill text-bg-danger"
                 target="_blank"
-                href="https://github.com/answerdev/answer/releases">
+                href="https://github.com/answerdev/answer/releases"
+                rel="noreferrer">
                 {t('check_failed')}
-              </Badge>
+              </a>
             )}
           </Col>
           <Col xs={6} className="mb-1">
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 4169b840..924e6dd9 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -1,8 +1,10 @@
 import { FC } from 'react';
-import { Button, Form, Table, Stack, Badge } from 'react-bootstrap';
+import { Button, Form, Table, Stack } from 'react-bootstrap';
 import { Link, useSearchParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
+import classNames from 'classnames';
+
 import {
   FormatTime,
   Icon,
@@ -167,9 +169,13 @@ const Questions: FC = () => {
                   </Stack>
                 </td>
                 <td>
-                  <Badge bg={ADMIN_LIST_STATUS[curFilter]?.variant}>
+                  <span
+                    className={classNames(
+                      'badge',
+                      ADMIN_LIST_STATUS[curFilter]?.variant,
+                    )}>
                     {t(ADMIN_LIST_STATUS[curFilter]?.name)}
-                  </Badge>
+                  </span>
                 </td>
                 {curFilter !== 'deleted' && (
                   <td>
diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index 58b849d1..e541e2a4 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -1,8 +1,10 @@
 import { FC } from 'react';
-import { Button, Form, Table, Badge } from 'react-bootstrap';
+import { Button, Form, Table } from 'react-bootstrap';
 import { useSearchParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
+import classNames from 'classnames';
+
 import {
   Pagination,
   FormatTime,
@@ -24,10 +26,10 @@ const UserFilterKeys: Type.UserFilterBy[] = [
 ];
 
 const bgMap = {
-  normal: 'success',
-  suspended: 'danger',
-  deleted: 'danger',
-  inactive: 'secondary',
+  normal: 'text-bg-success',
+  suspended: 'text-bg-danger',
+  deleted: 'text-bg-danger',
+  inactive: 'text-bg-secondary',
 };
 
 const PAGE_SIZE = 10;
@@ -132,7 +134,9 @@ const Users: FC = () => {
                   </td>
                 )}
                 <td>
-                  <Badge bg={bgMap[user.status]}>{t(user.status)}</Badge>
+                  <span className={classNames('badge', bgMap[user.status])}>
+                    {t(user.status)}
+                  </span>
                 </td>
                 {curFilter !== 'deleted' ? (
                   <td>
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 54e295e0..a4a20011 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -1,13 +1,5 @@
 import { FC, useEffect, useState } from 'react';
-import {
-  Container,
-  Row,
-  Col,
-  Alert,
-  Badge,
-  Stack,
-  Button,
-} from 'react-bootstrap';
+import { Container, Row, Col, Alert, Stack, Button } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
@@ -120,9 +112,7 @@ const Index: FC = () => {
             <Col lg={{ span: 7, offset: 1 }}>
               <Alert variant="secondary">
                 <Stack className="align-items-start">
-                  <Badge bg="secondary" className="mb-2">
-                    {editBadge}
-                  </Badge>
+                  <span className="badge text-bg-secondary">{editBadge}</span>
                   <Link to={itemLink} target="_blank">
                     {itemTitle}
                   </Link>
diff --git a/ui/src/pages/Search/components/SearchItem/index.tsx b/ui/src/pages/Search/components/SearchItem/index.tsx
index ad08aa5e..fbbb67b8 100644
--- a/ui/src/pages/Search/components/SearchItem/index.tsx
+++ b/ui/src/pages/Search/components/SearchItem/index.tsx
@@ -1,5 +1,5 @@
 import { memo, FC } from 'react';
-import { ListGroupItem, Badge } from 'react-bootstrap';
+import { ListGroupItem } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import { Icon, Tag, FormatTime, BaseUserCard } from '@/components';
@@ -21,12 +21,11 @@ const Index: FC<Props> = ({ data }) => {
   return (
     <ListGroupItem className="py-3 px-0">
       <div className="mb-2 clearfix">
-        <Badge
-          bg="dark"
-          className="me-2 float-start"
+        <span
+          className="float-start me-2 badge text-bg-dark"
           style={{ marginTop: '2px' }}>
           {data.object_type === 'question' ? 'Q' : 'A'}
-        </Badge>
+        </span>
         <a className="h5 mb-0 link-dark text-break" href={itemUrl}>
           {data.object.title}
           {data.object.status === 'closed'
diff --git a/ui/src/pages/Users/Personal/components/UserInfo/index.tsx b/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
index d2bee725..c31e376f 100644
--- a/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
+++ b/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
@@ -1,5 +1,5 @@
 import { FC, memo } from 'react';
-import { Badge, OverlayTrigger, Tooltip } from 'react-bootstrap';
+import { OverlayTrigger, Tooltip } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
@@ -42,9 +42,7 @@ const Index: FC<Props> = ({ data }) => {
               <OverlayTrigger
                 placement="top"
                 overlay={<Tooltip>{t('mod_long')}</Tooltip>}>
-                <Badge bg="light" className="text-body">
-                  {t('mod_short')}
-                </Badge>
+                <span className="badge text-bg-light">{t('mod_short')}</span>
               </OverlayTrigger>
             </div>
           )}

From 8faafda08615e58459aaef3de3fde84208d27822 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Tue, 29 Nov 2022 18:40:39 +0800
Subject: [PATCH 136/194] fix(ui): solve the problem of irregular use of input
 type

---
 ui/src/pages/Admin/General/index.tsx | 2 ++
 ui/src/pages/Admin/Smtp/index.tsx    | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/ui/src/pages/Admin/General/index.tsx b/ui/src/pages/Admin/General/index.tsx
index fd41842a..d7a96054 100644
--- a/ui/src/pages/Admin/General/index.tsx
+++ b/ui/src/pages/Admin/General/index.tsx
@@ -53,6 +53,7 @@ const General: FC = () => {
   const uiSchema: UISchema = {
     site_url: {
       'ui:options': {
+        type: 'url',
         validator: (value) => {
           let url: URL | undefined;
           try {
@@ -76,6 +77,7 @@ const General: FC = () => {
     },
     contact_email: {
       'ui:options': {
+        type: 'email',
         validator: (value) => {
           if (!Pattern.email.test(value)) {
             return t('contact_email.validate');
diff --git a/ui/src/pages/Admin/Smtp/index.tsx b/ui/src/pages/Admin/Smtp/index.tsx
index adfaff9b..fcb81009 100644
--- a/ui/src/pages/Admin/Smtp/index.tsx
+++ b/ui/src/pages/Admin/Smtp/index.tsx
@@ -67,6 +67,11 @@ const Smtp: FC = () => {
     },
   };
   const uiSchema: UISchema = {
+    from_email: {
+      'ui:options': {
+        type: 'email',
+      },
+    },
     encryption: {
       'ui:widget': 'select',
     },
@@ -100,6 +105,7 @@ const Smtp: FC = () => {
     },
     smtp_port: {
       'ui:options': {
+        type: 'number',
         validator: (value) => {
           if (!/^[1-9][0-9]*$/.test(value) || Number(value) > 65535) {
             return t('smtp_port.msg');
@@ -110,6 +116,7 @@ const Smtp: FC = () => {
     },
     test_email_recipient: {
       'ui:options': {
+        type: 'email',
         validator: (value) => {
           if (value && !pattern.email.test(value)) {
             return t('test_email_recipient.msg');

From 1a317d6dce945128f873430a8bcf15d40f09ad51 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 10:12:56 +0800
Subject: [PATCH 137/194] refactor(ui): update general

---
 ui/src/pages/Admin/General/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Admin/General/index.tsx b/ui/src/pages/Admin/General/index.tsx
index d7a96054..a052ab7d 100644
--- a/ui/src/pages/Admin/General/index.tsx
+++ b/ui/src/pages/Admin/General/index.tsx
@@ -87,7 +87,9 @@ const General: FC = () => {
       },
     },
   };
-  const [formData, setFormData] = useState(initFormData(schema));
+  const [formData, setFormData] = useState<Type.FormDataType>(
+    initFormData(schema),
+  );
 
   const onSubmit = (evt) => {
     evt.preventDefault();

From 665332d5d7198669ebb528e2641bc4dfd9eeb481 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 10:14:48 +0800
Subject: [PATCH 138/194] feat(ui): show smtp username and password fields when
 Authentication is on

---
 ui/src/pages/Admin/Smtp/index.tsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ui/src/pages/Admin/Smtp/index.tsx b/ui/src/pages/Admin/Smtp/index.tsx
index fcb81009..a373ba81 100644
--- a/ui/src/pages/Admin/Smtp/index.tsx
+++ b/ui/src/pages/Admin/Smtp/index.tsx
@@ -169,18 +169,17 @@ const Smtp: FC = () => {
     if (!setting) {
       return;
     }
-    const formState = {};
-    Object.keys(formData).forEach((k) => {
-      let v = setting[k];
-      if (v === null || v === undefined) {
-        v = '';
-      }
-      formState[k] = { ...formData[k], value: v };
+    const formMeta = {};
+    Object.keys(setting).forEach((k) => {
+      formMeta[k] = { ...formData[k], value: setting[k] };
     });
-    setFormData(formState);
+    setFormData({ ...formData, ...formMeta });
   }, [setting]);
 
   useEffect(() => {
+    if (formData.smtp_authentication.value === '') {
+      return;
+    }
     if (formData.smtp_authentication.value) {
       setFormData({
         ...formData,
@@ -194,7 +193,7 @@ const Smtp: FC = () => {
         smtp_password: { ...formData.smtp_password, hidden: true },
       });
     }
-  }, [formData.smtp_authentication]);
+  }, [formData.smtp_authentication.value]);
 
   const handleOnChange = (data) => {
     setFormData(data);

From 255decf8cfc020f79d4ff37270bf35b2bddae51c Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 10:20:36 +0800
Subject: [PATCH 139/194] refactor(ui): modify font size

---
 ui/src/pages/Questions/EditAnswer/index.tsx | 2 +-
 ui/src/pages/Tags/Edit/index.tsx            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index b7d2366e..8ef5287b 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -223,7 +223,7 @@ const Ask = () => {
                 {t('title', { keyPrefix: 'how_to_format' })}
               </Card.Header>
               <Card.Body
-                className="fmt"
+                className="fmt small"
                 dangerouslySetInnerHTML={{
                   __html: t('description', { keyPrefix: 'how_to_format' }),
                 }}
diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx
index c3612768..11d26e53 100644
--- a/ui/src/pages/Tags/Edit/index.tsx
+++ b/ui/src/pages/Tags/Edit/index.tsx
@@ -255,7 +255,7 @@ const Ask = () => {
                 {t('title', { keyPrefix: 'how_to_format' })}
               </Card.Header>
               <Card.Body
-                className="fmt"
+                className="fmt small"
                 dangerouslySetInnerHTML={{
                   __html: t('description', { keyPrefix: 'how_to_format' }),
                 }}

From 4c114179c3602324d43b889a6d6375290af08497 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 11:08:14 +0800
Subject: [PATCH 140/194] refactor(ui): solve the problem that select onChange
 is invalid

---
 ui/src/components/SchemaForm/index.tsx | 12 +++++++-----
 ui/src/pages/Admin/Smtp/index.tsx      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index 7fe6d219..b56c3249 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -102,7 +102,7 @@ const SchemaForm: FC<IProps> = ({
 
   const keys = Object.keys(properties);
 
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleChange = (e) => {
     const { name, value } = e.target;
     const data = {
       ...formData,
@@ -262,8 +262,10 @@ const SchemaForm: FC<IProps> = ({
               className={classnames('mb-3', formData[key].hidden && 'd-none')}>
               <Form.Label>{title}</Form.Label>
               <Form.Select
+                name={key}
                 aria-label={description}
-                isInvalid={formData[key].isInvalid}>
+                isInvalid={formData[key].isInvalid}
+                onChange={handleChange}>
                 {properties[key].enum?.map((item, index) => {
                   return (
                     <option value={String(item)} key={String(item)}>
@@ -355,7 +357,7 @@ const SchemaForm: FC<IProps> = ({
               <Form.Label>{title}</Form.Label>
               <TimeZonePicker
                 value={formData[key]?.value}
-                onChange={handleInputChange}
+                onChange={handleChange}
               />
               <Form.Control
                 name={key}
@@ -413,7 +415,7 @@ const SchemaForm: FC<IProps> = ({
                 placeholder={options?.placeholder || ''}
                 type={options?.type || 'text'}
                 value={formData[key]?.value}
-                onChange={handleInputChange}
+                onChange={handleChange}
                 isInvalid={formData[key].isInvalid}
                 rows={options?.rows || 3}
               />
@@ -438,7 +440,7 @@ const SchemaForm: FC<IProps> = ({
               placeholder={options?.placeholder || ''}
               type={options?.type || 'text'}
               value={formData[key]?.value}
-              onChange={handleInputChange}
+              onChange={handleChange}
               style={options?.type === 'color' ? { width: '6rem' } : {}}
               isInvalid={formData[key].isInvalid}
             />
diff --git a/ui/src/pages/Admin/Smtp/index.tsx b/ui/src/pages/Admin/Smtp/index.tsx
index a373ba81..a60ed5c1 100644
--- a/ui/src/pages/Admin/Smtp/index.tsx
+++ b/ui/src/pages/Admin/Smtp/index.tsx
@@ -37,7 +37,7 @@ const Smtp: FC = () => {
         type: 'boolean',
         title: t('encryption.label'),
         description: t('encryption.text'),
-        enum: ['SSL', 'None'],
+        enum: ['SSL', ''],
         enumNames: ['SSL', 'None'],
       },
       smtp_port: {

From 190ab1099024c7c3273d463d4bc35bf495ffee09 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 30 Nov 2022 11:18:59 +0800
Subject: [PATCH 141/194] fix: action link style change

---
 ui/src/pages/Admin/Users/index.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index d261844e..641f55e9 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -160,9 +160,7 @@ const Users: FC = () => {
                 {curFilter !== 'deleted' ? (
                   <td className="text-end">
                     <Dropdown>
-                      <Dropdown.Toggle
-                        variant="link"
-                        className="no-toggle link-secondary">
+                      <Dropdown.Toggle variant="link" className="no-toggle">
                         <Icon name="three-dots-vertical" />
                       </Dropdown.Toggle>
                       <Dropdown.Menu>

From b9140af2f72e34a3bb2b0f132eb547da20913eda Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 12:07:34 +0800
Subject: [PATCH 142/194] refactor(ui): sync code

---
 ui/src/components/SchemaForm/index.tsx | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index b56c3249..52ed5bcc 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -16,6 +16,7 @@ export interface JSONSchema {
     [key: string]: {
       type: 'string' | 'boolean';
       title: string;
+      label?: string;
       description?: string;
       enum?: Array<string | boolean>;
       enumNames?: string[];
@@ -102,7 +103,18 @@ const SchemaForm: FC<IProps> = ({
 
   const keys = Object.keys(properties);
 
-  const handleChange = (e) => {
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const { name, value } = e.target;
+    const data = {
+      ...formData,
+      [name]: { ...formData[name], value, isInvalid: false },
+    };
+    if (onChange instanceof Function) {
+      onChange(data);
+    }
+  };
+
+  const handleSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
     const { name, value } = e.target;
     const data = {
       ...formData,
@@ -251,7 +263,7 @@ const SchemaForm: FC<IProps> = ({
   return (
     <Form noValidate onSubmit={handleSubmit}>
       {keys.map((key) => {
-        const { title, description } = properties[key];
+        const { title, description, label } = properties[key];
         const { 'ui:widget': widget = 'input', 'ui:options': options = {} } =
           uiSchema[key] || {};
         if (widget === 'select') {
@@ -262,10 +274,11 @@ const SchemaForm: FC<IProps> = ({
               className={classnames('mb-3', formData[key].hidden && 'd-none')}>
               <Form.Label>{title}</Form.Label>
               <Form.Select
-                name={key}
                 aria-label={description}
-                isInvalid={formData[key].isInvalid}
-                onChange={handleChange}>
+                name={key}
+                value={formData[key]?.value}
+                onChange={handleSelectChange}
+                isInvalid={formData[key].isInvalid}>
                 {properties[key].enum?.map((item, index) => {
                   return (
                     <option value={String(item)} key={String(item)}>
@@ -332,7 +345,7 @@ const SchemaForm: FC<IProps> = ({
                 id={title}
                 name={key}
                 type="switch"
-                label={title}
+                label={label}
                 checked={formData[key]?.value}
                 feedback={formData[key]?.errorMsg}
                 feedbackType="invalid"
@@ -357,7 +370,8 @@ const SchemaForm: FC<IProps> = ({
               <Form.Label>{title}</Form.Label>
               <TimeZonePicker
                 value={formData[key]?.value}
-                onChange={handleChange}
+                name={key}
+                onChange={handleSelectChange}
               />
               <Form.Control
                 name={key}
@@ -415,7 +429,7 @@ const SchemaForm: FC<IProps> = ({
                 placeholder={options?.placeholder || ''}
                 type={options?.type || 'text'}
                 value={formData[key]?.value}
-                onChange={handleChange}
+                onChange={handleInputChange}
                 isInvalid={formData[key].isInvalid}
                 rows={options?.rows || 3}
               />
@@ -440,7 +454,7 @@ const SchemaForm: FC<IProps> = ({
               placeholder={options?.placeholder || ''}
               type={options?.type || 'text'}
               value={formData[key]?.value}
-              onChange={handleChange}
+              onChange={handleInputChange}
               style={options?.type === 'color' ? { width: '6rem' } : {}}
               isInvalid={formData[key].isInvalid}
             />

From 9884a1d23f6adf26a54022cb001bef08c47b7511 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 30 Nov 2022 17:17:58 +0800
Subject: [PATCH 143/194] feat: cannot change current logged user status and
 role

---
 i18n/en_US.yaml                               |  13 +-
 ui/src/common/interface.ts                    |   6 +
 ui/src/hooks/useChangeUserRoleModal/index.tsx | 140 ++++++------------
 ui/src/pages/Admin/Users/index.tsx            |  59 +++++---
 ui/src/services/admin/users.ts                |   8 +
 5 files changed, 102 insertions(+), 124 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 306987c2..db6bdce5 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -678,6 +678,7 @@ ui:
     update: update success
     update_password: Password changed successfully.
     flag_success: Thanks for flagging.
+    fobidden_operate_self: Forbidden to operate on yourself
   related_question:
     title: Related Questions
     btn: Add question
@@ -1022,15 +1023,6 @@ ui:
       title: Change user role to...
       btn_cancel: Cancel
       btn_submit: Submit
-      user:
-        name: User
-        description: Default with no special access.
-      admin:
-        name: Admin
-        description: Have the full power to access the site.
-      moderator:
-        name: Moderator
-        description: Has access to all posts except admin settings.
     users:
       title: Users
       name: Name
@@ -1049,6 +1041,9 @@ ui:
       suspended: Suspended
       deleted: Deleted
       normal: Normal
+      Moderator: Moderator
+      Admin: Admin
+      User: User
       filter:
         placeholder: "Filter by name, user:id"
       set_new_password: Set new password
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 0d134cc3..3de63668 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -444,3 +444,9 @@ export interface ReviewResp {
   count: number;
   list: ReviewItem[];
 }
+
+export interface UserRoleItem {
+  id: number;
+  name: string;
+  description: string;
+}
diff --git a/ui/src/hooks/useChangeUserRoleModal/index.tsx b/ui/src/hooks/useChangeUserRoleModal/index.tsx
index ef3b5edb..69f958ee 100644
--- a/ui/src/hooks/useChangeUserRoleModal/index.tsx
+++ b/ui/src/hooks/useChangeUserRoleModal/index.tsx
@@ -4,8 +4,9 @@ import { useTranslation } from 'react-i18next';
 
 import ReactDOM from 'react-dom/client';
 
-import { Modal as AnswerModal } from '@/components';
-import { changeUserStatus } from '@/services';
+// import { Modal as AnswerModal } from '@/components';
+import { getUserRoles, changeUserRole } from '@/services';
+import { UserRoleItem } from '@/common/interface';
 
 const div = document.createElement('div');
 const root = ReactDOM.createRoot(div);
@@ -19,108 +20,57 @@ const useChangeUserRoleModal = ({ callback }: Props) => {
     keyPrefix: 'admin.user_role_modal',
   });
   const [id, setId] = useState('');
-  const [defaultType, setDefaultType] = useState('');
+  const [defaultId, setDefaultId] = useState(-1);
   const [isInvalid, setInvalidState] = useState(false);
-  const [changeType, setChangeType] = useState({
-    type: '',
-    haveContent: false,
-  });
-  const [content, setContent] = useState({
-    value: '',
-    isInvalid: false,
-    errorMsg: '',
-  });
+  const [changedId, setChangeId] = useState(-1);
   const [show, setShow] = useState(false);
-  const [list] = useState<any[]>([
-    {
-      type: 'user',
-      name: t('user.name'),
-      description: t('user.description'),
-    },
-    {
-      type: 'admin',
-      name: t('admin.name'),
-      description: t('admin.description'),
-    },
-    {
-      type: 'moderator',
-      name: t('moderator.name'),
-      description: t('moderator.description'),
-    },
-  ]);
+  const [list, setList] = useState<UserRoleItem[]>([]);
+
+  const getRolesData = async () => {
+    const res = await getUserRoles();
+    setList(res);
+  };
 
   const handleRadio = (val) => {
     setInvalidState(false);
-    setContent({
-      value: '',
-      isInvalid: false,
-      errorMsg: '',
-    });
-    setChangeType({
-      type: val.type,
-      haveContent: val.have_content,
-    });
+    setChangeId(val.id);
   };
 
   const onClose = () => {
-    setChangeType({
-      type: '',
-      haveContent: false,
-    });
-    setContent({
-      value: '',
-      isInvalid: false,
-      errorMsg: '',
-    });
-    setContent({
-      value: '',
-      isInvalid: false,
-      errorMsg: '',
-    });
+    setChangeId(-1);
+    setDefaultId(-1);
     setShow(false);
   };
 
   const handleSubmit = () => {
-    if (changeType.type === '') {
-      setInvalidState(true);
-      return;
-    }
-    if (changeType.haveContent && !content.value) {
-      setContent({
-        value: content.value,
-        isInvalid: true,
-        errorMsg: t('remark.empty'),
-      });
-      return;
-    }
-    if (defaultType === changeType.type) {
+    if (defaultId === changedId) {
       onClose();
 
       return;
     }
-    if (changeType.type === 'deleted') {
-      onClose();
+    // if (changeType.type === 'deleted') {
+    //   onClose();
 
-      AnswerModal.confirm({
-        title: t('confirm_title'),
-        content: t('confirm_content'),
-        confirmText: t('confirm_btn'),
-        confirmBtnVariant: 'danger',
-        onConfirm: () => {
-          changeUserStatus({
-            user_id: id,
-            status: changeType.type,
-          }).then(() => {
-            callback?.();
-            onClose();
-          });
-        },
-      });
-      return;
-    }
-    changeUserStatus({
+    //   AnswerModal.confirm({
+    //     title: t('confirm_title'),
+    //     content: t('confirm_content'),
+    //     confirmText: t('confirm_btn'),
+    //     confirmBtnVariant: 'danger',
+    //     onConfirm: () => {
+    //       changeUserStatus({
+    //         user_id: id,
+    //         status: changeType.type,
+    //       }).then(() => {
+    //         callback?.();
+    //         onClose();
+    //       });
+    //     },
+    //   });
+    //   return;
+    // }
+    changeUserRole({
       user_id: id,
-      status: changeType.type,
+      role_id: changedId,
     }).then(() => {
       callback?.();
       onClose();
@@ -128,12 +78,10 @@ const useChangeUserRoleModal = ({ callback }: Props) => {
   };
 
   const onShow = (params) => {
+    getRolesData();
     setId(params.id);
-    setChangeType({
-      ...changeType,
-      type: params.type,
-    });
-    setDefaultType(params.type);
+    setChangeId(params.role_id);
+    setDefaultId(params.role_id);
     setShow(true);
   };
   useLayoutEffect(() => {
@@ -146,17 +94,17 @@ const useChangeUserRoleModal = ({ callback }: Props) => {
           <Form>
             {list.map((item) => {
               return (
-                <div key={item?.type}>
-                  <Form.Group controlId={item.type} className="mb-3">
+                <div key={item?.id}>
+                  <Form.Group controlId={item.name} className="mb-3">
                     <FormCheck>
                       <FormCheck.Input
-                        id={item.type}
+                        id={item.name}
                         type="radio"
-                        checked={changeType.type === item.type}
+                        checked={changedId === item.id}
                         onChange={() => handleRadio(item)}
                         isInvalid={isInvalid}
                       />
-                      <FormCheck.Label htmlFor={item.type}>
+                      <FormCheck.Label htmlFor={item.name}>
                         <span className="fw-bold">{item.name}</span>
                         <br />
                         <span className="text-secondary">
diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index 1ddd4b81..89b92bd4 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -14,8 +14,9 @@ import {
   Icon,
 } from '@/components';
 import * as Type from '@/common/interface';
-import { useChangeModal, useChangeUserRoleModal } from '@/hooks';
+import { useChangeModal, useChangeUserRoleModal, useToast } from '@/hooks';
 import { useQueryUsers } from '@/services';
+import { loggedUserInfoStore } from '@/stores';
 
 import '../index.scss';
 
@@ -42,6 +43,8 @@ const Users: FC = () => {
   const curFilter = urlSearchParams.get('filter') || UserFilterKeys[0];
   const curPage = Number(urlSearchParams.get('page') || '1');
   const curQuery = urlSearchParams.get('query') || '';
+  const currentUser = loggedUserInfoStore((state) => state.user);
+  const Toast = useToast();
   const {
     data,
     isLoading,
@@ -50,7 +53,11 @@ const Users: FC = () => {
     page: curPage,
     page_size: PAGE_SIZE,
     query: curQuery,
-    ...(curFilter === 'all' ? {} : { status: curFilter }),
+    ...(curFilter === 'all'
+      ? {}
+      : curFilter === 'staff'
+      ? { staff: true }
+      : { status: curFilter }),
   });
   const changeModal = useChangeModal({
     callback: refreshUsers,
@@ -60,18 +67,28 @@ const Users: FC = () => {
     callback: refreshUsers,
   });
 
-  const handleClick = ({ user_id, status }) => {
-    changeModal.onShow({
-      id: user_id,
-      type: status,
-    });
-  };
+  const handleAction = (type, user) => {
+    const { user_id, status, role_id, username } = user;
+    if (username === currentUser.username) {
+      Toast.onShow({
+        msg: t('fobidden_operate_self', { keyPrefix: 'toast' }),
+        variant: 'warning',
+      });
+      return;
+    }
+    if (type === 'status') {
+      changeModal.onShow({
+        id: user_id,
+        type: status,
+      });
+    }
 
-  const handleClickRole = ({ user_id, role }) => {
-    changeUserRoleModal.onShow({
-      id: user_id,
-      role,
-    });
+    if (type === 'role') {
+      changeUserRoleModal.onShow({
+        id: user_id,
+        role_id,
+      });
+    }
   };
 
   const handleFilter = (e) => {
@@ -157,7 +174,9 @@ const Users: FC = () => {
                   </span>
                 </td>
                 <td>
-                  <span className="text-bg-light">Admin</span>
+                  <span className="badge text-bg-light">
+                    {t(user.role_name)}
+                  </span>
                 </td>
                 {curFilter !== 'deleted' ? (
                   <td className="text-end">
@@ -166,15 +185,17 @@ const Users: FC = () => {
                         <Icon name="three-dots-vertical" />
                       </Dropdown.Toggle>
                       <Dropdown.Menu>
-                        <Dropdown.Item>{t('set_new_password')}</Dropdown.Item>
-                        <Dropdown.Item onClick={() => handleClick(user)}>
+                        {/* <Dropdown.Item>{t('set_new_password')}</Dropdown.Item> */}
+                        <Dropdown.Item
+                          onClick={() => handleAction('status', user)}>
                           {t('change_status')}
                         </Dropdown.Item>
-                        <Dropdown.Item onClick={() => handleClickRole(user)}>
+                        <Dropdown.Item
+                          onClick={() => handleAction('role', user)}>
                           {t('change_role')}
                         </Dropdown.Item>
-                        <Dropdown.Divider />
-                        <Dropdown.Item>{t('show_logs')}</Dropdown.Item>
+                        {/* <Dropdown.Divider />
+                        <Dropdown.Item>{t('show_logs')}</Dropdown.Item> */}
                       </Dropdown.Menu>
                     </Dropdown>
 
diff --git a/ui/src/services/admin/users.ts b/ui/src/services/admin/users.ts
index 0cbc787a..2e8c492b 100644
--- a/ui/src/services/admin/users.ts
+++ b/ui/src/services/admin/users.ts
@@ -21,3 +21,11 @@ export const useQueryUsers = (params) => {
     mutate,
   };
 };
+
+export const getUserRoles = () => {
+  return request.get('/answer/admin/api/roles');
+};
+
+export const changeUserRole = (params) => {
+  return request.put('/answer/admin/api/user/role', params);
+};

From f45b466c33b767cb804c5e0e660d3773f98be77c Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 30 Nov 2022 17:23:31 +0800
Subject: [PATCH 144/194] feat: delete unused code

---
 ui/src/hooks/useChangeUserRoleModal/index.tsx | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/ui/src/hooks/useChangeUserRoleModal/index.tsx b/ui/src/hooks/useChangeUserRoleModal/index.tsx
index 69f958ee..08c99d5d 100644
--- a/ui/src/hooks/useChangeUserRoleModal/index.tsx
+++ b/ui/src/hooks/useChangeUserRoleModal/index.tsx
@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next';
 
 import ReactDOM from 'react-dom/client';
 
-// import { Modal as AnswerModal } from '@/components';
 import { getUserRoles, changeUserRole } from '@/services';
 import { UserRoleItem } from '@/common/interface';
 
@@ -48,26 +47,7 @@ const useChangeUserRoleModal = ({ callback }: Props) => {
 
       return;
     }
-    // if (changeType.type === 'deleted') {
-    //   onClose();
 
-    //   AnswerModal.confirm({
-    //     title: t('confirm_title'),
-    //     content: t('confirm_content'),
-    //     confirmText: t('confirm_btn'),
-    //     confirmBtnVariant: 'danger',
-    //     onConfirm: () => {
-    //       changeUserStatus({
-    //         user_id: id,
-    //         status: changeType.type,
-    //       }).then(() => {
-    //         callback?.();
-    //         onClose();
-    //       });
-    //     },
-    //   });
-    //   return;
-    // }
     changeUserRole({
       user_id: id,
       role_id: changedId,

From 915ee771a4af8ccaeb7d5a3c871ed10d6c905091 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Tue, 29 Nov 2022 10:24:34 +0800
Subject: [PATCH 145/194] chore: remove unused library

---
 ui/package.json   | 1 -
 ui/pnpm-lock.yaml | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index dcd9acd9..1fe99d07 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -53,7 +53,6 @@
     "@types/qs": "^6.9.7",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
-    "@types/react-helmet": "^6.1.5",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.33.0",
     "customize-cra": "^1.0.0",
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index cc463f61..5f2b165b 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -15,7 +15,6 @@ specifiers:
   '@types/qs': ^6.9.7
   '@types/react': ^18.0.17
   '@types/react-dom': ^18.0.6
-  '@types/react-helmet': ^6.1.5
   '@typescript-eslint/eslint-plugin': ^5.0.0
   '@typescript-eslint/parser': ^5.33.0
   axios: ^0.27.2
@@ -107,7 +106,6 @@ devDependencies:
   '@types/qs': 6.9.7
   '@types/react': 18.0.20
   '@types/react-dom': 18.0.6
-  '@types/react-helmet': 6.1.5
   '@typescript-eslint/eslint-plugin': 5.38.0_wsb62dxj2oqwgas4kadjymcmry
   '@typescript-eslint/parser': 5.38.0_irgkl5vooow2ydyo6aokmferha
   customize-cra: 1.0.0
@@ -2579,12 +2577,6 @@ packages:
       '@types/react': 18.0.20
     dev: true
 
-  /@types/react-helmet/6.1.5:
-    resolution: {integrity: sha512-/ICuy7OHZxR0YCAZLNg9r7I9aijWUWvxaPR6uTuyxe8tAj5RL4Sw1+R6NhXUtOsarkGYPmaHdBDvuXh2DIN/uA==}
-    dependencies:
-      '@types/react': 18.0.20
-    dev: true
-
   /@types/react-transition-group/4.4.5:
     resolution: {integrity: sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==}
     dependencies:

From 90b6a7fb425410b4142a5face9523306936b2834 Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Wed, 30 Nov 2022 17:31:20 +0800
Subject: [PATCH 146/194] refactor(ui): modify className

---
 ui/src/pages/Users/Personal/components/Overview/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/pages/Users/Personal/components/Overview/index.tsx b/ui/src/pages/Users/Personal/components/Overview/index.tsx
index 56cce71b..48b50a5c 100644
--- a/ui/src/pages/Users/Personal/components/Overview/index.tsx
+++ b/ui/src/pages/Users/Personal/components/Overview/index.tsx
@@ -18,7 +18,7 @@ const Index: FC<Props> = ({ visible, introduction, data }) => {
       <h5 className="mb-3">{t('about_me')}</h5>
       {introduction ? (
         <div
-          className="mb-4"
+          className="mb-4 text-break"
           dangerouslySetInnerHTML={{ __html: introduction }}
         />
       ) : (

From 457c1cd798e371db3b1e98827e6379981116444f Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 30 Nov 2022 19:11:28 +0800
Subject: [PATCH 147/194] fix(rank): Incorrect version reputation check rule

---
 i18n/en_US.yaml                               |  3 +-
 internal/controller/question_controller.go    | 33 -----------
 internal/controller/revision_controller.go    | 56 +++++++++++++++++--
 internal/entity/revision_entity.go            | 13 ++---
 internal/repo/revision/revision_repo.go       | 41 +++++---------
 internal/router/answer_api_router.go          |  2 +-
 internal/schema/revision_schema.go            | 16 ++++++
 internal/service/question_service.go          | 13 -----
 internal/service/revision/revision.go         |  2 +-
 .../revision_common/revision_service.go       |  8 +--
 internal/service/revision_service.go          | 53 ++++++++++++------
 11 files changed, 126 insertions(+), 114 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 28073b70..78a6d447 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1,4 +1,5 @@
 # The following fields are used for back-end
+
 backend:
   base:
     success:
@@ -97,7 +98,7 @@ backend:
         other: "Theme not found."
     revision:
       review_underway:
-        other: "Revision review underway."
+        other: "Can't edit currently, there is a version in the review queue."
       no_permission:
         other: "No permission to Revision."
     user:
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 68995496..25ddcfd4 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -270,39 +270,6 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 	handler.HandleResponse(ctx, err, resp)
 }
 
-// CheckCanUpdateQuestion check can update question
-// @Summary check can update question
-// @Description check can update question
-// @Tags Revision
-// @Accept json
-// @Produce json
-// @Security ApiKeyAuth
-// @Param id query string true "id"  default(string)
-// @Success 200 {object} handler.RespBody
-// @Router /answer/api/v1/revisions/edit/check [get]
-func (qc *QuestionController) CheckCanUpdateQuestion(ctx *gin.Context) {
-	req := &schema.CheckCanQuestionUpdate{}
-	if handler.BindAndCheck(ctx, req) {
-		return
-	}
-	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
-	can, err := qc.rankService.CheckOperationPermission(ctx, req.UserID, rank.QuestionEditRank, req.ID)
-	if err != nil {
-		handler.HandleResponse(ctx, err, nil)
-		return
-	}
-	if !can {
-		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
-		return
-	}
-
-	resp, err := qc.questionService.CheckCanUpdate(ctx, req)
-	handler.HandleResponse(ctx, err, gin.H{
-		"unreviewed": resp,
-	})
-}
-
 // CloseMsgList close question msg list
 // @Summary close question msg list
 // @Description close question msg list
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index f9693c19..090209b2 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -1,12 +1,14 @@
 package controller
 
 import (
+	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/handler"
 	"github.com/answerdev/answer/internal/base/middleware"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/schema"
 	"github.com/answerdev/answer/internal/service"
 	"github.com/answerdev/answer/internal/service/rank"
+	"github.com/answerdev/answer/pkg/obj"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
 )
@@ -58,7 +60,7 @@ func (rc *RevisionController) GetRevisionList(ctx *gin.Context) {
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query string true "page id"
-// @Success 200 {object} handler.RespBody{data=[]schema.GetRevisionResp}
+// @Success 200 {object} handler.RespBody{data=pager.PageModel{list=[]schema.GetUnreviewedRevisionResp}}
 // @Router /answer/api/v1/revisions/unreviewed [get]
 func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	req := &schema.RevisionSearch{}
@@ -80,11 +82,8 @@ func (rc *RevisionController) GetUnreviewedRevisionList(ctx *gin.Context) {
 	req.CanReviewAnswer = canList[1]
 	req.CanReviewTag = canList[2]
 
-	resp, count, err := rc.revisionListService.GetUnreviewedRevisionList(ctx, req)
-	handler.HandleResponse(ctx, err, gin.H{
-		"list":  resp,
-		"count": count,
-	})
+	resp, err := rc.revisionListService.GetUnreviewedRevisionPage(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
 }
 
 // RevisionAudit godoc
@@ -118,3 +117,48 @@ func (rc *RevisionController) RevisionAudit(ctx *gin.Context) {
 	err = rc.revisionListService.RevisionAudit(ctx, req)
 	handler.HandleResponse(ctx, err, gin.H{})
 }
+
+// CheckCanUpdateRevision check can update revision
+// @Summary check can update revision
+// @Description check can update revision
+// @Tags Revision
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param id query string true "id" default(string)
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/revisions/edit/check [get]
+func (rc *RevisionController) CheckCanUpdateRevision(ctx *gin.Context) {
+	req := &schema.CheckCanQuestionUpdate{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+
+	action := ""
+	objectTypeStr, _ := obj.GetObjectTypeStrByObjectID(req.ID)
+	switch objectTypeStr {
+	case constant.QuestionObjectType:
+		action = rank.QuestionEditRank
+	case constant.AnswerObjectType:
+		action = rank.AnswerEditRank
+	case constant.TagObjectType:
+		action = rank.TagEditRank
+	default:
+		handler.HandleResponse(ctx, errors.BadRequest(reason.ObjectNotFound), nil)
+		return
+	}
+
+	can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, action, req.ID)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+
+	err = rc.revisionListService.CheckCanUpdateRevision(ctx, req)
+	handler.HandleResponse(ctx, err, nil)
+}
diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index ae09cecd..46bfd228 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -1,6 +1,8 @@
 package entity
 
-import "time"
+import (
+	"time"
+)
 
 const (
 	// RevisionUnreviewedStatus this revision is unreviewed
@@ -17,7 +19,7 @@ type Revision struct {
 	CreatedAt    time.Time `xorm:"created TIMESTAMP created_at"`
 	UpdatedAt    time.Time `xorm:"updated TIMESTAMP updated_at"`
 	UserID       string    `xorm:"not null default 0 BIGINT(20) user_id"`
-	ObjectType   int       `xorm:"not null default 0 ) INT(11) object_type"`
+	ObjectType   int       `xorm:"not null default 0 INT(11) object_type"`
 	ObjectID     string    `xorm:"not null default 0 BIGINT(20) INDEX object_id"`
 	Title        string    `xorm:"not null default '' VARCHAR(255) title"`
 	Content      string    `xorm:"not null TEXT content"`
@@ -26,13 +28,6 @@ type Revision struct {
 	ReviewUserID int64     `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
-type RevisionSearch struct {
-	Page              int  `json:"page" form:"page"` // Query number of pages
-	CanReviewQuestion bool `json:"-"`
-	CanReviewAnswer   bool `json:"-"`
-	CanReviewTag      bool `json:"-"`
-}
-
 // TableName revision table name
 func (Revision) TableName() string {
 	return "revision"
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index f5a1b170..d72a5bb8 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/answerdev/answer/internal/base/data"
+	"github.com/answerdev/answer/internal/base/pager"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/service/revision"
@@ -165,37 +166,21 @@ func (rr *revisionRepo) allowRecord(objectType int) (ok bool) {
 	}
 }
 
-func (rr *revisionRepo) SearchUnreviewedList(ctx context.Context, search *entity.RevisionSearch) ([]*entity.Revision, int64, error) {
-	var count int64
-	var err error
-	rows := make([]*entity.Revision, 0)
-	if search.Page > 0 {
-		search.Page = search.Page - 1
-	} else {
-		search.Page = 0
+// GetUnreviewedRevisionPage get unreviewed revision page
+func (rr *revisionRepo) GetUnreviewedRevisionPage(ctx context.Context, page int, pageSize int,
+	objectTypeList []int) (revisionList []*entity.Revision, total int64, err error) {
+	revisionList = make([]*entity.Revision, 0)
+	if len(objectTypeList) == 0 {
+		return revisionList, 0, nil
 	}
-	PageSize := 1
-	offset := search.Page * PageSize
-	objectType := make([]int, 0)
-	if search.CanReviewAnswer {
-		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.AnswerObjectType])
-	}
-	if search.CanReviewQuestion {
-		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.QuestionObjectType])
-	}
-	if search.CanReviewTag {
-		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.TagObjectType])
-	}
-
-	session := rr.data.DB.Where("")
-	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
-	session = session.In("object_type", objectType)
+	session := rr.data.DB.NewSession()
 	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
+	session = session.In("object_type", objectTypeList)
 	session = session.OrderBy("created_at desc")
-	session = session.Limit(PageSize, offset)
-	count, err = session.FindAndCount(&rows)
+
+	total, err = pager.Help(page, pageSize, &revisionList, &entity.Revision{}, session)
 	if err != nil {
-		return rows, count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
-	return rows, count, nil
+	return
 }
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index c45aa659..29d6cea4 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -147,7 +147,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	//revisions
 	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
 	r.PUT("/revisions/audit", a.revisionController.RevisionAudit)
-	r.GET("/revisions/edit/check", a.questionController.CheckCanUpdateQuestion)
+	r.GET("/revisions/edit/check", a.revisionController.CheckCanUpdateRevision)
 
 	// comment
 	r.POST("/comment", a.commentController.AddComment)
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 01f05828..becb7935 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -2,6 +2,8 @@ package schema
 
 import (
 	"time"
+
+	"github.com/answerdev/answer/internal/base/constant"
 )
 
 // AddRevisionDTO add revision request
@@ -47,6 +49,20 @@ type RevisionSearch struct {
 	UserID            string `json:"-"`
 }
 
+func (r RevisionSearch) GetCanReviewObjectTypes() []int {
+	objectType := make([]int, 0)
+	if r.CanReviewAnswer {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.AnswerObjectType])
+	}
+	if r.CanReviewQuestion {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.QuestionObjectType])
+	}
+	if r.CanReviewTag {
+		objectType = append(objectType, constant.ObjectTypeStrMapping[constant.TagObjectType])
+	}
+	return objectType
+}
+
 type GetUnreviewedRevisionResp struct {
 	Type           string                      `json:"type"`
 	Info           *UnreviewedRevisionInfoInfo `json:"info"`
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index a6523864..4478d37f 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -858,16 +858,3 @@ func (qs *QuestionService) changeQuestionToRevision(ctx context.Context, questio
 	}
 	return questionRevision, nil
 }
-
-// CheckCanUpdate can check question answer
-func (qs *QuestionService) CheckCanUpdate(ctx context.Context, req *schema.CheckCanQuestionUpdate) (exist bool, err error) {
-	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
-	if err != nil {
-		return false, err
-	}
-	if existUnreviewed {
-		err = errors.BadRequest(reason.RevisionReviewUnderway)
-		return existUnreviewed, err
-	}
-	return existUnreviewed, nil
-}
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index cf146947..f368a27b 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -15,6 +15,6 @@ type RevisionRepo interface {
 	GetRevisionList(ctx context.Context, revision *entity.Revision) (revisionList []entity.Revision, err error)
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
 	ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
-	SearchUnreviewedList(ctx context.Context, search *entity.RevisionSearch) ([]*entity.Revision, int64, error)
+	GetUnreviewedRevisionPage(ctx context.Context, page, pageSize int, objectTypes []int) ([]*entity.Revision, int64, error)
 	UpdateStatus(ctx context.Context, id string, status int) (err error)
 }
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index 13e4d5ef..cd5c067a 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -27,10 +27,10 @@ func NewRevisionService(revisionRepo revision.RevisionRepo, userRepo usercommon.
 }
 
 func (rs *RevisionService) GetUnreviewedRevisionCount(ctx context.Context, req *schema.RevisionSearch) (count int64, err error) {
-	search := &entity.RevisionSearch{}
-	search.Page = 1
-	_ = copier.Copy(search, req)
-	_, count, err = rs.revisionRepo.SearchUnreviewedList(ctx, search)
+	if len(req.GetCanReviewObjectTypes()) == 0 {
+		return 0, nil
+	}
+	_, count, err = rs.revisionRepo.GetUnreviewedRevisionPage(ctx, req.Page, 1, req.GetCanReviewObjectTypes())
 	return count, err
 }
 
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 20fb14ba..1d13599e 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
+	"github.com/answerdev/answer/internal/base/pager"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/schema"
@@ -48,7 +49,6 @@ func NewRevisionService(
 	answerRepo answercommon.AnswerRepo,
 	tagRepo tag_common.TagRepo,
 	tagCommon *tagcommon.TagCommonService,
-
 ) *RevisionService {
 	return &RevisionService{
 		revisionRepo:      revisionRepo,
@@ -247,43 +247,48 @@ func (rs *RevisionService) revisionAuditTag(ctx context.Context, revisionitem *s
 	return nil
 }
 
-// SearchUnreviewedList get unreviewed list
-func (rs *RevisionService) GetUnreviewedRevisionList(ctx context.Context, req *schema.RevisionSearch) (resp []*schema.GetUnreviewedRevisionResp, count int64, err error) {
-	resp = []*schema.GetUnreviewedRevisionResp{}
-	search := &entity.RevisionSearch{}
-	_ = copier.Copy(search, req)
-	list, count, err := rs.revisionRepo.SearchUnreviewedList(ctx, search)
-	for _, revision := range list {
+// GetUnreviewedRevisionPage get unreviewed list
+func (rs *RevisionService) GetUnreviewedRevisionPage(ctx context.Context, req *schema.RevisionSearch) (
+	resp *pager.PageModel, err error) {
+	revisionResp := make([]*schema.GetUnreviewedRevisionResp, 0)
+	if len(req.GetCanReviewObjectTypes()) == 0 {
+		return pager.NewPageModel(0, revisionResp), nil
+	}
+	revisionPage, total, err := rs.revisionRepo.GetUnreviewedRevisionPage(
+		ctx, req.Page, 1, req.GetCanReviewObjectTypes())
+	if err != nil {
+		return nil, err
+	}
+	for _, rev := range revisionPage {
 		item := &schema.GetUnreviewedRevisionResp{}
-		_, ok := constant.ObjectTypeNumberMapping[revision.ObjectType]
+		_, ok := constant.ObjectTypeNumberMapping[rev.ObjectType]
 		if !ok {
 			continue
 		}
-		item.Type = constant.ObjectTypeNumberMapping[revision.ObjectType]
-		info, infoerr := rs.objectInfoService.GetUnreviewedRevisionInfo(ctx, revision.ObjectID)
-		if infoerr != nil {
-			return resp, 0, infoerr
+		item.Type = constant.ObjectTypeNumberMapping[rev.ObjectType]
+		info, err := rs.objectInfoService.GetUnreviewedRevisionInfo(ctx, rev.ObjectID)
+		if err != nil {
+			return nil, err
 		}
 		item.Info = info
 		revisionitem := &schema.GetRevisionResp{}
-		_ = copier.Copy(revisionitem, revision)
+		_ = copier.Copy(revisionitem, rev)
 		rs.parseItem(ctx, revisionitem)
 		item.UnreviewedInfo = revisionitem
 
 		// get user info
 		userInfo, exists, e := rs.userCommon.GetUserBasicInfoByID(ctx, revisionitem.UserID)
 		if e != nil {
-			return resp, 0, e
+			return nil, e
 		}
 		if exists {
 			var uinfo schema.UserBasicInfo
 			err = copier.Copy(&uinfo, userInfo)
 			item.UnreviewedInfo.UserInfo = uinfo
 		}
-
-		resp = append(resp, item)
+		revisionResp = append(revisionResp, item)
 	}
-	return
+	return pager.NewPageModel(total, revisionResp), nil
 }
 
 // GetRevisionList get revision list all
@@ -377,3 +382,15 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 	}
 	item.CreatedAtParsed = item.CreatedAt.Unix()
 }
+
+// CheckCanUpdateRevision can check revision
+func (rs *RevisionService) CheckCanUpdateRevision(ctx context.Context, req *schema.CheckCanQuestionUpdate) (err error) {
+	_, exist, err := rs.revisionRepo.ExistUnreviewedByObjectID(ctx, req.ID)
+	if err != nil {
+		return err
+	}
+	if exist {
+		return errors.BadRequest(reason.RevisionReviewUnderway)
+	}
+	return nil
+}

From 505fa7e6d351e6981fbeec0fef06c02b75213849 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Wed, 30 Nov 2022 19:19:01 +0800
Subject: [PATCH 148/194] fix(tr): Fix translation errors

---
 internal/base/handler/lang.go        | 11 +++++++++++
 internal/service/question_service.go |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/internal/base/handler/lang.go b/internal/base/handler/lang.go
index a6b2122c..4f4a0763 100644
--- a/internal/base/handler/lang.go
+++ b/internal/base/handler/lang.go
@@ -1,6 +1,8 @@
 package handler
 
 import (
+	"context"
+
 	"github.com/answerdev/answer/internal/base/constant"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/i18n"
@@ -18,3 +20,12 @@ func GetLang(ctx *gin.Context) i18n.Language {
 		return i18n.DefaultLang
 	}
 }
+
+// GetLangByCtx get language from header
+func GetLangByCtx(ctx context.Context) i18n.Language {
+	acceptLanguage, ok := ctx.Value(constant.AcceptLanguageFlag).(i18n.Language)
+	if ok {
+		return acceptLanguage
+	}
+	return i18n.DefaultLang
+}
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 4478d37f..536f8c41 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/answerdev/answer/internal/base/constant"
+	"github.com/answerdev/answer/internal/base/handler"
 	"github.com/answerdev/answer/internal/base/reason"
 	"github.com/answerdev/answer/internal/base/translator"
 	"github.com/answerdev/answer/internal/base/validator"
@@ -129,7 +130,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		errorlist := make([]*validator.FormErrorField, 0)
 		errorlist = append(errorlist, &validator.FormErrorField{
 			ErrorField: "tags",
-			ErrorMsg:   reason.RecommendTagEnter,
+			ErrorMsg:   translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),
 		})
 		err = errors.BadRequest(reason.RecommendTagEnter)
 		return errorlist, err
@@ -350,7 +351,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		errorlist := make([]*validator.FormErrorField, 0)
 		errorlist = append(errorlist, &validator.FormErrorField{
 			ErrorField: "tags",
-			ErrorMsg:   reason.RecommendTagEnter,
+			ErrorMsg:   translator.GlobalTrans.Tr(handler.GetLangByCtx(ctx), reason.RecommendTagEnter),
 		})
 		err = errors.BadRequest(reason.RecommendTagEnter)
 		return errorlist, err

From a12a60b3b21319b9a9fb2cf7c1a002472604ebcb Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 1 Dec 2022 11:57:57 +0800
Subject: [PATCH 149/194] fix(review): add anwer edit summery and auto rollback
 review item

---
 ui/src/common/interface.ts                  |  1 +
 ui/src/pages/Questions/EditAnswer/index.tsx |  9 ++++
 ui/src/pages/Review/index.tsx               | 54 +++++++++++++--------
 ui/src/services/client/revision.ts          | 15 +-----
 4 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index c080ce76..bdbff1b2 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -69,6 +69,7 @@ export interface AnswerParams {
   html: string;
   question_id: string;
   id: string;
+  edit_summary?: string;
 }
 
 export interface LoginReqParams {
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index 8ef5287b..7591c74d 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -62,6 +62,13 @@ const Ask = () => {
       ...formData,
       answer: { ...formData.answer, value },
     });
+  const handleSummaryChange = (evt) => {
+    const v = evt.currentTarget.value;
+    setFormData({
+      ...formData,
+      description: { ...formData.description, value: v },
+    });
+  };
 
   const checkValidated = (): boolean => {
     let bol = true;
@@ -100,6 +107,7 @@ const Ask = () => {
       html: editorRef.current.getHtml(),
       question_id: qid,
       id: aid,
+      edit_summary: formData.description.value,
     };
     modifyAnswer(params).then(() => {
       navigate(`/questions/${qid}/${aid}`);
@@ -198,6 +206,7 @@ const Ask = () => {
                 <Form.Label>{t('form.fields.edit_summary.label')}</Form.Label>
                 <Form.Control
                   type="text"
+                  onChange={handleSummaryChange}
                   defaultValue={formData.description.value}
                   isInvalid={formData.description.isInvalid}
                   placeholder={t('form.fields.edit_summary.placeholder')}
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index a4a20011..3fce7ac5 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
-import { useReviewList, revisionAudit } from '@/services';
+import { getReviewList, revisionAudit } from '@/services';
 import { pathFactory } from '@/router/pathFactory';
 import type * as Type from '@/common/interface';
 
@@ -13,24 +13,46 @@ const Index: FC = () => {
   const [isLoading, setIsLoading] = useState(false);
   const [noTasks, setNoTasks] = useState(false);
   const [page, setPage] = useState(1);
-  const { data: reviewResp, mutate: mutateList } = useReviewList(page);
+  const [reviewResp, setReviewResp] = useState<Type.ReviewResp>();
   const ro = reviewResp?.list[0];
   const { info, type, unreviewed_info } = ro || {
     info: null,
     type: '',
     unreviewed_info: null,
   };
-  const reviewInfo = unreviewed_info?.content;
-  const mutateNextPage = () => {
-    const count = reviewResp?.count;
-    if (count && page < count) {
-      setPage(page + 1);
-    } else {
+  const resolveNextOne = (resp, pageNumber) => {
+    const { count, list = [] } = resp;
+    // auto rollback
+    if (!list.length && count && page !== 1) {
+      pageNumber = 1;
+      setPage(pageNumber);
+      // eslint-disable-next-line @typescript-eslint/no-use-before-define
+      queryNextOne(pageNumber);
+      return;
+    }
+    if (pageNumber !== page) {
+      setPage(pageNumber);
+    }
+    setReviewResp(resp);
+    if (!list.length) {
       setNoTasks(true);
     }
+    setTimeout(() => {
+      window.scrollTo({ top: 0 });
+    }, 150);
   };
+  const queryNextOne = (pageNumber) => {
+    getReviewList(pageNumber)
+      .then((resp) => {
+        resolveNextOne(resp, pageNumber);
+      })
+      .catch((ex) => {
+        console.log('ex: ', ex);
+      });
+  };
+  const reviewInfo = unreviewed_info?.content;
   const handlingSkip = () => {
-    mutateNextPage();
+    queryNextOne(page + 1);
   };
   const handlingApprove = () => {
     if (!unreviewed_info) {
@@ -39,7 +61,7 @@ const Index: FC = () => {
     setIsLoading(true);
     revisionAudit(unreviewed_info.id, 'approve')
       .then(() => {
-        mutateList();
+        queryNextOne(page);
       })
       .catch((ex) => {
         console.log('ex: ', ex);
@@ -55,7 +77,7 @@ const Index: FC = () => {
     setIsLoading(true);
     revisionAudit(unreviewed_info.id, 'reject')
       .then(() => {
-        mutateList();
+        queryNextOne(page);
       })
       .catch((ex) => {
         console.log('ex: ', ex);
@@ -93,14 +115,8 @@ const Index: FC = () => {
     editSummary ||= t('edit_tag');
   }
   useEffect(() => {
-    if (!reviewResp) {
-      return;
-    }
-    window.scrollTo({ top: 0 });
-    if (!reviewResp.list || !reviewResp.list.length) {
-      setNoTasks(true);
-    }
-  }, [reviewResp]);
+    queryNextOne(page);
+  }, []);
   return (
     <Container className="pt-2 mt-4 mb-5">
       <Row>
diff --git a/ui/src/services/client/revision.ts b/ui/src/services/client/revision.ts
index 28110ae9..06b5ce49 100644
--- a/ui/src/services/client/revision.ts
+++ b/ui/src/services/client/revision.ts
@@ -1,5 +1,3 @@
-import useSWR from 'swr';
-
 import request from '@/utils/request';
 import * as Type from '@/common/interface';
 
@@ -16,16 +14,7 @@ export const revisionAudit = (id: string, operation: 'approve' | 'reject') => {
   });
 };
 
-export const useReviewList = (page: number) => {
+export const getReviewList = (page: number) => {
   const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
-  const { data, error, mutate } = useSWR<Type.ReviewResp, Error>(
-    apiUrl,
-    request.instance.get,
-  );
-  return {
-    data,
-    isLoading: !data && !error,
-    error,
-    mutate,
-  };
+  return request.get<Type.ReviewResp>(apiUrl);
 };

From 5b408b902cc80ec1910308aaed695b1845884769 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 1 Dec 2022 12:32:01 +0800
Subject: [PATCH 150/194] feat: timlin for tag title

---
 i18n/en_US.yaml                 | 3 ++-
 ui/src/pages/Timeline/index.tsx | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index b698e4c8..58905df7 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1215,11 +1215,12 @@ ui:
     reopened: reopened
     created: created
     title: "History for"
+    tag_title: "Timeline for"
     show_votes: "Show votes"
     n_or_a: N/A
     title_for_question: "Timeline for"
     title_for_answer: "Timeline for answers to {{ title }} by {{ author }}"
-    title_for_tag: "Title for tag"
+    title_for_tag: "Timeline for tag"
     datetime: Datetime
     type: Type
     by: By
diff --git a/ui/src/pages/Timeline/index.tsx b/ui/src/pages/Timeline/index.tsx
index 2ba12c42..d9f5fdda 100644
--- a/ui/src/pages/Timeline/index.tsx
+++ b/ui/src/pages/Timeline/index.tsx
@@ -73,7 +73,9 @@ const Index: FC = () => {
       <Row className="py-3 justify-content-center">
         <Col xxl={10}>
           <h5 className="mb-4">
-            {t('title')}{' '}
+            {timelineData?.object_info.object_type === 'tag'
+              ? t('tag_title')
+              : t('title')}{' '}
             <Link to={linkUrl}>{timelineData?.object_info?.title}</Link>
           </h5>
           {timelineData?.object_info.object_type !== 'tag' && (

From bb2de6adf0446b2e52e5aa663ea451c104d23e13 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 1 Dec 2022 12:33:04 +0800
Subject: [PATCH 151/194] feat: timlin for answer title

---
 i18n/en_US.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 58905df7..04780d6c 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1219,7 +1219,7 @@ ui:
     show_votes: "Show votes"
     n_or_a: N/A
     title_for_question: "Timeline for"
-    title_for_answer: "Timeline for answers to {{ title }} by {{ author }}"
+    title_for_answer: "Timeline for answer to {{ title }} by {{ author }}"
     title_for_tag: "Timeline for tag"
     datetime: Datetime
     type: Type

From c253ba2800ccb6f186f7ccef446482688c19f206 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 1 Dec 2022 14:30:32 +0800
Subject: [PATCH 152/194] fix(review): page title

---
 ui/src/pages/Review/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 3fce7ac5..132d433d 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -3,7 +3,13 @@ import { Container, Row, Col, Alert, Stack, Button } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
-import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
+import {
+  BaseUserCard,
+  FormatTime,
+  Empty,
+  DiffContent,
+  PageTitle,
+} from '@/components';
 import { getReviewList, revisionAudit } from '@/services';
 import { pathFactory } from '@/router/pathFactory';
 import type * as Type from '@/common/interface';
@@ -119,6 +125,7 @@ const Index: FC = () => {
   }, []);
   return (
     <Container className="pt-2 mt-4 mb-5">
+      <PageTitle title={t('review')} />
       <Row>
         <Col lg={{ span: 7, offset: 1 }}>
           <h3 className="mb-4">{t('review')}</h3>

From 6ccf0c07c61d90dc8da8c0388da39fcec11e4726 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:37:17 +0800
Subject: [PATCH 153/194] fix answer update time

---
 internal/entity/answer_entity.go         | 2 +-
 internal/service/answer_common/answer.go | 6 ++++++
 internal/service/answer_service.go       | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index c51ae157..5dc1593a 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -20,7 +20,7 @@ var CmsAnswerSearchStatus = map[string]int{
 type Answer struct {
 	ID           string    `xorm:"not null pk autoincr BIGINT(20) id"`
 	CreatedAt    time.Time `xorm:"created not null default CURRENT_TIMESTAMP TIMESTAMP created_at"`
-	UpdatedAt    time.Time `xorm:"not null default CURRENT_TIMESTAMP TIMESTAMP updated_at"`
+	UpdatedAt    time.Time `xorm:"updated_at TIMESTAMP"`
 	QuestionID   string    `xorm:"not null default 0 BIGINT(20) question_id"`
 	UserID       string    `xorm:"not null default 0 BIGINT(20) INDEX user_id"`
 	OriginalText string    `xorm:"not null MEDIUMTEXT original_text"`
diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.go
index 196d6628..56cfbb99 100644
--- a/internal/service/answer_common/answer.go
+++ b/internal/service/answer_common/answer.go
@@ -68,6 +68,9 @@ func (as *AnswerCommon) ShowFormat(ctx context.Context, data *entity.Answer) *sc
 	info.VoteCount = data.VoteCount
 	info.CreateTime = data.CreatedAt.Unix()
 	info.UpdateTime = data.UpdatedAt.Unix()
+	if data.UpdatedAt.Unix() < 1 {
+		info.UpdateTime = 0
+	}
 	info.UserID = data.UserID
 	return &info
 }
@@ -80,6 +83,9 @@ func (as *AnswerCommon) AdminShowFormat(ctx context.Context, data *entity.Answer
 	info.VoteCount = data.VoteCount
 	info.CreateTime = data.CreatedAt.Unix()
 	info.UpdateTime = data.UpdatedAt.Unix()
+	if data.UpdatedAt.Unix() < 1 {
+		info.UpdateTime = 0
+	}
 	info.UserID = data.UserID
 	info.Description = htmltext.FetchExcerpt(data.ParsedText, "...", 240)
 	return &info
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index bda09447..d2bc0e00 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -129,7 +129,6 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	if !exist {
 		return "", errors.BadRequest(reason.QuestionNotFound)
 	}
-	now := time.Now()
 	insertData := new(entity.Answer)
 	insertData.UserID = req.UserID
 	insertData.OriginalText = req.Content
@@ -138,7 +137,7 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	insertData.QuestionID = req.QuestionID
 	insertData.RevisionID = "0"
 	insertData.Status = entity.AnswerStatusAvailable
-	insertData.UpdatedAt = now
+	//insertData.UpdatedAt = now
 	if err = as.answerRepo.AddAnswer(ctx, insertData); err != nil {
 		return "", err
 	}

From bfd9530b1f91006d6b89800f3db21a7dcd26ecf9 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 1 Dec 2022 14:40:12 +0800
Subject: [PATCH 154/194] fix(synonym): Add tag synonym list member actions

---
 internal/controller/tag_controller.go             | 12 +++++++++++-
 internal/schema/tag_schema.go                     | 11 +++++++++++
 internal/service/permission/comment_permission.go | 14 ++++++++++++++
 internal/service/tag/tag_service.go               |  7 ++++---
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index b1d6661b..1a64962d 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -186,7 +186,7 @@ func (tc *TagController) GetFollowingTags(ctx *gin.Context) {
 // @Tags Tag
 // @Produce json
 // @Param tag_id query int true "tag id"
-// @Success 200 {object} handler.RespBody{data=[]schema.GetTagSynonymsResp}
+// @Success 200 {object} handler.RespBody{data=schema.GetTagSynonymsResp}
 // @Router /answer/api/v1/tag/synonyms [get]
 func (tc *TagController) GetTagSynonyms(ctx *gin.Context) {
 	req := &schema.GetTagSynonymsReq{}
@@ -194,6 +194,16 @@ func (tc *TagController) GetTagSynonyms(ctx *gin.Context) {
 		return
 	}
 
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := tc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		rank.TagSynonymRank,
+	}, "")
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanEdit = canList[0]
+
 	resp, err := tc.tagService.GetTagSynonyms(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go
index 964509b8..900bbf05 100644
--- a/internal/schema/tag_schema.go
+++ b/internal/schema/tag_schema.go
@@ -188,10 +188,21 @@ type GetTagWithPageReq struct {
 type GetTagSynonymsReq struct {
 	// tag_id
 	TagID string `validate:"required" form:"tag_id"`
+	// user id
+	UserID string `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
 }
 
 // GetTagSynonymsResp get tag synonyms response
 type GetTagSynonymsResp struct {
+	// synonyms
+	Synonyms []*TagSynonym `json:"synonyms"`
+	// MemberActions
+	MemberActions []*PermissionMemberAction `json:"member_actions"`
+}
+
+type TagSynonym struct {
 	// tag id
 	TagID string `json:"tag_id"`
 	// slug name
diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go
index b841078f..663bb5b3 100644
--- a/internal/service/permission/comment_permission.go
+++ b/internal/service/permission/comment_permission.go
@@ -120,3 +120,17 @@ func GetQuestionPermission(ctx context.Context, userID string, creatorUserID str
 	}
 	return actions
 }
+
+// GetTagSynonymPermission get tag synonym permission
+func GetTagSynonymPermission(ctx context.Context, canEdit bool) (
+	actions []*schema.PermissionMemberAction) {
+	actions = make([]*schema.PermissionMemberAction, 0)
+	if canEdit {
+		actions = append(actions, &schema.PermissionMemberAction{
+			Action: "edit",
+			Name:   "Edit",
+			Type:   "edit",
+		})
+	}
+	return actions
+}
diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go
index b301ca18..9bcf89d1 100644
--- a/internal/service/tag/tag_service.go
+++ b/internal/service/tag/tag_service.go
@@ -150,7 +150,8 @@ func (ts *TagService) GetFollowingTags(ctx context.Context, userID string) (
 
 // GetTagSynonyms get tag synonyms
 func (ts *TagService) GetTagSynonyms(ctx context.Context, req *schema.GetTagSynonymsReq) (
-	resp []*schema.GetTagSynonymsResp, err error) {
+	resp *schema.GetTagSynonymsResp, err error) {
+	resp = &schema.GetTagSynonymsResp{Synonyms: make([]*schema.TagSynonym, 0)}
 	tag, exist, err := ts.tagCommonService.GetTagByID(ctx, req.TagID)
 	if err != nil {
 		return
@@ -182,15 +183,15 @@ func (ts *TagService) GetTagSynonyms(ctx context.Context, req *schema.GetTagSyno
 		mainTagSlugName = tag.SlugName
 	}
 
-	resp = make([]*schema.GetTagSynonymsResp, 0)
 	for _, t := range tagList {
-		resp = append(resp, &schema.GetTagSynonymsResp{
+		resp.Synonyms = append(resp.Synonyms, &schema.TagSynonym{
 			TagID:           t.ID,
 			SlugName:        t.SlugName,
 			DisplayName:     t.DisplayName,
 			MainTagSlugName: mainTagSlugName,
 		})
 	}
+	resp.MemberActions = permission.GetTagSynonymPermission(ctx, req.CanEdit)
 	return
 }
 

From c1ad91d06402b6052f3cc9fdeca33dc6ab2db1ac Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 1 Dec 2022 15:04:03 +0800
Subject: [PATCH 155/194] fix(ask): add form reset for ask

---
 ui/src/pages/Questions/Ask/index.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 6b2dca45..6bd338e5 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -60,6 +60,11 @@ const Ask = () => {
   const [formData, setFormData] = useState<FormDataItem>(initFormData);
   const [checked, setCheckState] = useState(false);
   const [focusType, setForceType] = useState('');
+  const resetForm = () => {
+    setFormData(initFormData);
+    setCheckState(false);
+    setForceType('');
+  };
 
   const editorRef = useRef<EditorRef>({
     getHtml: () => '',
@@ -75,7 +80,11 @@ const Ask = () => {
   const { data: similarQuestions = { list: [] } } = useQueryQuestionByTitle(
     isEdit ? '' : formData.title.value,
   );
-
+  useEffect(() => {
+    if (!isEdit) {
+      resetForm();
+    }
+  }, [isEdit]);
   const { data: revisions = [] } = useQueryRevisions(qid);
 
   useEffect(() => {

From fe196abd54e1e9c2d06f3cb4a135b83fca347ce8 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 1 Dec 2022 15:15:21 +0800
Subject: [PATCH 156/194] fix(en_US): typo

---
 i18n/en_US.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 04780d6c..2b2819dc 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1189,7 +1189,7 @@ ui:
     btn_submit: Save
     not_found_props: "Required property {{ key }} not found."
   page_review:
-    review: Reivew
+    review: Review
     proposed: proposed
     question_edit: Question edit
     answer_edit: Answer edit

From b093358e0cf49c301bad44add38beab58dc524d4 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:26:20 +0800
Subject: [PATCH 157/194] update question edit userid

---
 docs/docs.go                                 | 118 ++++++++++++++-----
 docs/swagger.json                            | 118 ++++++++++++++-----
 docs/swagger.yaml                            |  86 ++++++++++----
 internal/entity/answer_entity.go             |  25 ++--
 internal/entity/question_entity.go           |   1 +
 internal/schema/answer_schema.go             |   2 +
 internal/schema/question_schema.go           |   2 +
 internal/service/answer_common/answer.go     |   2 +
 internal/service/answer_service.go           |  12 +-
 internal/service/question_common/question.go |  24 +++-
 internal/service/question_service.go         |   7 +-
 internal/service/revision_service.go         |   6 +-
 12 files changed, 306 insertions(+), 97 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index eb99dfca..9de9e8fc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3074,7 +3074,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "check can update question",
+                "description": "check can update revision",
                 "consumes": [
                     "application/json"
                 ],
@@ -3084,7 +3084,7 @@ const docTemplate = `{
                 "tags": [
                     "Revision"
                 ],
-                "summary": "check can update question",
+                "summary": "check can update revision",
                 "parameters": [
                     {
                         "type": "string",
@@ -3141,10 +3141,22 @@ const docTemplate = `{
                                     "type": "object",
                                     "properties": {
                                         "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/schema.GetRevisionResp"
-                                            }
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetUnreviewedRevisionResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
                                         }
                                     }
                                 }
@@ -3470,10 +3482,7 @@ const docTemplate = `{
                                     "type": "object",
                                     "properties": {
                                         "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/schema.GetTagSynonymsResp"
-                                            }
+                                            "$ref": "#/definitions/schema.GetTagSynonymsResp"
                                         }
                                     }
                                 }
@@ -4701,6 +4710,9 @@ const docTemplate = `{
                 "answer_id": {
                     "type": "string"
                 },
+                "display_name": {
+                    "type": "string"
+                },
                 "object_type": {
                     "type": "string"
                 },
@@ -5547,21 +5559,33 @@ const docTemplate = `{
         "schema.GetTagSynonymsResp": {
             "type": "object",
             "properties": {
-                "display_name": {
-                    "description": "display name",
+                "member_actions": {
+                    "description": "MemberActions",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.PermissionMemberAction"
+                    }
+                },
+                "synonyms": {
+                    "description": "synonyms",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagSynonym"
+                    }
+                }
+            }
+        },
+        "schema.GetUnreviewedRevisionResp": {
+            "type": "object",
+            "properties": {
+                "info": {
+                    "$ref": "#/definitions/schema.UnreviewedRevisionInfoInfo"
+                },
+                "type": {
                     "type": "string"
                 },
-                "main_tag_slug_name": {
-                    "description": "if main tag slug name is not empty, this tag is synonymous with the main tag",
-                    "type": "string"
-                },
-                "slug_name": {
-                    "description": "slug name",
-                    "type": "string"
-                },
-                "tag_id": {
-                    "description": "tag id",
-                    "type": "string"
+                "unreviewed_info": {
+                    "$ref": "#/definitions/schema.GetRevisionResp"
                 }
             }
         },
@@ -6203,9 +6227,7 @@ const docTemplate = `{
             "type": "object",
             "required": [
                 "contact_email",
-                "description",
                 "name",
-                "short_description",
                 "site_url"
             ],
             "properties": {
@@ -6235,9 +6257,7 @@ const docTemplate = `{
             "type": "object",
             "required": [
                 "contact_email",
-                "description",
                 "name",
-                "short_description",
                 "site_url"
             ],
             "properties": {
@@ -6425,6 +6445,50 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.TagSynonym": {
+            "type": "object",
+            "properties": {
+                "display_name": {
+                    "description": "display name",
+                    "type": "string"
+                },
+                "main_tag_slug_name": {
+                    "description": "if main tag slug name is not empty, this tag is synonymous with the main tag",
+                    "type": "string"
+                },
+                "slug_name": {
+                    "description": "slug name",
+                    "type": "string"
+                },
+                "tag_id": {
+                    "description": "tag id",
+                    "type": "string"
+                }
+            }
+        },
+        "schema.UnreviewedRevisionInfoInfo": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "html": {
+                    "type": "string"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
+                },
+                "title": {
+                    "type": "string"
+                }
+            }
+        },
         "schema.UpdateCommentReq": {
             "type": "object",
             "required": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 6af9f310..b1eaec18 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3062,7 +3062,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "check can update question",
+                "description": "check can update revision",
                 "consumes": [
                     "application/json"
                 ],
@@ -3072,7 +3072,7 @@
                 "tags": [
                     "Revision"
                 ],
-                "summary": "check can update question",
+                "summary": "check can update revision",
                 "parameters": [
                     {
                         "type": "string",
@@ -3129,10 +3129,22 @@
                                     "type": "object",
                                     "properties": {
                                         "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/schema.GetRevisionResp"
-                                            }
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetUnreviewedRevisionResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
                                         }
                                     }
                                 }
@@ -3458,10 +3470,7 @@
                                     "type": "object",
                                     "properties": {
                                         "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/schema.GetTagSynonymsResp"
-                                            }
+                                            "$ref": "#/definitions/schema.GetTagSynonymsResp"
                                         }
                                     }
                                 }
@@ -4689,6 +4698,9 @@
                 "answer_id": {
                     "type": "string"
                 },
+                "display_name": {
+                    "type": "string"
+                },
                 "object_type": {
                     "type": "string"
                 },
@@ -5535,21 +5547,33 @@
         "schema.GetTagSynonymsResp": {
             "type": "object",
             "properties": {
-                "display_name": {
-                    "description": "display name",
+                "member_actions": {
+                    "description": "MemberActions",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.PermissionMemberAction"
+                    }
+                },
+                "synonyms": {
+                    "description": "synonyms",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagSynonym"
+                    }
+                }
+            }
+        },
+        "schema.GetUnreviewedRevisionResp": {
+            "type": "object",
+            "properties": {
+                "info": {
+                    "$ref": "#/definitions/schema.UnreviewedRevisionInfoInfo"
+                },
+                "type": {
                     "type": "string"
                 },
-                "main_tag_slug_name": {
-                    "description": "if main tag slug name is not empty, this tag is synonymous with the main tag",
-                    "type": "string"
-                },
-                "slug_name": {
-                    "description": "slug name",
-                    "type": "string"
-                },
-                "tag_id": {
-                    "description": "tag id",
-                    "type": "string"
+                "unreviewed_info": {
+                    "$ref": "#/definitions/schema.GetRevisionResp"
                 }
             }
         },
@@ -6191,9 +6215,7 @@
             "type": "object",
             "required": [
                 "contact_email",
-                "description",
                 "name",
-                "short_description",
                 "site_url"
             ],
             "properties": {
@@ -6223,9 +6245,7 @@
             "type": "object",
             "required": [
                 "contact_email",
-                "description",
                 "name",
-                "short_description",
                 "site_url"
             ],
             "properties": {
@@ -6413,6 +6433,50 @@
                 }
             }
         },
+        "schema.TagSynonym": {
+            "type": "object",
+            "properties": {
+                "display_name": {
+                    "description": "display name",
+                    "type": "string"
+                },
+                "main_tag_slug_name": {
+                    "description": "if main tag slug name is not empty, this tag is synonymous with the main tag",
+                    "type": "string"
+                },
+                "slug_name": {
+                    "description": "slug name",
+                    "type": "string"
+                },
+                "tag_id": {
+                    "description": "tag id",
+                    "type": "string"
+                }
+            }
+        },
+        "schema.UnreviewedRevisionInfoInfo": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "html": {
+                    "type": "string"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
+                },
+                "title": {
+                    "type": "string"
+                }
+            }
+        },
         "schema.UpdateCommentReq": {
             "type": "object",
             "required": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index abd78c89..d32dd3d7 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -93,6 +93,8 @@ definitions:
     properties:
       answer_id:
         type: string
+      display_name:
+        type: string
       object_type:
         type: string
       question_id:
@@ -697,19 +699,25 @@ definitions:
     type: object
   schema.GetTagSynonymsResp:
     properties:
-      display_name:
-        description: display name
-        type: string
-      main_tag_slug_name:
-        description: if main tag slug name is not empty, this tag is synonymous with
-          the main tag
-        type: string
-      slug_name:
-        description: slug name
-        type: string
-      tag_id:
-        description: tag id
+      member_actions:
+        description: MemberActions
+        items:
+          $ref: '#/definitions/schema.PermissionMemberAction'
+        type: array
+      synonyms:
+        description: synonyms
+        items:
+          $ref: '#/definitions/schema.TagSynonym'
+        type: array
+    type: object
+  schema.GetUnreviewedRevisionResp:
+    properties:
+      info:
+        $ref: '#/definitions/schema.UnreviewedRevisionInfoInfo'
+      type:
         type: string
+      unreviewed_info:
+        $ref: '#/definitions/schema.GetRevisionResp'
     type: object
   schema.GetUserPageResp:
     properties:
@@ -1189,9 +1197,7 @@ definitions:
         type: string
     required:
     - contact_email
-    - description
     - name
-    - short_description
     - site_url
     type: object
   schema.SiteGeneralResp:
@@ -1213,9 +1219,7 @@ definitions:
         type: string
     required:
     - contact_email
-    - description
     - name
-    - short_description
     - site_url
     type: object
   schema.SiteInterfaceReq:
@@ -1330,6 +1334,37 @@ definitions:
       slug_name:
         type: string
     type: object
+  schema.TagSynonym:
+    properties:
+      display_name:
+        description: display name
+        type: string
+      main_tag_slug_name:
+        description: if main tag slug name is not empty, this tag is synonymous with
+          the main tag
+        type: string
+      slug_name:
+        description: slug name
+        type: string
+      tag_id:
+        description: tag id
+        type: string
+    type: object
+  schema.UnreviewedRevisionInfoInfo:
+    properties:
+      content:
+        type: string
+      html:
+        type: string
+      object_id:
+        type: string
+      tags:
+        items:
+          $ref: '#/definitions/schema.TagResp'
+        type: array
+      title:
+        type: string
+    type: object
   schema.UpdateCommentReq:
     properties:
       comment_id:
@@ -3510,7 +3545,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: check can update question
+      description: check can update revision
       parameters:
       - default: string
         description: id
@@ -3527,7 +3562,7 @@ paths:
             $ref: '#/definitions/handler.RespBody'
       security:
       - ApiKeyAuth: []
-      summary: check can update question
+      summary: check can update revision
       tags:
       - Revision
   /answer/api/v1/revisions/unreviewed:
@@ -3549,9 +3584,14 @@ paths:
             - $ref: '#/definitions/handler.RespBody'
             - properties:
                 data:
-                  items:
-                    $ref: '#/definitions/schema.GetRevisionResp'
-                  type: array
+                  allOf:
+                  - $ref: '#/definitions/pager.PageModel'
+                  - properties:
+                      list:
+                        items:
+                          $ref: '#/definitions/schema.GetUnreviewedRevisionResp'
+                        type: array
+                    type: object
               type: object
       security:
       - ApiKeyAuth: []
@@ -3753,9 +3793,7 @@ paths:
             - $ref: '#/definitions/handler.RespBody'
             - properties:
                 data:
-                  items:
-                    $ref: '#/definitions/schema.GetTagSynonymsResp'
-                  type: array
+                  $ref: '#/definitions/schema.GetTagSynonymsResp'
               type: object
       summary: get tag synonyms
       tags:
diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index 5dc1593a..8e4d89e6 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -18,18 +18,19 @@ var CmsAnswerSearchStatus = map[string]int{
 
 // Answer answer
 type Answer struct {
-	ID           string    `xorm:"not null pk autoincr BIGINT(20) id"`
-	CreatedAt    time.Time `xorm:"created not null default CURRENT_TIMESTAMP TIMESTAMP created_at"`
-	UpdatedAt    time.Time `xorm:"updated_at TIMESTAMP"`
-	QuestionID   string    `xorm:"not null default 0 BIGINT(20) question_id"`
-	UserID       string    `xorm:"not null default 0 BIGINT(20) INDEX user_id"`
-	OriginalText string    `xorm:"not null MEDIUMTEXT original_text"`
-	ParsedText   string    `xorm:"not null MEDIUMTEXT parsed_text"`
-	Status       int       `xorm:"not null default 1 INT(11) status"`
-	Adopted      int       `xorm:"not null default 1 INT(11) adopted"`
-	CommentCount int       `xorm:"not null default 0 INT(11) comment_count"`
-	VoteCount    int       `xorm:"not null default 0 INT(11) vote_count"`
-	RevisionID   string    `xorm:"not null default 0 BIGINT(20) revision_id"`
+	ID             string    `xorm:"not null pk autoincr BIGINT(20) id"`
+	CreatedAt      time.Time `xorm:"created not null default CURRENT_TIMESTAMP TIMESTAMP created_at"`
+	UpdatedAt      time.Time `xorm:"updated_at TIMESTAMP"`
+	QuestionID     string    `xorm:"not null default 0 BIGINT(20) question_id"`
+	UserID         string    `xorm:"not null default 0 BIGINT(20) INDEX user_id"`
+	LastEditUserID string    `xorm:"not null default 0 BIGINT(20) last_edit_user_id"`
+	OriginalText   string    `xorm:"not null MEDIUMTEXT original_text"`
+	ParsedText     string    `xorm:"not null MEDIUMTEXT parsed_text"`
+	Status         int       `xorm:"not null default 1 INT(11) status"`
+	Adopted        int       `xorm:"not null default 1 INT(11) adopted"`
+	CommentCount   int       `xorm:"not null default 0 INT(11) comment_count"`
+	VoteCount      int       `xorm:"not null default 0 INT(11) vote_count"`
+	RevisionID     string    `xorm:"not null default 0 BIGINT(20) revision_id"`
 }
 
 type AnswerSearch struct {
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index 93d94cd6..804b345d 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -33,6 +33,7 @@ type Question struct {
 	CreatedAt        time.Time `xorm:"not null default CURRENT_TIMESTAMP TIMESTAMP created_at"`
 	UpdatedAt        time.Time `xorm:"updated_at TIMESTAMP"`
 	UserID           string    `xorm:"not null default 0 BIGINT(20) INDEX user_id"`
+	LastEditUserID   string    `xorm:"not null default 0 BIGINT(20) last_edit_user_id"`
 	Title            string    `xorm:"not null default '' VARCHAR(150) title"`
 	OriginalText     string    `xorm:"not null MEDIUMTEXT original_text"`
 	ParsedText       string    `xorm:"not null MEDIUMTEXT parsed_text"`
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index ef886b4d..4527357b 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -57,6 +57,7 @@ type AnswerInfo struct {
 	UpdateTime     int64          `json:"update_time" xorm:"updated"`     // update_time
 	Adopted        int            `json:"adopted"`                        // 1 Failed 2 Adopted
 	UserID         string         `json:"-" `
+	UpdateUserID   string         `json:"-" `
 	UserInfo       *UserBasicInfo `json:"user_info,omitempty"`
 	UpdateUserInfo *UserBasicInfo `json:"update_user_info,omitempty"`
 	Collected      bool           `json:"collected"`
@@ -76,6 +77,7 @@ type AdminAnswerInfo struct {
 	UpdateTime   int64          `json:"update_time"`
 	Adopted      int            `json:"adopted"`
 	UserID       string         `json:"-" `
+	UpdateUserID string         `json:"-" `
 	UserInfo     *UserBasicInfo `json:"user_info"`
 	VoteCount    int            `json:"vote_count"`
 	QuestionInfo struct {
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 1c483a33..55ca661d 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -106,6 +106,8 @@ type QuestionInfo struct {
 	Status               int            `json:"status"`
 	Operation            *Operation     `json:"operation,omitempty"`
 	UserID               string         `json:"-" `
+	LastEditUserID       string         `json:"-" `
+	LastAnsweredUserID   string         `json:"-" `
 	UserInfo             *UserBasicInfo `json:"user_info"`
 	UpdateUserInfo       *UserBasicInfo `json:"update_user_info,omitempty"`
 	LastAnsweredUserInfo *UserBasicInfo `json:"last_answered_user_info,omitempty"`
diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.go
index 56cfbb99..cce4e9eb 100644
--- a/internal/service/answer_common/answer.go
+++ b/internal/service/answer_common/answer.go
@@ -72,6 +72,7 @@ func (as *AnswerCommon) ShowFormat(ctx context.Context, data *entity.Answer) *sc
 		info.UpdateTime = 0
 	}
 	info.UserID = data.UserID
+	info.UpdateUserID = data.LastEditUserID
 	return &info
 }
 
@@ -87,6 +88,7 @@ func (as *AnswerCommon) AdminShowFormat(ctx context.Context, data *entity.Answer
 		info.UpdateTime = 0
 	}
 	info.UserID = data.UserID
+	info.UpdateUserID = data.LastEditUserID
 	info.Description = htmltext.FetchExcerpt(data.ParsedText, "...", 240)
 	return &info
 }
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index d2bc0e00..78d727dc 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -225,11 +225,15 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	insertData := new(entity.Answer)
 	insertData.ID = req.ID
 	insertData.QuestionID = req.QuestionID
-	insertData.UserID = req.UserID
 	insertData.OriginalText = req.Content
 	insertData.ParsedText = req.HTML
 	insertData.UpdatedAt = now
 
+	insertData.LastEditUserID = "0"
+	if answerInfo.UserID != req.UserID {
+		insertData.LastEditUserID = req.UserID
+	}
+
 	revisionDTO := &schema.AddRevisionDTO{
 		UserID:   req.UserID,
 		ObjectID: req.ID,
@@ -457,6 +461,7 @@ func (as *AnswerService) SearchFormatInfo(ctx context.Context, answers []*entity
 		list = append(list, item)
 		objectIDs = append(objectIDs, info.ID)
 		userIDs = append(userIDs, info.UserID)
+		userIDs = append(userIDs, info.LastEditUserID)
 		if req.UserID != "" {
 			item.VoteStatus = as.voteRepo.GetVoteStatus(ctx, item.ID, req.UserID)
 		}
@@ -469,7 +474,10 @@ func (as *AnswerService) SearchFormatInfo(ctx context.Context, answers []*entity
 		_, ok := userInfoMap[item.UserID]
 		if ok {
 			item.UserInfo = userInfoMap[item.UserID]
-			item.UpdateUserInfo = userInfoMap[item.UserID]
+		}
+		_, ok = userInfoMap[item.UpdateUserID]
+		if ok {
+			item.UpdateUserInfo = userInfoMap[item.UpdateUserID]
 		}
 	}
 
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 72cfba92..645d1148 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -234,6 +234,9 @@ func (qs *QuestionCommon) ListFormat(ctx context.Context, questionList []*entity
 		list = append(list, item)
 		objectIds = append(objectIds, item.ID)
 		userIds = append(userIds, questionInfo.UserID)
+		userIds = append(userIds, questionInfo.LastEditUserID)
+		userIds = append(userIds, item.LastAnsweredUserID)
+
 	}
 	tagsMap, err := qs.tagCommon.BatchGetObjectTag(ctx, objectIds)
 	if err != nil {
@@ -254,7 +257,14 @@ func (qs *QuestionCommon) ListFormat(ctx context.Context, questionList []*entity
 		if ok {
 			item.UserInfo = userInfoMap[item.UserID]
 			item.UpdateUserInfo = userInfoMap[item.UserID]
-			item.LastAnsweredUserInfo = userInfoMap[item.UserID]
+		}
+		_, ok = userInfoMap[item.LastEditUserID]
+		if ok {
+			item.UpdateUserInfo = userInfoMap[item.UserID]
+		}
+		_, ok = userInfoMap[item.LastAnsweredUserID]
+		if ok {
+			item.LastAnsweredUserInfo = userInfoMap[item.LastAnsweredUserID]
 		}
 	}
 
@@ -389,6 +399,18 @@ func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question)
 	}
 	info.Status = data.Status
 	info.UserID = data.UserID
+	info.LastEditUserID = data.LastEditUserID
+	if data.LastAnswerID != "0" {
+		answerInfo, exist, err := qs.answerRepo.GetAnswer(ctx, data.LastAnswerID)
+		if err == nil && exist {
+			if answerInfo.LastEditUserID != "0" {
+				info.LastAnsweredUserID = answerInfo.LastEditUserID
+			} else {
+				info.LastAnsweredUserID = answerInfo.UserID
+			}
+		}
+
+	}
 	info.Tags = make([]*schema.TagResp, 0)
 	return &info
 }
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 536f8c41..37178a5a 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -284,7 +284,6 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 
 	now := time.Now()
 	question := &entity.Question{}
-	question.UserID = req.UserID
 	question.Title = req.Title
 	question.OriginalText = req.Content
 	question.ParsedText = req.HTML
@@ -298,6 +297,10 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	if !has {
 		return
 	}
+	question.LastEditUserID = "0"
+	if dbinfo.UserID != req.UserID {
+		question.LastEditUserID = req.UserID
+	}
 
 	oldTags, tagerr := qs.tagCommon.GetObjectEntityTag(ctx, question.ID)
 	if tagerr != nil {
@@ -377,7 +380,7 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		//Direct modification
 		revisionDTO.Status = entity.RevisionReviewPassStatus
 		//update question to db
-		saveerr := qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time"})
+		saveerr := qs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time", "last_edit_user_id"})
 		if saveerr != nil {
 			return questionInfo, saveerr
 		}
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 1d13599e..57688014 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -128,7 +128,8 @@ func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionit
 		question.ParsedText = questioninfo.HTML
 		question.UpdatedAt = now
 		question.PostUpdateTime = now
-		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time"})
+		question.LastEditUserID = revisionitem.UserID
+		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time", "last_edit_user_id"})
 		if saveerr != nil {
 			return saveerr
 		}
@@ -165,7 +166,8 @@ func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem
 		insertData.OriginalText = answerinfo.Content
 		insertData.ParsedText = answerinfo.HTML
 		insertData.UpdatedAt = now
-		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"})
+		insertData.LastEditUserID = revisionitem.UserID
+		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time", "last_edit_user_id"})
 		if saveerr != nil {
 			return saveerr
 		}

From 72b3f5de2ec353d305ebc16103544ff1e26b3878 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:35:27 +0800
Subject: [PATCH 158/194] update gitlab  ci config

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c80bde9f..fba34f74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,8 @@ stages:
 "compile the golang project":
   image: golang:1.18
   stage: compile-golang
+  before_script:
+    - export GOPROXY=https://goproxy.cn,direct
   script:
     - make generate
     - make build

From 37abf7d0a9c58b8b90c3989a91397a8216e06d59 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Thu, 1 Dec 2022 15:50:54 +0800
Subject: [PATCH 159/194] ci: add goproxy

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c80bde9f..fba34f74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,8 @@ stages:
 "compile the golang project":
   image: golang:1.18
   stage: compile-golang
+  before_script:
+    - export GOPROXY=https://goproxy.cn,direct
   script:
     - make generate
     - make build

From ecf3f023eb5457a60e4e2216fc13b18570bc6683 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 16:21:47 +0800
Subject: [PATCH 160/194] fix gitlab ci config

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fba34f74..cc4dd08e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,8 @@ stages:
 
 "build docker images and push":
   stage: push
+  before_script:
+    - export GOPROXY=https://goproxy.cn,direct
   extends: .docker-build-push
   only:
     - test

From eeb08a88d6f3c734c189c96080528a3776e1c8ee Mon Sep 17 00:00:00 2001
From: robin <robin@rnode.me>
Date: Thu, 1 Dec 2022 16:20:09 +0800
Subject: [PATCH 161/194] fix(ui): fix the problem of editor spacing error

---
 ui/src/pages/Questions/EditAnswer/index.scss | 2 +-
 ui/src/pages/Questions/EditAnswer/index.tsx  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/pages/Questions/EditAnswer/index.scss b/ui/src/pages/Questions/EditAnswer/index.scss
index a51e9b01..e9a156cf 100644
--- a/ui/src/pages/Questions/EditAnswer/index.scss
+++ b/ui/src/pages/Questions/EditAnswer/index.scss
@@ -1,5 +1,5 @@
 .edit-answer-wrap {
-  .content-wrap {
+  .question-content-wrap {
     position: relative;
     margin-bottom: 20px;
     overflow: hidden;
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index 7591c74d..58524163 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -140,7 +140,7 @@ const Ask = () => {
               <h5 className="mb-3">{data?.question.title}</h5>
             </a>
 
-            <div className="content-wrap">
+            <div className="question-content-wrap">
               <div
                 ref={questionContentRef}
                 className="content position-absolute top-0 w-100"
@@ -174,7 +174,7 @@ const Ask = () => {
                 </Form.Select>
               </Form.Group>
 
-              <Form.Group controlId="answer" className="mt-4">
+              <Form.Group controlId="answer" className="mt-3">
                 <Form.Label>{t('form.fields.answer.label')}</Form.Label>
                 <Editor
                   value={formData.answer.value}

From 635a8ec942a1df187cfc7ef1c4d78620db112078 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 1 Dec 2022 15:28:20 +0800
Subject: [PATCH 162/194] fix(answer): tag and answer add wait for review
 response

---
 internal/controller/answer_controller.go  | 7 ++++---
 internal/controller/tag_controller.go     | 6 +++++-
 internal/schema/answer_schema.go          | 8 +++++++-
 internal/schema/tag_schema.go             | 6 +++++-
 internal/service/answer_service.go        | 2 +-
 internal/service/tag_common/tag_common.go | 2 +-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index c1b658e0..94105ba4 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -189,9 +189,10 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		handler.HandleResponse(ctx, nil, nil)
 		return
 	}
-	handler.HandleResponse(ctx, nil, gin.H{
-		"info":     info,
-		"question": questionInfo,
+	handler.HandleResponse(ctx, nil, &schema.AnswerUpdateResp{
+		AnswerInfo:    info,
+		QuestionInfo:  questionInfo,
+		WaitForReview: !req.NoNeedReview,
 	})
 }
 
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
index 1a64962d..1164f1d4 100644
--- a/internal/controller/tag_controller.go
+++ b/internal/controller/tag_controller.go
@@ -108,7 +108,11 @@ func (tc *TagController) UpdateTag(ctx *gin.Context) {
 	req.NoNeedReview = canList[1]
 
 	err = tc.tagService.UpdateTag(ctx, req)
-	handler.HandleResponse(ctx, err, nil)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+	} else {
+		handler.HandleResponse(ctx, err, &schema.UpdateTagResp{WaitForReview: !req.NoNeedReview})
+	}
 }
 
 // GetTagInfo get tag one
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 4527357b..71e8a7f6 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -29,12 +29,18 @@ type AnswerUpdateReq struct {
 	Content      string `json:"content"`                           // content
 	HTML         string `json:"html" `                             // html
 	EditSummary  string `validate:"omitempty" json:"edit_summary"` // edit_summary
-	IsAdmin      bool   `json:"-"`
 	NoNeedReview bool   `json:"-"`
 	// whether user can edit it
 	CanEdit bool `json:"-"`
 }
 
+// AnswerUpdateResp answer update resp
+type AnswerUpdateResp struct {
+	AnswerInfo    *AnswerInfo   `json:"info"`
+	QuestionInfo  *QuestionInfo `json:"question"`
+	WaitForReview bool          `json:"wait_for_review"`
+}
+
 type AnswerListReq struct {
 	QuestionID string `json:"question_id" form:"question_id"` // question_id
 	Order      string `json:"order" form:"order"`             // 1 Default 2 time
diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go
index 900bbf05..bf79d5aa 100644
--- a/internal/schema/tag_schema.go
+++ b/internal/schema/tag_schema.go
@@ -157,7 +157,6 @@ type UpdateTagReq struct {
 	EditSummary string `validate:"omitempty" json:"edit_summary"`
 	// user id
 	UserID       string `json:"-"`
-	IsAdmin      bool   `json:"-"`
 	NoNeedReview bool   `json:"-"`
 }
 
@@ -168,6 +167,11 @@ func (r *UpdateTagReq) Check() (errFields []*validator.FormErrorField, err error
 	return nil, nil
 }
 
+// UpdateTagResp update tag response
+type UpdateTagResp struct {
+	WaitForReview bool `json:"wait_for_review"`
+}
+
 // GetTagWithPageReq get tag list page request
 type GetTagWithPageReq struct {
 	// page
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 78d727dc..5011b4da 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -241,7 +241,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 		Log:      req.EditSummary,
 	}
 
-	if req.NoNeedReview || req.IsAdmin || answerInfo.UserID == req.UserID {
+	if req.NoNeedReview || answerInfo.UserID == req.UserID {
 		canUpdate = true
 	}
 
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index 5a2d59fe..d9d97423 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -657,7 +657,7 @@ func (ts *TagCommonService) UpdateTag(ctx context.Context, req *schema.UpdateTag
 		Log:      req.EditSummary,
 	}
 
-	if req.IsAdmin || req.NoNeedReview {
+	if req.NoNeedReview {
 		canUpdate = true
 		err = ts.tagRepo.UpdateTag(ctx, tagInfo)
 		if err != nil {

From de5b2966bf3108f2814c090707da516b8318c5db Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 17:38:37 +0800
Subject: [PATCH 163/194] fix question userid

---
 internal/service/answer_service.go   |  1 +
 internal/service/question_service.go | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 78d727dc..2e9020e7 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -224,6 +224,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	now := time.Now()
 	insertData := new(entity.Answer)
 	insertData.ID = req.ID
+	insertData.UserID = answerInfo.UserID
 	insertData.QuestionID = req.QuestionID
 	insertData.OriginalText = req.Content
 	insertData.ParsedText = req.HTML
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 37178a5a..6997109e 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -282,6 +282,14 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 		return
 	}
 
+	dbinfo, has, err := qs.questionRepo.GetQuestion(ctx, req.ID)
+	if err != nil {
+		return
+	}
+	if !has {
+		return
+	}
+
 	now := time.Now()
 	question := &entity.Question{}
 	question.Title = req.Title
@@ -290,13 +298,8 @@ func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.Quest
 	question.ID = req.ID
 	question.UpdatedAt = now
 	question.PostUpdateTime = now
-	dbinfo, has, err := qs.questionRepo.GetQuestion(ctx, question.ID)
-	if err != nil {
-		return
-	}
-	if !has {
-		return
-	}
+	question.UserID = dbinfo.UserID
+
 	question.LastEditUserID = "0"
 	if dbinfo.UserID != req.UserID {
 		question.LastEditUserID = req.UserID

From 9a8bb76e20a2f560345e9e45d245e3f7196c98cb Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Thu, 1 Dec 2022 18:15:39 +0800
Subject: [PATCH 164/194] feat(question): Tell the user whether to enter the
 audit state when modifying the question

---
 internal/controller/answer_controller.go   | 13 ++-----------
 internal/controller/question_controller.go |  4 ++--
 internal/schema/answer_schema.go           |  4 +---
 internal/schema/question_schema.go         |  5 +++++
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 94105ba4..615dd639 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -179,21 +179,12 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	info, questionInfo, has, err := ac.answerService.Get(ctx, req.ID, req.UserID)
+	_, _, _, err = ac.answerService.Get(ctx, req.ID, req.UserID)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
 	}
-	if !has {
-		// todo !has
-		handler.HandleResponse(ctx, nil, nil)
-		return
-	}
-	handler.HandleResponse(ctx, nil, &schema.AnswerUpdateResp{
-		AnswerInfo:    info,
-		QuestionInfo:  questionInfo,
-		WaitForReview: !req.NoNeedReview,
-	})
+	handler.HandleResponse(ctx, nil, &schema.AnswerUpdateResp{WaitForReview: !req.NoNeedReview})
 }
 
 // AnswerList godoc
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 25ddcfd4..2fe17320 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -266,8 +266,8 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		return
 	}
 
-	resp, err := qc.questionService.UpdateQuestion(ctx, req)
-	handler.HandleResponse(ctx, err, resp)
+	_, err = qc.questionService.UpdateQuestion(ctx, req)
+	handler.HandleResponse(ctx, err, &schema.UpdateQuestionResp{WaitForReview: !req.NoNeedReview})
 }
 
 // CloseMsgList close question msg list
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 71e8a7f6..0a88eefa 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -36,9 +36,7 @@ type AnswerUpdateReq struct {
 
 // AnswerUpdateResp answer update resp
 type AnswerUpdateResp struct {
-	AnswerInfo    *AnswerInfo   `json:"info"`
-	QuestionInfo  *QuestionInfo `json:"question"`
-	WaitForReview bool          `json:"wait_for_review"`
+	WaitForReview bool `json:"wait_for_review"`
 }
 
 type AnswerListReq struct {
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 55ca661d..f9be0293 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -120,6 +120,11 @@ type QuestionInfo struct {
 	MemberActions []*PermissionMemberAction `json:"member_actions"`
 }
 
+// UpdateQuestionResp update question resp
+type UpdateQuestionResp struct {
+	WaitForReview bool `json:"wait_for_review"`
+}
+
 type AdminQuestionInfo struct {
 	ID               string         `json:"id"`
 	Title            string         `json:"title"`

From 2841e3eef27f2fedbf1ff0732ee1230e88593447 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 1 Dec 2022 18:21:53 +0800
Subject: [PATCH 165/194] feat: edit content in review will show toast msg

---
 i18n/en_US.yaml                             |  1 +
 ui/src/common/interface.ts                  |  6 ++
 ui/src/pages/Questions/Ask/index.tsx        |  6 +-
 ui/src/pages/Questions/Detail/index.tsx     | 22 +++++++-
 ui/src/pages/Questions/EditAnswer/index.tsx |  6 +-
 ui/src/pages/Tags/Edit/index.tsx            |  7 ++-
 ui/src/pages/Tags/Info/index.tsx            | 62 ++++++++++++++-------
 ui/src/services/client/tag.ts               |  5 +-
 8 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 2b2819dc..daa1e4cd 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -682,6 +682,7 @@ ui:
     update: update success
     update_password: Password changed successfully.
     flag_success: Thanks for flagging.
+    review: Your revision will show after review.
   related_question:
     title: Related Questions
     btn: Add question
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index bdbff1b2..474b015a 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -440,3 +440,9 @@ export interface ReviewResp {
   count: number;
   list: ReviewItem[];
 }
+
+export interface MemberActionItem {
+  action: string;
+  name: string;
+  type: string;
+}
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 6bd338e5..ed0b93a9 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -234,8 +234,10 @@ const Ask = () => {
         id: qid,
         edit_summary: formData.edit_summary.value,
       })
-        .then(() => {
-          navigate(`/questions/${qid}`);
+        .then((res) => {
+          navigate(`/questions/${qid}`, {
+            state: { isReview: res?.wait_for_review },
+          });
         })
         .catch((err) => {
           if (err.isError) {
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index 36546cb3..1a4f11b6 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -1,9 +1,15 @@
 import { useEffect, useState } from 'react';
 import { Container, Row, Col } from 'react-bootstrap';
-import { useParams, useSearchParams, useNavigate } from 'react-router-dom';
+import {
+  useParams,
+  useSearchParams,
+  useNavigate,
+  useLocation,
+} from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
 
 import { Pagination, PageTitle } from '@/components';
-import { loggedUserInfoStore } from '@/stores';
+import { loggedUserInfoStore, toastStore } from '@/stores';
 import { scrollTop } from '@/utils';
 import { usePageUsers } from '@/hooks';
 import type {
@@ -26,6 +32,7 @@ import './index.scss';
 
 const Index = () => {
   const navigate = useNavigate();
+  const { t } = useTranslation('translation');
   const { qid = '', aid = '' } = useParams();
   const [urlSearch] = useSearchParams();
 
@@ -40,6 +47,17 @@ const Index = () => {
   const userInfo = loggedUserInfoStore((state) => state.user);
   const isAuthor = userInfo?.username === question?.user_info?.username;
   const isLogged = Boolean(userInfo?.access_token);
+  const { state: locationState } = useLocation();
+
+  useEffect(() => {
+    if (locationState?.isReview) {
+      toastStore.getState().show({
+        msg: t('review', { keyPrefix: 'toast' }),
+        variant: 'warning',
+      });
+    }
+  }, [locationState]);
+
   const requestAnswers = async () => {
     const res = await getAnswers({
       order: order === 'updated' ? order : 'default',
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index 7591c74d..f32234db 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -109,8 +109,10 @@ const Ask = () => {
       id: aid,
       edit_summary: formData.description.value,
     };
-    modifyAnswer(params).then(() => {
-      navigate(`/questions/${qid}/${aid}`);
+    modifyAnswer(params).then((res) => {
+      navigate(`/questions/${qid}/${aid}`, {
+        state: { isReview: res?.wait_for_review },
+      });
     });
   };
 
diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx
index 11d26e53..d7f508b3 100644
--- a/ui/src/pages/Tags/Edit/index.tsx
+++ b/ui/src/pages/Tags/Edit/index.tsx
@@ -104,8 +104,11 @@ const Ask = () => {
       tag_id: data?.tag_id,
       edit_summary: formData.editSummary.value,
     };
-    modifyTag(params).then(() => {
-      navigate(-1);
+    modifyTag(params).then((res) => {
+      navigate(`/tags/${formData.slugName.value}/info`, {
+        replace: true,
+        state: { isReview: res.wait_for_review },
+      });
     });
   };
 
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index 8e4a765a..c44d2b35 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -1,6 +1,6 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Container, Row, Col, Button, Card } from 'react-bootstrap';
-import { useParams, useNavigate, Link } from 'react-router-dom';
+import { useParams, useNavigate, Link, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import classNames from 'classnames';
@@ -14,17 +14,28 @@ import {
   editCheck,
 } from '@/services';
 import { pathFactory } from '@/router/pathFactory';
-import { loggedUserInfoStore } from '@/stores';
+import { loggedUserInfoStore, toastStore } from '@/stores';
 
 const TagIntroduction = () => {
   const userInfo = loggedUserInfoStore((state) => state.user);
+  const { state: locationState } = useLocation();
   const isLogged = Boolean(userInfo?.access_token);
   const [isEdit, setEditState] = useState(false);
   const { tagName } = useParams();
   const { data: tagInfo } = useTagInfo({ name: tagName });
   const { t } = useTranslation('translation', { keyPrefix: 'tag_info' });
   const navigate = useNavigate();
-  const { data: synonymsTags, mutate } = useQuerySynonymsTags(tagInfo?.tag_id);
+  const { data: synonymsData, mutate } = useQuerySynonymsTags(tagInfo?.tag_id);
+
+  useEffect(() => {
+    if (locationState?.isReview) {
+      toastStore.getState().show({
+        msg: t('review', { keyPrefix: 'toast' }),
+        variant: 'warning',
+      });
+    }
+  }, [locationState]);
+
   if (!tagInfo) {
     return null;
   }
@@ -34,6 +45,7 @@ const TagIntroduction = () => {
     });
     return null;
   }
+
   const handleEdit = () => {
     setEditState(true);
   };
@@ -41,7 +53,7 @@ const TagIntroduction = () => {
   const handleSave = () => {
     saveSynonymsTags({
       tag_id: tagInfo?.tag_id,
-      synonym_tag_list: synonymsTags,
+      synonym_tag_list: synonymsData?.synonyms,
     }).then(() => {
       mutate();
       setEditState(false);
@@ -49,9 +61,12 @@ const TagIntroduction = () => {
   };
 
   const handleTagsChange = (value) => {
-    mutate([...value], {
-      revalidate: false,
-    });
+    mutate(
+      { ...synonymsData, synonyms: [...value] },
+      {
+        revalidate: false,
+      },
+    );
   };
 
   const handleEditTag = () => {
@@ -60,7 +75,7 @@ const TagIntroduction = () => {
     });
   };
   const handleDeleteTag = () => {
-    if (synonymsTags && synonymsTags.length > 0) {
+    if (synonymsData?.synonyms && synonymsData.synonyms.length > 0) {
       Modal.confirm({
         title: t('delete.title'),
         content: t('delete.content2'),
@@ -157,14 +172,16 @@ const TagIntroduction = () => {
                     onClick={handleSave}>
                     {t('synonyms.btn_save')}
                   </Button>
-                ) : (
+                ) : synonymsData?.member_actions?.find(
+                    (v) => v.action === 'edit',
+                  ) ? (
                   <Button
                     variant="link"
                     className="p-0 btn-no-border"
                     onClick={handleEdit}>
                     {t('synonyms.btn_edit')}
                   </Button>
-                )}
+                ) : null}
               </Card.Header>
               <Card.Body>
                 {isEdit && (
@@ -183,15 +200,16 @@ const TagIntroduction = () => {
                       />
                     </div>
                     <TagSelector
-                      value={synonymsTags}
+                      value={synonymsData?.synonyms}
                       onChange={handleTagsChange}
                       hiddenDescription
                     />
                   </>
                 )}
                 {!isEdit &&
-                  (synonymsTags && synonymsTags.length > 0 ? (
-                    synonymsTags.map((item) => {
+                  (synonymsData?.synonyms &&
+                  synonymsData.synonyms.length > 0 ? (
+                    synonymsData.synonyms.map((item) => {
                       return (
                         <Tag
                           key={item.tag_id}
@@ -205,12 +223,16 @@ const TagIntroduction = () => {
                       <div className="text-muted mb-3">
                         {t('synonyms.empty')}
                       </div>
-                      <Button
-                        variant="outline-primary"
-                        size="sm"
-                        onClick={handleEdit}>
-                        {t('synonyms.btn_add')}
-                      </Button>
+                      {synonymsData?.member_actions?.find(
+                        (v) => v.action === 'edit',
+                      ) && (
+                        <Button
+                          variant="outline-primary"
+                          size="sm"
+                          onClick={handleEdit}>
+                          {t('synonyms.btn_add')}
+                        </Button>
+                      )}
                     </>
                   ))}
               </Card.Body>
diff --git a/ui/src/services/client/tag.ts b/ui/src/services/client/tag.ts
index 55c18b6e..b13b9b52 100644
--- a/ui/src/services/client/tag.ts
+++ b/ui/src/services/client/tag.ts
@@ -15,7 +15,10 @@ export const modifyTag = (params) => {
 
 export const useQuerySynonymsTags = (tagId) => {
   const apiUrl = tagId ? `/answer/api/v1/tag/synonyms?tag_id=${tagId}` : '';
-  return useSWR<Type.SynonymsTag[]>(apiUrl, request.instance.get);
+  return useSWR<{
+    synonyms: Type.SynonymsTag[];
+    member_actions?: Type.MemberActionItem[];
+  }>(apiUrl, request.instance.get);
 };
 
 export const saveSynonymsTags = (params) => {

From d4b1a5b4e51ff96c9fde89eadbceefd75d5b0a97 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 18:36:20 +0800
Subject: [PATCH 166/194] fix question last edit userid

---
 docs/docs.go                                 | 56 ++++++++++----------
 docs/swagger.json                            | 56 ++++++++++----------
 docs/swagger.yaml                            | 41 +++++++-------
 internal/controller/answer_controller.go     |  8 ++-
 internal/repo/question/question_repo.go      |  2 +-
 internal/service/answer_service.go           | 21 +++++---
 internal/service/question_common/question.go | 32 +++++++----
 7 files changed, 117 insertions(+), 99 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 9de9e8fc..21f184bc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1294,7 +1294,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/answer/api/v1/answer/list": {
+        "/answer/api/v1/answer/page": {
             "get": {
                 "security": [
                     {
@@ -1314,13 +1314,32 @@ const docTemplate = `{
                 "summary": "AnswerList",
                 "parameters": [
                     {
-                        "description": "AnswerListReq",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/schema.AnswerListReq"
-                        }
+                        "type": "string",
+                        "description": "question_id",
+                        "name": "question_id",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "order",
+                        "name": "order",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "page",
+                        "name": "page",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "page_size",
+                        "name": "page_size",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -4875,27 +4894,6 @@ const docTemplate = `{
                 }
             }
         },
-        "schema.AnswerListReq": {
-            "type": "object",
-            "properties": {
-                "order": {
-                    "description": "1 Default 2 time",
-                    "type": "string"
-                },
-                "page": {
-                    "description": "Query number of pages",
-                    "type": "integer"
-                },
-                "page_size": {
-                    "description": "Search page size",
-                    "type": "integer"
-                },
-                "question_id": {
-                    "description": "question_id",
-                    "type": "string"
-                }
-            }
-        },
         "schema.AnswerUpdateReq": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index b1eaec18..05fdf0af 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1282,7 +1282,7 @@
                 }
             }
         },
-        "/answer/api/v1/answer/list": {
+        "/answer/api/v1/answer/page": {
             "get": {
                 "security": [
                     {
@@ -1302,13 +1302,32 @@
                 "summary": "AnswerList",
                 "parameters": [
                     {
-                        "description": "AnswerListReq",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/schema.AnswerListReq"
-                        }
+                        "type": "string",
+                        "description": "question_id",
+                        "name": "question_id",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "order",
+                        "name": "order",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "page",
+                        "name": "page",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "page_size",
+                        "name": "page_size",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -4863,27 +4882,6 @@
                 }
             }
         },
-        "schema.AnswerListReq": {
-            "type": "object",
-            "properties": {
-                "order": {
-                    "description": "1 Default 2 time",
-                    "type": "string"
-                },
-                "page": {
-                    "description": "Query number of pages",
-                    "type": "integer"
-                },
-                "page_size": {
-                    "description": "Search page size",
-                    "type": "integer"
-                },
-                "question_id": {
-                    "description": "question_id",
-                    "type": "string"
-                }
-            }
-        },
         "schema.AnswerUpdateReq": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d32dd3d7..ae9e1bf8 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -206,21 +206,6 @@ definitions:
         description: question_id
         type: string
     type: object
-  schema.AnswerListReq:
-    properties:
-      order:
-        description: 1 Default 2 time
-        type: string
-      page:
-        description: Query number of pages
-        type: integer
-      page_size:
-        description: Search page size
-        type: integer
-      question_id:
-        description: question_id
-        type: string
-    type: object
   schema.AnswerUpdateReq:
     properties:
       content:
@@ -2462,18 +2447,32 @@ paths:
       summary: Get Answer
       tags:
       - api-answer
-  /answer/api/v1/answer/list:
+  /answer/api/v1/answer/page:
     get:
       consumes:
       - application/json
       description: AnswerList <br> <b>order</b> (default or updated)
       parameters:
-      - description: AnswerListReq
-        in: body
-        name: data
+      - description: question_id
+        in: query
+        name: question_id
         required: true
-        schema:
-          $ref: '#/definitions/schema.AnswerListReq'
+        type: string
+      - description: order
+        in: query
+        name: order
+        required: true
+        type: string
+      - description: page
+        in: query
+        name: page
+        required: true
+        type: string
+      - description: page_size
+        in: query
+        name: page_size
+        required: true
+        type: string
       produces:
       - application/json
       responses:
diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 94105ba4..dddaeeb8 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -203,14 +203,18 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 // @Security ApiKeyAuth
 // @Accept  json
 // @Produce  json
-// @Param data body schema.AnswerListReq  true "AnswerListReq"
+// @Param question_id query string true "question_id"
+// @Param order query string true "order"
+// @Param page query string true "page"
+// @Param page_size query string true "page_size"
 // @Success 200 {string} string ""
-// @Router /answer/api/v1/answer/list [get]
+// @Router /answer/api/v1/answer/page [get]
 func (ac *AnswerController) AnswerList(ctx *gin.Context) {
 	req := &schema.AnswerListReq{}
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
+
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index 18da5594..82686fe5 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -230,7 +230,7 @@ func (qr *questionRepo) SearchList(ctx context.Context, search *schema.QuestionS
 		session = session.OrderBy("question.created_at desc")
 	}
 	session = session.Limit(search.PageSize, offset)
-	session = session.Select("question.id,question.user_id,question.title,question.original_text,question.parsed_text,question.status,question.view_count,question.unique_view_count,question.vote_count,question.answer_count,question.collection_count,question.follow_count,question.accepted_answer_id,question.last_answer_id,question.created_at,question.updated_at,question.post_update_time,question.revision_id")
+	session = session.Select("question.id,question.user_id,last_edit_user_id,question.title,question.original_text,question.parsed_text,question.status,question.view_count,question.unique_view_count,question.vote_count,question.answer_count,question.collection_count,question.follow_count,question.accepted_answer_id,question.last_answer_id,question.created_at,question.updated_at,question.post_update_time,question.revision_id")
 	count, err = session.FindAndCount(&rows)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 26558c4b..8f688d4a 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -249,7 +249,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	if !canUpdate {
 		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	} else {
-		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time"}); err != nil {
+		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time", "last_edit_user_id"}); err != nil {
 			return "", err
 		}
 		err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
@@ -370,13 +370,22 @@ func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string)
 		return nil, nil, has, err
 	}
 	// todo UserFunc
-	userinfo, has, err := as.userCommon.GetUserBasicInfoByID(ctx, answerInfo.UserID)
+
+	userIds := make([]string, 0)
+	userIds = append(userIds, answerInfo.UserID)
+	userIds = append(userIds, answerInfo.LastEditUserID)
+	userInfoMap, err := as.userCommon.BatchUserBasicInfoByID(ctx, userIds)
 	if err != nil {
 		return nil, nil, has, err
 	}
-	if has {
-		info.UserInfo = userinfo
-		info.UpdateUserInfo = userinfo
+
+	_, ok := userInfoMap[answerInfo.UserID]
+	if ok {
+		info.UserInfo = userInfoMap[answerInfo.UserID]
+	}
+	_, ok = userInfoMap[answerInfo.LastEditUserID]
+	if ok {
+		info.UpdateUserInfo = userInfoMap[answerInfo.LastEditUserID]
 	}
 
 	if loginUserID == "" {
@@ -389,7 +398,7 @@ func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string)
 	if err != nil {
 		log.Error("CollectionFunc.SearchObjectCollected error", err)
 	}
-	_, ok := CollectedMap[answerInfo.ID]
+	_, ok = CollectedMap[answerInfo.ID]
 	if ok {
 		info.Collected = true
 	}
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 645d1148..045b979d 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -184,14 +184,26 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUser
 	}
 	showinfo.Tags = tagmap
 
-	userinfo, has, err := qs.userCommon.GetUserBasicInfoByID(ctx, dbinfo.UserID)
+	userIds := make([]string, 0)
+	userIds = append(userIds, dbinfo.UserID)
+	userIds = append(userIds, dbinfo.LastEditUserID)
+	userIds = append(userIds, showinfo.LastAnsweredUserID)
+	userInfoMap, err := qs.userCommon.BatchUserBasicInfoByID(ctx, userIds)
 	if err != nil {
 		return showinfo, err
 	}
-	if has {
-		showinfo.UserInfo = userinfo
-		showinfo.UpdateUserInfo = userinfo
-		showinfo.LastAnsweredUserInfo = userinfo
+
+	_, ok := userInfoMap[dbinfo.UserID]
+	if ok {
+		showinfo.UserInfo = userInfoMap[dbinfo.UserID]
+	}
+	_, ok = userInfoMap[dbinfo.LastEditUserID]
+	if ok {
+		showinfo.UpdateUserInfo = userInfoMap[dbinfo.LastEditUserID]
+	}
+	_, ok = userInfoMap[showinfo.LastAnsweredUserID]
+	if ok {
+		showinfo.LastAnsweredUserInfo = userInfoMap[showinfo.LastAnsweredUserID]
 	}
 
 	if loginUserID == "" {
@@ -216,7 +228,7 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUser
 	if err != nil {
 		log.Error("CollectionFunc.SearchObjectCollected", err)
 	}
-	_, ok := CollectedMap[dbinfo.ID]
+	_, ok = CollectedMap[dbinfo.ID]
 	if ok {
 		showinfo.Collected = true
 	}
@@ -233,10 +245,9 @@ func (qs *QuestionCommon) ListFormat(ctx context.Context, questionList []*entity
 		item := qs.ShowListFormat(ctx, questionInfo)
 		list = append(list, item)
 		objectIds = append(objectIds, item.ID)
-		userIds = append(userIds, questionInfo.UserID)
-		userIds = append(userIds, questionInfo.LastEditUserID)
+		userIds = append(userIds, item.UserID)
+		userIds = append(userIds, item.LastEditUserID)
 		userIds = append(userIds, item.LastAnsweredUserID)
-
 	}
 	tagsMap, err := qs.tagCommon.BatchGetObjectTag(ctx, objectIds)
 	if err != nil {
@@ -256,11 +267,10 @@ func (qs *QuestionCommon) ListFormat(ctx context.Context, questionList []*entity
 		_, ok = userInfoMap[item.UserID]
 		if ok {
 			item.UserInfo = userInfoMap[item.UserID]
-			item.UpdateUserInfo = userInfoMap[item.UserID]
 		}
 		_, ok = userInfoMap[item.LastEditUserID]
 		if ok {
-			item.UpdateUserInfo = userInfoMap[item.UserID]
+			item.UpdateUserInfo = userInfoMap[item.LastEditUserID]
 		}
 		_, ok = userInfoMap[item.LastAnsweredUserID]
 		if ok {

From 46d80f39568b5fea5a07d1ddf36732df035335ec Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Thu, 1 Dec 2022 18:50:45 +0800
Subject: [PATCH 167/194] fix update answer edit time

---
 internal/service/answer_service.go   | 2 +-
 internal/service/revision_service.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 8f688d4a..e330ab91 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -249,7 +249,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 	if !canUpdate {
 		revisionDTO.Status = entity.RevisionUnreviewedStatus
 	} else {
-		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time", "last_edit_user_id"}); err != nil {
+		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "updated_at", "last_edit_user_id"}); err != nil {
 			return "", err
 		}
 		err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 57688014..0d91c26a 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -167,7 +167,7 @@ func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem
 		insertData.ParsedText = answerinfo.HTML
 		insertData.UpdatedAt = now
 		insertData.LastEditUserID = revisionitem.UserID
-		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "update_time", "last_edit_user_id"})
+		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "updated_at", "last_edit_user_id"})
 		if saveerr != nil {
 			return saveerr
 		}

From 904ad21b57e41e84865c675e9522d3464be4613c Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 10:19:12 +0800
Subject: [PATCH 168/194] fix: question userinfo

---
 ui/src/pages/Questions/Detail/components/Question/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/pages/Questions/Detail/components/Question/index.tsx b/ui/src/pages/Questions/Detail/components/Question/index.tsx
index 92bdd235..04ef1a0f 100644
--- a/ui/src/pages/Questions/Detail/components/Question/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Question/index.tsx
@@ -132,7 +132,7 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer, isLogged }) => {
         <Col lg={3} className="mb-3 mb-md-0">
           {data.update_user_info?.username !== data.user_info?.username ? (
             <UserCard
-              data={data?.user_info}
+              data={data?.update_user_info}
               time={data.edit_time}
               preFix={t('edit')}
               isLogged={isLogged}

From d7bf6ae3e4be150c4c71fa167b8fa070248b729c Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 2 Dec 2022 13:13:04 +0800
Subject: [PATCH 169/194] fix add question answer

---
 internal/service/answer_service.go   | 1 +
 internal/service/question_service.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index e330ab91..7eb32758 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -136,6 +136,7 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	insertData.Adopted = schema.AnswerAdoptedFailed
 	insertData.QuestionID = req.QuestionID
 	insertData.RevisionID = "0"
+	insertData.LastEditUserID = "0"
 	insertData.Status = entity.AnswerStatusAvailable
 	//insertData.UpdatedAt = now
 	if err = as.answerRepo.AddAnswer(ctx, insertData); err != nil {
diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 6997109e..87f365d1 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -144,6 +144,7 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	question.ParsedText = req.HTML
 	question.AcceptedAnswerID = "0"
 	question.LastAnswerID = "0"
+	question.LastEditUserID = "0"
 	//question.PostUpdateTime = nil
 	question.Status = entity.QuestionStatusAvailable
 	question.RevisionID = "0"

From df79e4b8a031e5db5d50601ac0065930d5528bee Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 14:11:30 +0800
Subject: [PATCH 170/194] fix: update use info is empty

---
 ui/src/pages/Questions/Detail/components/Answer/index.tsx   | 3 ++-
 ui/src/pages/Questions/Detail/components/Question/index.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/Questions/Detail/components/Answer/index.tsx b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
index d1b76be7..d35669ff 100644
--- a/ui/src/pages/Questions/Detail/components/Answer/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
@@ -118,7 +118,8 @@ const Index: FC<Props> = ({
           />
         </Col>
         <Col lg={3} className="mb-3 mb-md-0">
-          {data.update_user_info?.username !== data.user_info?.username ? (
+          {data.update_user_info &&
+          data.update_user_info?.username !== data.user_info?.username ? (
             <UserCard
               data={data?.update_user_info}
               time={Number(data.update_time)}
diff --git a/ui/src/pages/Questions/Detail/components/Question/index.tsx b/ui/src/pages/Questions/Detail/components/Question/index.tsx
index 04ef1a0f..80eca32c 100644
--- a/ui/src/pages/Questions/Detail/components/Question/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Question/index.tsx
@@ -130,7 +130,8 @@ const Index: FC<Props> = ({ data, initPage, hasAnswer, isLogged }) => {
           />
         </Col>
         <Col lg={3} className="mb-3 mb-md-0">
-          {data.update_user_info?.username !== data.user_info?.username ? (
+          {data.update_user_info &&
+          data.update_user_info?.username !== data.user_info?.username ? (
             <UserCard
               data={data?.update_user_info}
               time={data.edit_time}

From 8ccb2ea498f57fa55b4c7bb0a01cd5cf7f000035 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:01:29 +0800
Subject: [PATCH 171/194] fix unreviewed revision list

---
 internal/repo/revision/revision_repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index d72a5bb8..1d5a276f 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -176,7 +176,7 @@ func (rr *revisionRepo) GetUnreviewedRevisionPage(ctx context.Context, page int,
 	session := rr.data.DB.NewSession()
 	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
 	session = session.In("object_type", objectTypeList)
-	session = session.OrderBy("created_at desc")
+	session = session.OrderBy("created_at asc")
 
 	total, err = pager.Help(page, pageSize, &revisionList, &entity.Revision{}, session)
 	if err != nil {

From e5cb06b8aafaabe2914dddd62f237e5dbb4aa2ad Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 2 Dec 2022 15:14:27 +0800
Subject: [PATCH 172/194] fix(revision): Return toast alert when there is a
 version under review

---
 internal/controller/revision_controller.go | 4 ++--
 internal/service/revision_service.go       | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 090209b2..034f343d 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -159,6 +159,6 @@ func (rc *RevisionController) CheckCanUpdateRevision(ctx *gin.Context) {
 		return
 	}
 
-	err = rc.revisionListService.CheckCanUpdateRevision(ctx, req)
-	handler.HandleResponse(ctx, err, nil)
+	resp, err := rc.revisionListService.CheckCanUpdateRevision(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
 }
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 0d91c26a..9ee20a0a 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -386,13 +386,14 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 }
 
 // CheckCanUpdateRevision can check revision
-func (rs *RevisionService) CheckCanUpdateRevision(ctx context.Context, req *schema.CheckCanQuestionUpdate) (err error) {
+func (rs *RevisionService) CheckCanUpdateRevision(ctx context.Context, req *schema.CheckCanQuestionUpdate) (
+	resp *schema.ErrTypeData, err error) {
 	_, exist, err := rs.revisionRepo.ExistUnreviewedByObjectID(ctx, req.ID)
 	if err != nil {
-		return err
+		return nil, nil
 	}
 	if exist {
-		return errors.BadRequest(reason.RevisionReviewUnderway)
+		return &schema.ErrTypeToast, errors.BadRequest(reason.RevisionReviewUnderway)
 	}
-	return nil
+	return nil, nil
 }

From 583bd34f1c7cd912445f41e4aae01bea3599e41f Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 15:24:04 +0800
Subject: [PATCH 173/194] fix: review kbd cannot render as tag

---
 ui/src/pages/Review/index.tsx | 4 +++-
 ui/src/utils/common.ts        | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 132d433d..f169e7bf 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -135,7 +135,9 @@ const Index: FC = () => {
             <Col lg={{ span: 7, offset: 1 }}>
               <Alert variant="secondary">
                 <Stack className="align-items-start">
-                  <span className="badge text-bg-secondary">{editBadge}</span>
+                  <span className="badge text-bg-secondary mb-2">
+                    {editBadge}
+                  </span>
                   <Link to={itemLink} target="_blank">
                     {itemTitle}
                   </Link>
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 1b8ac340..29f8ee30 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -190,6 +190,8 @@ function diffText(newText: string, oldText: string): string {
   return result
     .join('')
     ?.replace(/<iframe/gi, '&lt;iframe')
+    ?.replace(/<kbd/gi, '&lt;kbd')
+    ?.replace(/<\/kbd>/gi, '&lt;/kbd&gt;')
     ?.replace(/<input/gi, '&lt;input');
 }
 

From 1f2be0c8d6b035d05abaad485e6a21bbfc587f2d Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 16:15:56 +0800
Subject: [PATCH 174/194] fix: line breaks reflect

---
 ui/src/utils/common.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 29f8ee30..2037b88d 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -177,13 +177,27 @@ function diffText(newText: string, oldText: string): string {
       ?.replace(/<input/gi, '&lt;input');
   }
   const diff = Diff.diffChars(oldText, newText);
+  console.log(diff);
   const result = diff.map((part) => {
     if (part.added) {
-      return `<span class="review-text-add">${part.value}</span>`;
+      if (part.value.replace(/\n/g, '').length <= 0) {
+        return `<span class="review-text-add d-block">${part.value.replace(
+          /\n/g,
+          '↵\n',
+        )}</span>`;
+      }
+      return `<span class="review-text-add d-block">${part.value}</span>`;
     }
     if (part.removed) {
+      if (part.value.replace(/\n/g, '').length <= 0) {
+        return `<span class="review-text-delete text-decoration-none d-block">${part.value.replace(
+          /\n/g,
+          '↵\n',
+        )}</span>`;
+      }
       return `<span class="review-text-delete">${part.value}</span>`;
     }
+
     return part.value;
   });
 

From 9d3e1b5334790530883eb8cede2c17329c4f8c32 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 16:16:28 +0800
Subject: [PATCH 175/194] fix: cancel log

---
 ui/src/utils/common.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 2037b88d..e54f6cba 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -177,7 +177,7 @@ function diffText(newText: string, oldText: string): string {
       ?.replace(/<input/gi, '&lt;input');
   }
   const diff = Diff.diffChars(oldText, newText);
-  console.log(diff);
+  // console.log(diff);
   const result = diff.map((part) => {
     if (part.added) {
       if (part.value.replace(/\n/g, '').length <= 0) {

From 2b70df83f85a3c161496abe68657c29191d24c28 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Fri, 2 Dec 2022 16:20:26 +0800
Subject: [PATCH 176/194] fix(edit): prevent edit action if editCheck return
 error

---
 ui/src/components/Operate/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/Operate/index.tsx b/ui/src/components/Operate/index.tsx
index da27b7f4..16359c91 100644
--- a/ui/src/components/Operate/index.tsx
+++ b/ui/src/components/Operate/index.tsx
@@ -1,6 +1,6 @@
 import { memo, FC } from 'react';
 import { Button } from 'react-bootstrap';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import { Modal } from '@/components';
@@ -31,6 +31,7 @@ const Index: FC<IProps> = ({
 }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'delete' });
   const toast = useToast();
+  const navigate = useNavigate();
   const reportModal = useReportModal();
   const closeModal = useReportModal();
   const editUrl =
@@ -96,13 +97,14 @@ const Index: FC<IProps> = ({
       });
     }
   };
-  const handleEdit = async (evt) => {
+  const handleEdit = (evt, targetUrl) => {
+    evt.preventDefault();
     let checkObjectId = qid;
     if (type === 'answer') {
       checkObjectId = aid;
     }
-    editCheck(checkObjectId).catch(() => {
-      evt.preventDefault();
+    editCheck(checkObjectId).then(() => {
+      navigate(targetUrl);
     });
   };
 
@@ -133,7 +135,7 @@ const Index: FC<IProps> = ({
               key={item.action}
               to={editUrl}
               className="link-secondary p-0 fs-14 me-3"
-              onClick={handleEdit}
+              onClick={(evt) => handleEdit(evt, editUrl)}
               style={{ lineHeight: '23px' }}>
               {item.name}
             </Link>

From 1712a1ab19c08e78d06136cd183507b6036d9040 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 17:26:04 +0800
Subject: [PATCH 177/194] fix: kbd tag show as text

---
 ui/src/utils/common.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index e54f6cba..32ad2159 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -173,6 +173,8 @@ function diffText(newText: string, oldText: string): string {
   if (typeof oldText !== 'string') {
     return newText
       ?.replace(/\n/gi, '<br>')
+      ?.replace(/<kbd/gi, '&lt;kbd')
+      ?.replace(/<\/kbd>/gi, '&lt;/kbd&gt;')
       ?.replace(/<iframe/gi, '&lt;iframe')
       ?.replace(/<input/gi, '&lt;input');
   }

From 49c2c219bbf7046b98d8874119010d1395a5d3aa Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 17:31:12 +0800
Subject: [PATCH 178/194] fix: synonyms tag changed

---
 ui/src/pages/Tags/Info/index.tsx | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index c44d2b35..8171fa2d 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -189,7 +189,7 @@ const TagIntroduction = () => {
                     <div className="mb-3">
                       {t('synonyms.text')}{' '}
                       <Tag
-                        className="me-2 mb-2"
+                        className="me-2"
                         data={{
                           slug_name: tagName || '',
                           main_tag_slug_name: '',
@@ -209,15 +209,13 @@ const TagIntroduction = () => {
                 {!isEdit &&
                   (synonymsData?.synonyms &&
                   synonymsData.synonyms.length > 0 ? (
-                    synonymsData.synonyms.map((item) => {
-                      return (
-                        <Tag
-                          key={item.tag_id}
-                          className="me-2 mb-2"
-                          data={item}
-                        />
-                      );
-                    })
+                    <div className="m-n1">
+                      {synonymsData.synonyms.map((item) => {
+                        return (
+                          <Tag key={item.tag_id} className="m-2" data={item} />
+                        );
+                      })}
+                    </div>
                   ) : (
                     <>
                       <div className="text-muted mb-3">

From def1373125f4b14547896c34e84c77342b5cde15 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:03:39 +0800
Subject: [PATCH 179/194] fix question update time

---
 internal/service/revision_service.go | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 9ee20a0a..b81221e8 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -118,16 +118,25 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 }
 
 func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
-	questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfo)
+	questioninfo, ok := revisionitem.ContentParsed.(*entity.QuestionWithTagsRevision)
 	if ok {
-		now := time.Now()
+		var PostUpdateTime time.Time
+		dbquestion, exist, dberr := rs.questionRepo.GetQuestion(ctx, questioninfo.ID)
+		if dberr != nil || !exist {
+			return
+		}
+
+		PostUpdateTime = questioninfo.Question.UpdatedAt
+		if dbquestion.PostUpdateTime.Unix() > PostUpdateTime.Unix() {
+			PostUpdateTime = dbquestion.PostUpdateTime
+		}
 		question := &entity.Question{}
-		question.ID = questioninfo.ID
-		question.Title = questioninfo.Title
-		question.OriginalText = questioninfo.Content
-		question.ParsedText = questioninfo.HTML
-		question.UpdatedAt = now
-		question.PostUpdateTime = now
+		question.ID = questioninfo.Question.ID
+		question.Title = questioninfo.Question.Title
+		question.OriginalText = questioninfo.Question.OriginalText
+		question.ParsedText = questioninfo.Question.ParsedText
+		question.UpdatedAt = questioninfo.Question.UpdatedAt
+		question.PostUpdateTime = PostUpdateTime
 		question.LastEditUserID = revisionitem.UserID
 		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time", "last_edit_user_id"})
 		if saveerr != nil {

From 552be11de044563b827ff680fcc4e9ab27e342c2 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Fri, 2 Dec 2022 18:04:20 +0800
Subject: [PATCH 180/194] feat(db): Add database upgrade sql.

---
 internal/migrations/v3.go | 185 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 183 insertions(+), 2 deletions(-)

diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go
index d7e68f10..e1f95bb4 100644
--- a/internal/migrations/v3.go
+++ b/internal/migrations/v3.go
@@ -1,12 +1,176 @@
 package migrations
 
 import (
+	"fmt"
 	"time"
 
+	"github.com/answerdev/answer/internal/entity"
+	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
 )
 
-func addActivityTimeline(x *xorm.Engine) error {
+func addActivityTimeline(x *xorm.Engine) (err error) {
+	switch x.Dialect().URI().DBType {
+	case schemas.MYSQL:
+		_, err = x.Exec("ALTER TABLE `answer` CHANGE `updated_at` `updated_at` TIMESTAMP NULL DEFAULT NULL")
+		if err != nil {
+			return err
+		}
+		_, err = x.Exec("ALTER TABLE `question` CHANGE `updated_at` `updated_at` TIMESTAMP NULL DEFAULT NULL")
+		if err != nil {
+			return err
+		}
+	case schemas.POSTGRES:
+		_, err = x.Exec(`ALTER TABLE "answer" ALTER COLUMN "updated_at" DROP NOT NULL, ALTER COLUMN "updated_at" SET DEFAULT NULL`)
+		if err != nil {
+			return err
+		}
+		_, err = x.Exec(`ALTER TABLE "question" ALTER COLUMN "updated_at" DROP NOT NULL, ALTER COLUMN "updated_at" SET DEFAULT NULL`)
+		if err != nil {
+			return err
+		}
+	case schemas.SQLITE:
+		_, err = x.Exec(`DROP INDEX "IDX_answer_user_id";
+
+ALTER TABLE "answer" RENAME TO "_answer_old_v3";
+
+CREATE TABLE "answer" (
+  "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updated_at" DATETIME DEFAULT NULL,
+  "question_id" INTEGER NOT NULL DEFAULT 0,
+  "user_id" INTEGER NOT NULL DEFAULT 0,
+  "original_text" TEXT NOT NULL,
+  "parsed_text" TEXT NOT NULL,
+  "status" INTEGER NOT NULL DEFAULT 1,
+  "adopted" INTEGER NOT NULL DEFAULT 1,
+  "comment_count" INTEGER NOT NULL DEFAULT 0,
+  "vote_count" INTEGER NOT NULL DEFAULT 0,
+  "revision_id" INTEGER NOT NULL DEFAULT 0
+);
+
+INSERT INTO "answer" ("id", "created_at", "updated_at", "question_id", "user_id", "original_text", "parsed_text", "status", "adopted", "comment_count", "vote_count", "revision_id") SELECT "id", "created_at", "updated_at", "question_id", "user_id", "original_text", "parsed_text", "status", "adopted", "comment_count", "vote_count", "revision_id" FROM "_answer_old_v3";
+
+CREATE INDEX "IDX_answer_user_id"
+ON "answer" (
+  "user_id" ASC
+);
+DROP INDEX "IDX_question_user_id";
+
+ALTER TABLE "question" RENAME TO "_question_old_v3";
+
+CREATE TABLE "question" (
+  "id" INTEGER NOT NULL,
+  "created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updated_at" DATETIME DEFAULT NULL,
+  "user_id" INTEGER NOT NULL DEFAULT 0,
+  "title" TEXT NOT NULL DEFAULT '',
+  "original_text" TEXT NOT NULL,
+  "parsed_text" TEXT NOT NULL,
+  "status" INTEGER NOT NULL DEFAULT 1,
+  "view_count" INTEGER NOT NULL DEFAULT 0,
+  "unique_view_count" INTEGER NOT NULL DEFAULT 0,
+  "vote_count" INTEGER NOT NULL DEFAULT 0,
+  "answer_count" INTEGER NOT NULL DEFAULT 0,
+  "collection_count" INTEGER NOT NULL DEFAULT 0,
+  "follow_count" INTEGER NOT NULL DEFAULT 0,
+  "accepted_answer_id" INTEGER NOT NULL DEFAULT 0,
+  "last_answer_id" INTEGER NOT NULL DEFAULT 0,
+  "post_update_time" DATETIME DEFAULT CURRENT_TIMESTAMP,
+  "revision_id" INTEGER NOT NULL DEFAULT 0,
+  PRIMARY KEY ("id")
+);
+
+INSERT INTO "question" ("id", "created_at", "updated_at", "user_id", "title", "original_text", "parsed_text", "status", "view_count", "unique_view_count", "vote_count", "answer_count", "collection_count", "follow_count", "accepted_answer_id", "last_answer_id", "post_update_time", "revision_id") SELECT "id", "created_at", "updated_at", "user_id", "title", "original_text", "parsed_text", "status", "view_count", "unique_view_count", "vote_count", "answer_count", "collection_count", "follow_count", "accepted_answer_id", "last_answer_id", "post_update_time", "revision_id" FROM "_question_old_v3";
+
+CREATE INDEX "IDX_question_user_id"
+ON "question" (
+  "user_id" ASC
+);`)
+		if err != nil {
+			return err
+		}
+	}
+
+	// only increasing field length to 128
+	type Config struct {
+		Key string `xorm:"unique VARCHAR(128) key"`
+	}
+	if err := x.Sync(new(Config)); err != nil {
+		return fmt.Errorf("sync config table failed: %w", err)
+	}
+	defaultConfigTable := []*entity.Config{
+		{ID: 36, Key: "rank.question.add", Value: `1`},
+		{ID: 37, Key: "rank.question.edit", Value: `200`},
+		{ID: 38, Key: "rank.question.delete", Value: `-1`},
+		{ID: 39, Key: "rank.question.vote_up", Value: `15`},
+		{ID: 40, Key: "rank.question.vote_down", Value: `125`},
+		{ID: 41, Key: "rank.answer.add", Value: `1`},
+		{ID: 42, Key: "rank.answer.edit", Value: `200`},
+		{ID: 43, Key: "rank.answer.delete", Value: `-1`},
+		{ID: 44, Key: "rank.answer.accept", Value: `1`},
+		{ID: 45, Key: "rank.answer.vote_up", Value: `15`},
+		{ID: 46, Key: "rank.answer.vote_down", Value: `125`},
+		{ID: 47, Key: "rank.comment.add", Value: `1`},
+		{ID: 48, Key: "rank.comment.edit", Value: `-1`},
+		{ID: 49, Key: "rank.comment.delete", Value: `-1`},
+		{ID: 50, Key: "rank.report.add", Value: `1`},
+		{ID: 51, Key: "rank.tag.add", Value: `1`},
+		{ID: 52, Key: "rank.tag.edit", Value: `100`},
+		{ID: 53, Key: "rank.tag.delete", Value: `-1`},
+		{ID: 54, Key: "rank.tag.synonym", Value: `20000`},
+		{ID: 55, Key: "rank.link.url_limit", Value: `10`},
+		{ID: 56, Key: "rank.vote.detail", Value: `0`},
+
+		{ID: 87, Key: "question.asked", Value: `0`},
+		{ID: 88, Key: "question.closed", Value: `0`},
+		{ID: 89, Key: "question.reopened", Value: `0`},
+		{ID: 90, Key: "question.answered", Value: `0`},
+		{ID: 91, Key: "question.commented", Value: `0`},
+		{ID: 92, Key: "question.accept", Value: `0`},
+		{ID: 93, Key: "question.edited", Value: `0`},
+		{ID: 94, Key: "question.rollback", Value: `0`},
+		{ID: 95, Key: "question.deleted", Value: `0`},
+		{ID: 96, Key: "question.undeleted", Value: `0`},
+		{ID: 97, Key: "answer.answered", Value: `0`},
+		{ID: 98, Key: "answer.commented", Value: `0`},
+		{ID: 99, Key: "answer.edited", Value: `0`},
+		{ID: 100, Key: "answer.rollback", Value: `0`},
+		{ID: 101, Key: "answer.undeleted", Value: `0`},
+		{ID: 102, Key: "tag.created", Value: `0`},
+		{ID: 103, Key: "tag.edited", Value: `0`},
+		{ID: 104, Key: "tag.rollback", Value: `0`},
+		{ID: 105, Key: "tag.deleted", Value: `0`},
+		{ID: 106, Key: "tag.undeleted", Value: `0`},
+
+		{ID: 107, Key: "rank.comment.vote_up", Value: `1`},
+		{ID: 108, Key: "rank.comment.vote_down", Value: `1`},
+		{ID: 109, Key: "rank.question.edit_without_review", Value: `2000`},
+		{ID: 110, Key: "rank.answer.edit_without_review", Value: `2000`},
+		{ID: 111, Key: "rank.tag.edit_without_review", Value: `20000`},
+		{ID: 112, Key: "rank.answer.audit", Value: `2000`},
+		{ID: 113, Key: "rank.question.audit", Value: `2000`},
+		{ID: 114, Key: "rank.tag.audit", Value: `20000`},
+	}
+	for _, c := range defaultConfigTable {
+		exist, err := x.Get(&entity.Config{ID: c.ID, Key: c.Key})
+		if err != nil {
+			return fmt.Errorf("get config failed: %w", err)
+		}
+		if exist {
+			if _, err = x.Update(c, &entity.Config{ID: c.ID, Key: c.Key}); err != nil {
+				log.Errorf("update %+v config failed: %s", c, err)
+				return fmt.Errorf("update config failed: %w", err)
+			}
+			continue
+		}
+		if _, err = x.Insert(&entity.Config{ID: c.ID, Key: c.Key, Value: c.Value}); err != nil {
+			log.Errorf("insert %+v config failed: %s", c, err)
+			return fmt.Errorf("add config failed: %w", err)
+		}
+	}
+
 	type Revision struct {
 		ReviewUserID int64 `xorm:"not null default 0 BIGINT(20) review_user_id"`
 	}
@@ -15,5 +179,22 @@ func addActivityTimeline(x *xorm.Engine) error {
 		RevisionID       int64     `xorm:"not null default 0 BIGINT(20) revision_id"`
 		OriginalObjectID string    `xorm:"not null default 0 BIGINT(20) original_object_id"`
 	}
-	return x.Sync(new(Activity), new(Revision))
+	type Tag struct {
+		UserID string `xorm:"not null default 0 BIGINT(20) user_id"`
+	}
+	type Question struct {
+		UpdatedAt      time.Time `xorm:"updated_at TIMESTAMP"`
+		LastEditUserID string    `xorm:"not null default 0 BIGINT(20) last_edit_user_id"`
+		PostUpdateTime time.Time `xorm:"post_update_time TIMESTAMP"`
+	}
+	type Answer struct {
+		UpdatedAt      time.Time `xorm:"updated_at TIMESTAMP"`
+		LastEditUserID string    `xorm:"not null default 0 BIGINT(20) last_edit_user_id"`
+	}
+
+	err = x.Sync(new(Activity), new(Revision), new(Tag), new(Question), new(Answer))
+	if err != nil {
+		return fmt.Errorf("sync table failed %w", err)
+	}
+	return nil
 }

From 4c60c5e9842801461e066e5c664a04586ca544e4 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 2 Dec 2022 18:10:28 +0800
Subject: [PATCH 181/194] fix: synonyms tag style adjustment

---
 ui/src/pages/Tags/Info/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index 8171fa2d..fbbbecd1 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -189,7 +189,6 @@ const TagIntroduction = () => {
                     <div className="mb-3">
                       {t('synonyms.text')}{' '}
                       <Tag
-                        className="me-2"
                         data={{
                           slug_name: tagName || '',
                           main_tag_slug_name: '',
@@ -212,7 +211,7 @@ const TagIntroduction = () => {
                     <div className="m-n1">
                       {synonymsData.synonyms.map((item) => {
                         return (
-                          <Tag key={item.tag_id} className="m-2" data={item} />
+                          <Tag key={item.tag_id} className="m-1" data={item} />
                         );
                       })}
                     </div>

From c99683f79eb01c4b9439bc870cfb975b43bf394d Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:54:05 +0800
Subject: [PATCH 182/194] fix qustion update time

---
 internal/service/revision_service.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index b81221e8..b5709c52 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -118,7 +118,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 }
 
 func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
-	questioninfo, ok := revisionitem.ContentParsed.(*entity.QuestionWithTagsRevision)
+	questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfo)
 	if ok {
 		var PostUpdateTime time.Time
 		dbquestion, exist, dberr := rs.questionRepo.GetQuestion(ctx, questioninfo.ID)
@@ -126,16 +126,16 @@ func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionit
 			return
 		}
 
-		PostUpdateTime = questioninfo.Question.UpdatedAt
+		PostUpdateTime = time.Unix(questioninfo.UpdateTime, 0)
 		if dbquestion.PostUpdateTime.Unix() > PostUpdateTime.Unix() {
 			PostUpdateTime = dbquestion.PostUpdateTime
 		}
 		question := &entity.Question{}
-		question.ID = questioninfo.Question.ID
-		question.Title = questioninfo.Question.Title
-		question.OriginalText = questioninfo.Question.OriginalText
-		question.ParsedText = questioninfo.Question.ParsedText
-		question.UpdatedAt = questioninfo.Question.UpdatedAt
+		question.ID = questioninfo.ID
+		question.Title = questioninfo.Title
+		question.OriginalText = questioninfo.Content
+		question.ParsedText = questioninfo.HTML
+		question.UpdatedAt = time.Unix(questioninfo.UpdateTime, 0)
 		question.PostUpdateTime = PostUpdateTime
 		question.LastEditUserID = revisionitem.UserID
 		saveerr := rs.questionRepo.UpdateQuestion(ctx, question, []string{"title", "original_text", "parsed_text", "updated_at", "post_update_time", "last_edit_user_id"})

From 85c59c27d4813fa83e8860e3f6ca3d174fc4e8b0 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Mon, 5 Dec 2022 10:33:11 +0800
Subject: [PATCH 183/194] fix(tag): only use slugName in tagUrl

---
 ui/src/router/pathFactory.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.ts
index 6d2725ce..8c98cfa3 100644
--- a/ui/src/router/pathFactory.ts
+++ b/ui/src/router/pathFactory.ts
@@ -1,7 +1,7 @@
 import type * as Type from '@/common/interface';
 
 const tagLanding = (tag: Type.Tag) => {
-  let slugName = tag.main_tag_slug_name || tag.slug_name || '';
+  let slugName = tag.slug_name || '';
   slugName = slugName.toLowerCase();
   return `/tags/${encodeURIComponent(slugName)}`;
 };

From d65f976009efbcac925f39ae39c325f9a7b3664f Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Mon, 5 Dec 2022 12:36:32 +0800
Subject: [PATCH 184/194] fix answer update time

---
 internal/service/revision_service.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index b5709c52..fe0e9eb6 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -169,12 +169,11 @@ func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionit
 func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
 	answerinfo, ok := revisionitem.ContentParsed.(*schema.AnswerInfo)
 	if ok {
-		now := time.Now()
 		insertData := new(entity.Answer)
 		insertData.ID = answerinfo.ID
 		insertData.OriginalText = answerinfo.Content
 		insertData.ParsedText = answerinfo.HTML
-		insertData.UpdatedAt = now
+		insertData.UpdatedAt = time.Unix(answerinfo.UpdateTime, 0)
 		insertData.LastEditUserID = revisionitem.UserID
 		saveerr := rs.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "updated_at", "last_edit_user_id"})
 		if saveerr != nil {

From 8f53748ccf09b0e00aee57e4239a0003abe3c8c3 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:18:34 +0800
Subject: [PATCH 185/194] fix answer update time

---
 internal/service/question_common/question.go | 6 ++++++
 internal/service/revision_service.go         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 045b979d..3be2c3f9 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -115,6 +115,12 @@ func (qs *QuestionCommon) UpdataPostTime(ctx context.Context, questionID string)
 	questioninfo.PostUpdateTime = now
 	return qs.questionRepo.UpdateQuestion(ctx, questioninfo, []string{"post_update_time"})
 }
+func (qs *QuestionCommon) UpdataPostSetTime(ctx context.Context, questionID string, setTime time.Time) error {
+	questioninfo := &entity.Question{}
+	questioninfo.ID = questionID
+	questioninfo.PostUpdateTime = setTime
+	return qs.questionRepo.UpdateQuestion(ctx, questioninfo, []string{"post_update_time"})
+}
 
 func (qs *QuestionCommon) FindInfoByID(ctx context.Context, questionIDs []string, loginUserID string) (map[string]*schema.QuestionInfo, error) {
 	list := make(map[string]*schema.QuestionInfo)
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index fe0e9eb6..e53301b2 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -179,7 +179,7 @@ func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem
 		if saveerr != nil {
 			return saveerr
 		}
-		saveerr = rs.questionCommon.UpdataPostTime(ctx, answerinfo.QuestionID)
+		saveerr = rs.questionCommon.UpdataPostSetTime(ctx, answerinfo.QuestionID, time.Unix(answerinfo.UpdateTime, 0))
 		if saveerr != nil {
 			return saveerr
 		}

From 757f073458a2912f41fa533026049045be902c6a Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Mon, 5 Dec 2022 17:22:00 +0800
Subject: [PATCH 186/194] fix answer PostUpdateTime

---
 internal/service/revision_service.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index e53301b2..4dfbcbcb 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -169,6 +169,18 @@ func (rs *RevisionService) revisionAuditQuestion(ctx context.Context, revisionit
 func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem *schema.GetRevisionResp) (err error) {
 	answerinfo, ok := revisionitem.ContentParsed.(*schema.AnswerInfo)
 	if ok {
+
+		var PostUpdateTime time.Time
+		dbquestion, exist, dberr := rs.questionRepo.GetQuestion(ctx, answerinfo.QuestionID)
+		if dberr != nil || !exist {
+			return
+		}
+
+		PostUpdateTime = time.Unix(answerinfo.UpdateTime, 0)
+		if dbquestion.PostUpdateTime.Unix() > PostUpdateTime.Unix() {
+			PostUpdateTime = dbquestion.PostUpdateTime
+		}
+
 		insertData := new(entity.Answer)
 		insertData.ID = answerinfo.ID
 		insertData.OriginalText = answerinfo.Content
@@ -179,7 +191,7 @@ func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem
 		if saveerr != nil {
 			return saveerr
 		}
-		saveerr = rs.questionCommon.UpdataPostSetTime(ctx, answerinfo.QuestionID, time.Unix(answerinfo.UpdateTime, 0))
+		saveerr = rs.questionCommon.UpdataPostSetTime(ctx, answerinfo.QuestionID, PostUpdateTime)
 		if saveerr != nil {
 			return saveerr
 		}

From 3a15520d3ceb2fa299fa1f22401cfa6b11cb1658 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 6 Dec 2022 12:00:55 +0800
Subject: [PATCH 187/194] docs(makefile): upgrade 0.5.0

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fcbdf2ba..3c0b6a40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build clean ui
 
-VERSION=0.4.0
+VERSION=0.5.0
 BIN=answer
 DIR_SRC=./cmd/answer
 DOCKER_CMD=docker
@@ -38,7 +38,6 @@ install-ui-packages:
 	@corepack prepare pnpm@v7.12.2 --activate
 
 ui:
-	@npm config set registry https://repo.huaweicloud.com/repository/npm/
 	@cd ui && pnpm install && pnpm build && cd -
 
 all: clean build

From de429a452181c449e795c5a99bb5e44a53708209 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 6 Dec 2022 14:32:44 +0800
Subject: [PATCH 188/194] add revision userid

---
 internal/entity/revision_entity.go      | 2 +-
 internal/repo/revision/revision_repo.go | 5 +++--
 internal/service/revision/revision.go   | 2 +-
 internal/service/revision_service.go    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index 46bfd228..b59e7ee5 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -25,7 +25,7 @@ type Revision struct {
 	Content      string    `xorm:"not null TEXT content"`
 	Log          string    `xorm:"VARCHAR(255) log"`
 	Status       int       `xorm:"not null default 1 INT(11) status"`
-	ReviewUserID int64     `xorm:"not null default 0 BIGINT(20) review_user_id"`
+	ReviewUserID string    `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
 // TableName revision table name
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index 1d5a276f..1c6bca45 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -81,14 +81,15 @@ func (rr *revisionRepo) UpdateObjectRevisionId(ctx context.Context, revision *en
 }
 
 // UpdateStatus update revision status
-func (rr *revisionRepo) UpdateStatus(ctx context.Context, id string, status int) (err error) {
+func (rr *revisionRepo) UpdateStatus(ctx context.Context, id string, status int, reviewUserID string) (err error) {
 	if id == "" {
 		return nil
 	}
 	var data entity.Revision
 	data.ID = id
 	data.Status = status
-	_, err = rr.data.DB.Where("id =?", id).Cols("status").Update(&data)
+	data.ReviewUserID = reviewUserID
+	_, err = rr.data.DB.Where("id =?", id).Cols("status", "review_user_id").Update(&data)
 	if err != nil {
 		return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index f368a27b..7ee32698 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -16,5 +16,5 @@ type RevisionRepo interface {
 	UpdateObjectRevisionId(ctx context.Context, revision *entity.Revision, session *xorm.Session) (err error)
 	ExistUnreviewedByObjectID(ctx context.Context, objectID string) (revision *entity.Revision, exist bool, err error)
 	GetUnreviewedRevisionPage(ctx context.Context, page, pageSize int, objectTypes []int) ([]*entity.Revision, int64, error)
-	UpdateStatus(ctx context.Context, id string, status int) (err error)
+	UpdateStatus(ctx context.Context, id string, status int, reviewUserID string) (err error)
 }
diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go
index 4dfbcbcb..84624cea 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -75,7 +75,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		return
 	}
 	if req.Operation == schema.RevisionAuditReject {
-		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus)
+		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewRejectStatus, req.UserID)
 		return
 	}
 	if req.Operation == schema.RevisionAuditApprove {
@@ -110,7 +110,7 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 		if saveErr != nil {
 			return saveErr
 		}
-		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus)
+		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus, req.UserID)
 		return
 	}
 

From 90ef591cb52c105fd518cad482211e6fa643da75 Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 6 Dec 2022 14:34:22 +0800
Subject: [PATCH 189/194] fix(admin/user): comment out user role for now

---
 ui/src/pages/Admin/Users/index.tsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index 89b92bd4..3e7ef853 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -22,7 +22,7 @@ import '../index.scss';
 
 const UserFilterKeys: Type.UserFilterBy[] = [
   'all',
-  'staff',
+  // 'staff',
   'inactive',
   'suspended',
   'deleted',
@@ -131,7 +131,7 @@ const Users: FC = () => {
             )}
 
             <th style={{ width: '12%' }}>{t('status')}</th>
-            <th style={{ width: '12%' }}>{t('role')}</th>
+            {/* <th style={{ width: '12%' }}>{t('role')}</th> */}
             {curFilter !== 'deleted' ? (
               <th style={{ width: '8%' }} className="text-end">
                 {t('action')}
@@ -173,11 +173,11 @@ const Users: FC = () => {
                     {t(user.status)}
                   </span>
                 </td>
-                <td>
-                  <span className="badge text-bg-light">
-                    {t(user.role_name)}
-                  </span>
-                </td>
+                {/* <td> */}
+                {/*  <span className="badge text-bg-light"> */}
+                {/*    {t(user.role_name)} */}
+                {/*  </span> */}
+                {/* </td> */}
                 {curFilter !== 'deleted' ? (
                   <td className="text-end">
                     <Dropdown>
@@ -190,10 +190,10 @@ const Users: FC = () => {
                           onClick={() => handleAction('status', user)}>
                           {t('change_status')}
                         </Dropdown.Item>
-                        <Dropdown.Item
-                          onClick={() => handleAction('role', user)}>
-                          {t('change_role')}
-                        </Dropdown.Item>
+                        {/* <Dropdown.Item */}
+                        {/*  onClick={() => handleAction('role', user)}> */}
+                        {/*  {t('change_role')} */}
+                        {/* </Dropdown.Item> */}
                         {/* <Dropdown.Divider />
                         <Dropdown.Item>{t('show_logs')}</Dropdown.Item> */}
                       </Dropdown.Menu>

From 4c838fccfe6673dce733f58e8fcd5216e00279a7 Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Tue, 6 Dec 2022 14:36:37 +0800
Subject: [PATCH 190/194] fix revision userid to int64

---
 internal/entity/revision_entity.go      | 2 +-
 internal/repo/revision/revision_repo.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal/entity/revision_entity.go b/internal/entity/revision_entity.go
index b59e7ee5..46bfd228 100644
--- a/internal/entity/revision_entity.go
+++ b/internal/entity/revision_entity.go
@@ -25,7 +25,7 @@ type Revision struct {
 	Content      string    `xorm:"not null TEXT content"`
 	Log          string    `xorm:"VARCHAR(255) log"`
 	Status       int       `xorm:"not null default 1 INT(11) status"`
-	ReviewUserID string    `xorm:"not null default 0 BIGINT(20) review_user_id"`
+	ReviewUserID int64     `xorm:"not null default 0 BIGINT(20) review_user_id"`
 }
 
 // TableName revision table name
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index 1c6bca45..813be967 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -10,6 +10,7 @@ import (
 	"github.com/answerdev/answer/internal/entity"
 	"github.com/answerdev/answer/internal/service/revision"
 	"github.com/answerdev/answer/internal/service/unique"
+	"github.com/answerdev/answer/pkg/converter"
 	"github.com/answerdev/answer/pkg/obj"
 	"github.com/segmentfault/pacman/errors"
 	"xorm.io/builder"
@@ -88,7 +89,7 @@ func (rr *revisionRepo) UpdateStatus(ctx context.Context, id string, status int,
 	var data entity.Revision
 	data.ID = id
 	data.Status = status
-	data.ReviewUserID = reviewUserID
+	data.ReviewUserID = converter.StringToInt64(reviewUserID)
 	_, err = rr.data.DB.Where("id =?", id).Cols("status", "review_user_id").Update(&data)
 	if err != nil {
 		return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()

From a6630670be4c13fb8eb37fe53e495c379296dca0 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 6 Dec 2022 14:45:29 +0800
Subject: [PATCH 191/194] fix(rank): Incorrect permission verification

user can update answer that put by himself.
admin can vote up anyway.
---
 internal/controller/answer_controller.go | 2 +-
 internal/service/rank/rank_service.go    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 53deb265..2b91d779 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -161,7 +161,7 @@ func (ac *AnswerController) Update(ctx *gin.Context) {
 	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
 		rank.AnswerEditRank,
 		rank.AnswerEditWithoutReviewRank,
-	}, "")
+	}, req.ID)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
 		return
diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go
index 22bae247..88db3347 100644
--- a/internal/service/rank/rank_service.go
+++ b/internal/service/rank/rank_service.go
@@ -170,6 +170,10 @@ func (rs *RankService) CheckVotePermission(ctx context.Context, userID, objectID
 	if !exist {
 		return can, nil
 	}
+	// administrator have all permissions
+	if userInfo.IsAdmin {
+		return true, nil
+	}
 
 	objectInfo, err := rs.objectInfoService.GetInfo(ctx, objectID)
 	if err != nil {

From d0393e8df1b57515dc0b4b01f61a0990a2484375 Mon Sep 17 00:00:00 2001
From: LinkinStar <linkinstar@foxmail.com>
Date: Tue, 6 Dec 2022 14:53:56 +0800
Subject: [PATCH 192/194] docs(i18n): Additional Chinese translation

---
 i18n/zh_CN.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index 1493e29e..413dc19f 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -73,6 +73,14 @@ backend:
     tag:
       not_found:
         other: "标签未找到"
+      recommend_tag_not_found:
+        other: "推荐标签不存在"
+      recommend_tag_enter:
+        other: "请输入至少一个必需的标签。"
+      not_contain_synonym_tags:
+        other: "不应包含同义词标签。"
+      cannot_update:
+        other: "没有更新标签权限。"
     theme:
       not_found:
         other: "主题未找到"
@@ -89,6 +97,11 @@ backend:
         other: "用户名已被使用"
       set_avatar:
         other: "头像设置错误"
+    revision:
+      review_underway:
+        other: "目前无法编辑，有一个版本在审阅队列中。"
+      no_permission:
+        other: "无权限修改"
 
   report:
     spam:

From adbf71434c6b26f98e1203f47d004749a8f92e0d Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 6 Dec 2022 15:16:57 +0800
Subject: [PATCH 193/194] fix(settings/account): invalid group specifier name
 in safari

---
 .../Settings/Account/components/ModifyEmail/index.tsx     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
index 56ba7cb0..6e597771 100644
--- a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
+++ b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
@@ -7,8 +7,6 @@ import { useToast } from '@/hooks';
 import { getLoggedUserInfo, changeEmail } from '@/services';
 import { handleFormError } from '@/utils';
 
-const reg = /(?<=.{2}).+(?=@)/gi;
-
 const Index: FC = () => {
   const { t } = useTranslation('translation', {
     keyPrefix: 'settings.account',
@@ -25,6 +23,7 @@ const Index: FC = () => {
   const toast = useToast();
   useEffect(() => {
     getLoggedUserInfo().then((resp) => {
+      resp.e_mail = 'haa@sifou.com';
       setUserInfo(resp);
     });
   }, []);
@@ -91,7 +90,10 @@ const Index: FC = () => {
             <Form.Control
               type="text"
               disabled
-              defaultValue={userInfo?.e_mail?.replace(reg, () => '*'.repeat(4))}
+              defaultValue={userInfo?.e_mail?.replace(
+                /(.{2})(.+)(@.+)/i,
+                '$1****$3',
+              )}
             />
           </Form.Group>
 

From c9f5da63ae7d6cefb5f546d642d8edf5867d872f Mon Sep 17 00:00:00 2001
From: "haitao(lj)" <haitao@sifou.com>
Date: Tue, 6 Dec 2022 15:47:31 +0800
Subject: [PATCH 194/194] fix(settings/account): remove debug code

---
 .../Users/Settings/Account/components/ModifyEmail/index.tsx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
index 6e597771..1a7c13ed 100644
--- a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
+++ b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
@@ -23,7 +23,6 @@ const Index: FC = () => {
   const toast = useToast();
   useEffect(() => {
     getLoggedUserInfo().then((resp) => {
-      resp.e_mail = 'haa@sifou.com';
       setUserInfo(resp);
     });
   }, []);