From 8c7bf405088d1626f979d463ea41655f06cf1326 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 19 Feb 2024 15:13:59 +0800
Subject: [PATCH 001/114] fix: timezone text format

---
 i18n/en_US.yaml                               |   1 +
 ui/src/common/constants.ts                    | 116 +++++++++---------
 .../components/AnswerLinks/index.tsx          |  16 +--
 .../pages/Users/Settings/Interface/index.tsx  |   3 +-
 4 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index e155edff..785cc3ed 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1433,6 +1433,7 @@ ui:
       github: GitHub
       blog: Blog
       contact: Contact
+      forum: Forum
       documents: Documents
       feedback: Feedback
       support: Support
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 373e41d2..4af16945 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -128,7 +128,7 @@ export const TIMEZONES = [
     options: [
       { value: 'Africa/Abidjan', label: 'Abidjan' },
       { value: 'Africa/Accra', label: 'Accra' },
-      { value: 'Africa/Addis_Ababa', label: 'Addis Ababa' },
+      { value: 'Africa/Addis Ababa', label: 'Addis Ababa' },
       { value: 'Africa/Algiers', label: 'Algiers' },
       { value: 'Africa/Asmara', label: 'Asmara' },
       { value: 'Africa/Bamako', label: 'Bamako' },
@@ -143,10 +143,10 @@ export const TIMEZONES = [
       { value: 'Africa/Ceuta', label: 'Ceuta' },
       { value: 'Africa/Conakry', label: 'Conakry' },
       { value: 'Africa/Dakar', label: 'Dakar' },
-      { value: 'Africa/Dar_es_Salaam', label: 'Dar es Salaam' },
+      { value: 'Africa/Dar es Salaam', label: 'Dar es Salaam' },
       { value: 'Africa/Djibouti', label: 'Djibouti' },
       { value: 'Africa/Douala', label: 'Douala' },
-      { value: 'Africa/El_Aaiun', label: 'El Aaiun' },
+      { value: 'Africa/El Aaiun', label: 'El Aaiun' },
       { value: 'Africa/Freetown', label: 'Freetown' },
       { value: 'Africa/Gaborone', label: 'Gaborone' },
       { value: 'Africa/Harare', label: 'Harare' },
@@ -174,7 +174,7 @@ export const TIMEZONES = [
       { value: 'Africa/Nouakchott', label: 'Nouakchott' },
       { value: 'Africa/Ouagadougou', label: 'Ouagadougou' },
       { value: 'Africa/Porto-Novo', label: 'Porto-Novo' },
-      { value: 'Africa/Sao_Tome', label: 'Sao Tome' },
+      { value: 'Africa/Sao Tome', label: 'Sao Tome' },
       { value: 'Africa/Tripoli', label: 'Tripoli' },
       { value: 'Africa/Tunis', label: 'Tunis' },
       { value: 'Africa/Windhoek', label: 'Windhoek' },
@@ -189,62 +189,62 @@ export const TIMEZONES = [
       { value: 'America/Antigua', label: 'Antigua' },
       { value: 'America/Araguaina', label: 'Araguaina' },
       {
-        value: 'America/Argentina/Buenos_Aires',
+        value: 'America/Argentina/Buenos Aires',
         label: 'Argentina - Buenos Aires',
       },
       { value: 'America/Argentina/Catamarca', label: 'Argentina - Catamarca' },
       { value: 'America/Argentina/Cordoba', label: 'Argentina - Cordoba' },
       { value: 'America/Argentina/Jujuy', label: 'Argentina - Jujuy' },
-      { value: 'America/Argentina/La_Rioja', label: 'Argentina - La Rioja' },
+      { value: 'America/Argentina/La Rioja', label: 'Argentina - La Rioja' },
       { value: 'America/Argentina/Mendoza', label: 'Argentina - Mendoza' },
       {
-        value: 'America/Argentina/Rio_Gallegos',
+        value: 'America/Argentina/Rio Gallegos',
         label: 'Argentina - Rio Gallegos',
       },
       { value: 'America/Argentina/Salta', label: 'Argentina - Salta' },
-      { value: 'America/Argentina/San_Juan', label: 'Argentina - San Juan' },
-      { value: 'America/Argentina/San_Luis', label: 'Argentina - San Luis' },
+      { value: 'America/Argentina/San Juan', label: 'Argentina - San Juan' },
+      { value: 'America/Argentina/San Luis', label: 'Argentina - San Luis' },
       { value: 'America/Argentina/Tucuman', label: 'Argentina - Tucuman' },
       { value: 'America/Argentina/Ushuaia', label: 'Argentina - Ushuaia' },
       { value: 'America/Aruba', label: 'Aruba' },
       { value: 'America/Asuncion', label: 'Asuncion' },
       { value: 'America/Atikokan', label: 'Atikokan' },
       { value: 'America/Bahia', label: 'Bahia' },
-      { value: 'America/Bahia_Banderas', label: 'Bahia Banderas' },
+      { value: 'America/Bahia Banderas', label: 'Bahia Banderas' },
       { value: 'America/Barbados', label: 'Barbados' },
       { value: 'America/Belem', label: 'Belem' },
       { value: 'America/Belize', label: 'Belize' },
       { value: 'America/Blanc-Sablon', label: 'Blanc-Sablon' },
-      { value: 'America/Boa_Vista', label: 'Boa Vista' },
+      { value: 'America/Boa Vista', label: 'Boa Vista' },
       { value: 'America/Bogota', label: 'Bogota' },
       { value: 'America/Boise', label: 'Boise' },
-      { value: 'America/Cambridge_Bay', label: 'Cambridge Bay' },
-      { value: 'America/Campo_Grande', label: 'Campo Grande' },
+      { value: 'America/Cambridge Bay', label: 'Cambridge Bay' },
+      { value: 'America/Campo Grande', label: 'Campo Grande' },
       { value: 'America/Cancun', label: 'Cancun' },
       { value: 'America/Caracas', label: 'Caracas' },
       { value: 'America/Cayenne', label: 'Cayenne' },
       { value: 'America/Cayman', label: 'Cayman' },
       { value: 'America/Chicago', label: 'Chicago' },
       { value: 'America/Chihuahua', label: 'Chihuahua' },
-      { value: 'America/Costa_Rica', label: 'Costa Rica' },
+      { value: 'America/Costa Rica', label: 'Costa Rica' },
       { value: 'America/Creston', label: 'Creston' },
       { value: 'America/Cuiaba', label: 'Cuiaba' },
       { value: 'America/Curacao', label: 'Curacao' },
       { value: 'America/Danmarkshavn', label: 'Danmarkshavn' },
       { value: 'America/Dawson', label: 'Dawson' },
-      { value: 'America/Dawson_Creek', label: 'Dawson Creek' },
+      { value: 'America/Dawson Creek', label: 'Dawson Creek' },
       { value: 'America/Denver', label: 'Denver' },
       { value: 'America/Detroit', label: 'Detroit' },
       { value: 'America/Dominica', label: 'Dominica' },
       { value: 'America/Edmonton', label: 'Edmonton' },
       { value: 'America/Eirunepe', label: 'Eirunepe' },
-      { value: 'America/El_Salvador', label: 'El Salvador' },
-      { value: 'America/Fort_Nelson', label: 'Fort Nelson' },
+      { value: 'America/El Salvador', label: 'El Salvador' },
+      { value: 'America/Fort Nelson', label: 'Fort Nelson' },
       { value: 'America/Fortaleza', label: 'Fortaleza' },
-      { value: 'America/Glace_Bay', label: 'Glace Bay' },
+      { value: 'America/Glace Bay', label: 'Glace Bay' },
       { value: 'America/Godthab', label: 'Godthab' },
-      { value: 'America/Goose_Bay', label: 'Goose Bay' },
-      { value: 'America/Grand_Turk', label: 'Grand Turk' },
+      { value: 'America/Goose Bay', label: 'Goose Bay' },
+      { value: 'America/Grand Turk', label: 'Grand Turk' },
       { value: 'America/Grenada', label: 'Grenada' },
       { value: 'America/Guadeloupe', label: 'Guadeloupe' },
       { value: 'America/Guatemala', label: 'Guatemala' },
@@ -260,7 +260,7 @@ export const TIMEZONES = [
       { value: 'America/Indiana/Knox', label: 'Indiana - Knox' },
       { value: 'America/Indiana/Marengo', label: 'Indiana - Marengo' },
       { value: 'America/Indiana/Petersburg', label: 'Indiana - Petersburg' },
-      { value: 'America/Indiana/Tell_City', label: 'Indiana - Tell City' },
+      { value: 'America/Indiana/Tell City', label: 'Indiana - Tell City' },
       { value: 'America/Indiana/Vevay', label: 'Indiana - Vevay' },
       { value: 'America/Indiana/Vincennes', label: 'Indiana - Vincennes' },
       { value: 'America/Indiana/Winamac', label: 'Indiana - Winamac' },
@@ -271,10 +271,10 @@ export const TIMEZONES = [
       { value: 'America/Kentucky/Louisville', label: 'Kentucky - Louisville' },
       { value: 'America/Kentucky/Monticello', label: 'Kentucky - Monticello' },
       { value: 'America/Kralendijk', label: 'Kralendijk' },
-      { value: 'America/La_Paz', label: 'La Paz' },
+      { value: 'America/La Paz', label: 'La Paz' },
       { value: 'America/Lima', label: 'Lima' },
-      { value: 'America/Los_Angeles', label: 'Los Angeles' },
-      { value: 'America/Lower_Princes', label: 'Lower Princes' },
+      { value: 'America/Los Angeles', label: 'Los Angeles' },
+      { value: 'America/Lower Princes', label: 'Lower Princes' },
       { value: 'America/Maceio', label: 'Maceio' },
       { value: 'America/Managua', label: 'Managua' },
       { value: 'America/Manaus', label: 'Manaus' },
@@ -288,14 +288,14 @@ export const TIMEZONES = [
       { value: 'America/Montevideo', label: 'Montevideo' },
       { value: 'America/Montserrat', label: 'Montserrat' },
       { value: 'America/Nassau', label: 'Nassau' },
-      { value: 'America/New_York', label: 'New York' },
+      { value: 'America/New York', label: 'New York' },
       { value: 'America/Nipigon', label: 'Nipigon' },
       { value: 'America/Nome', label: 'Nome' },
       { value: 'America/Noronha', label: 'Noronha' },
-      { value: 'America/North_Dakota/Beulah', label: 'North Dakota - Beulah' },
-      { value: 'America/North_Dakota/Center', label: 'North Dakota - Center' },
+      { value: 'America/North Dakota/Beulah', label: 'North Dakota - Beulah' },
+      { value: 'America/North Dakota/Center', label: 'North Dakota - Center' },
       {
-        value: 'America/North_Dakota/New_Salem',
+        value: 'America/North Dakota/New Salem',
         label: 'North Dakota - New Salem',
       },
       { value: 'America/Ojinaga', label: 'Ojinaga' },
@@ -304,32 +304,32 @@ export const TIMEZONES = [
       { value: 'America/Paramaribo', label: 'Paramaribo' },
       { value: 'America/Phoenix', label: 'Phoenix' },
       { value: 'America/Port-au-Prince', label: 'Port-au-Prince' },
-      { value: 'America/Port_of_Spain', label: 'Port of Spain' },
-      { value: 'America/Porto_Velho', label: 'Porto Velho' },
-      { value: 'America/Puerto_Rico', label: 'Puerto Rico' },
-      { value: 'America/Punta_Arenas', label: 'Punta Arenas' },
-      { value: 'America/Rainy_River', label: 'Rainy River' },
-      { value: 'America/Rankin_Inlet', label: 'Rankin Inlet' },
+      { value: 'America/Port of Spain', label: 'Port of Spain' },
+      { value: 'America/Porto Velho', label: 'Porto Velho' },
+      { value: 'America/Puerto Rico', label: 'Puerto Rico' },
+      { value: 'America/Punta Arenas', label: 'Punta Arenas' },
+      { value: 'America/Rainy River', label: 'Rainy River' },
+      { value: 'America/Rankin Inlet', label: 'Rankin Inlet' },
       { value: 'America/Recife', label: 'Recife' },
       { value: 'America/Regina', label: 'Regina' },
       { value: 'America/Resolute', label: 'Resolute' },
-      { value: 'America/Rio_Branco', label: 'Rio Branco' },
+      { value: 'America/Rio Branco', label: 'Rio Branco' },
       { value: 'America/Santarem', label: 'Santarem' },
       { value: 'America/Santiago', label: 'Santiago' },
-      { value: 'America/Santo_Domingo', label: 'Santo Domingo' },
-      { value: 'America/Sao_Paulo', label: 'Sao Paulo' },
+      { value: 'America/Santo Domingo', label: 'Santo Domingo' },
+      { value: 'America/Sao Paulo', label: 'Sao Paulo' },
       { value: 'America/Scoresbysund', label: 'Scoresbysund' },
       { value: 'America/Sitka', label: 'Sitka' },
-      { value: 'America/St_Barthelemy', label: 'St Barthelemy' },
-      { value: 'America/St_Johns', label: 'St Johns' },
-      { value: 'America/St_Kitts', label: 'St Kitts' },
-      { value: 'America/St_Lucia', label: 'St Lucia' },
-      { value: 'America/St_Thomas', label: 'St Thomas' },
-      { value: 'America/St_Vincent', label: 'St Vincent' },
-      { value: 'America/Swift_Current', label: 'Swift Current' },
+      { value: 'America/St Barthelemy', label: 'St Barthelemy' },
+      { value: 'America/St Johns', label: 'St Johns' },
+      { value: 'America/St Kitts', label: 'St Kitts' },
+      { value: 'America/St Lucia', label: 'St Lucia' },
+      { value: 'America/St Thomas', label: 'St Thomas' },
+      { value: 'America/St Vincent', label: 'St Vincent' },
+      { value: 'America/Swift Current', label: 'Swift Current' },
       { value: 'America/Tegucigalpa', label: 'Tegucigalpa' },
       { value: 'America/Thule', label: 'Thule' },
-      { value: 'America/Thunder_Bay', label: 'Thunder Bay' },
+      { value: 'America/Thunder Bay', label: 'Thunder Bay' },
       { value: 'America/Tijuana', label: 'Tijuana' },
       { value: 'America/Toronto', label: 'Toronto' },
       { value: 'America/Tortola', label: 'Tortola' },
@@ -390,8 +390,8 @@ export const TIMEZONES = [
       { value: 'Asia/Famagusta', label: 'Famagusta' },
       { value: 'Asia/Gaza', label: 'Gaza' },
       { value: 'Asia/Hebron', label: 'Hebron' },
-      { value: 'Asia/Ho_Chi_Minh', label: 'Ho Chi Minh' },
-      { value: 'Asia/Hong_Kong', label: 'Hong Kong' },
+      { value: 'Asia/Ho Chi Minh', label: 'Ho Chi Minh' },
+      { value: 'Asia/Hong Kong', label: 'Hong Kong' },
       { value: 'Asia/Hovd', label: 'Hovd' },
       { value: 'Asia/Irkutsk', label: 'Irkutsk' },
       { value: 'Asia/Jakarta', label: 'Jakarta' },
@@ -404,7 +404,7 @@ export const TIMEZONES = [
       { value: 'Asia/Khandyga', label: 'Khandyga' },
       { value: 'Asia/Kolkata', label: 'Kolkata' },
       { value: 'Asia/Krasnoyarsk', label: 'Krasnoyarsk' },
-      { value: 'Asia/Kuala_Lumpur', label: 'Kuala Lumpur' },
+      { value: 'Asia/Kuala Lumpur', label: 'Kuala Lumpur' },
       { value: 'Asia/Kuching', label: 'Kuching' },
       { value: 'Asia/Kuwait', label: 'Kuwait' },
       { value: 'Asia/Macau', label: 'Macau' },
@@ -417,7 +417,7 @@ export const TIMEZONES = [
       { value: 'Asia/Novosibirsk', label: 'Novosibirsk' },
       { value: 'Asia/Omsk', label: 'Omsk' },
       { value: 'Asia/Oral', label: 'Oral' },
-      { value: 'Asia/Phnom_Penh', label: 'Phnom Penh' },
+      { value: 'Asia/Phnom Penh', label: 'Phnom Penh' },
       { value: 'Asia/Pontianak', label: 'Pontianak' },
       { value: 'Asia/Pyongyang', label: 'Pyongyang' },
       { value: 'Asia/Qatar', label: 'Qatar' },
@@ -454,13 +454,13 @@ export const TIMEZONES = [
       { value: 'Atlantic/Azores', label: 'Azores' },
       { value: 'Atlantic/Bermuda', label: 'Bermuda' },
       { value: 'Atlantic/Canary', label: 'Canary' },
-      { value: 'Atlantic/Cape_Verde', label: 'Cape Verde' },
+      { value: 'Atlantic/Cape Verde', label: 'Cape Verde' },
       { value: 'Atlantic/Faroe', label: 'Faroe' },
       { value: 'Atlantic/Madeira', label: 'Madeira' },
       { value: 'Atlantic/Reykjavik', label: 'Reykjavik' },
-      { value: 'Atlantic/South_Georgia', label: 'South Georgia' },
+      { value: 'Atlantic/South Georgia', label: 'South Georgia' },
       { value: 'Atlantic/Stanley', label: 'Stanley' },
-      { value: 'Atlantic/St_Helena', label: 'St Helena' },
+      { value: 'Atlantic/St Helena', label: 'St Helena' },
     ],
   },
   {
@@ -468,13 +468,13 @@ export const TIMEZONES = [
     options: [
       { value: 'Australia/Adelaide', label: 'Adelaide' },
       { value: 'Australia/Brisbane', label: 'Brisbane' },
-      { value: 'Australia/Broken_Hill', label: 'Broken Hill' },
+      { value: 'Australia/Broken Hill', label: 'Broken Hill' },
       { value: 'Australia/Currie', label: 'Currie' },
       { value: 'Australia/Darwin', label: 'Darwin' },
       { value: 'Australia/Eucla', label: 'Eucla' },
       { value: 'Australia/Hobart', label: 'Hobart' },
       { value: 'Australia/Lindeman', label: 'Lindeman' },
-      { value: 'Australia/Lord_Howe', label: 'Lord Howe' },
+      { value: 'Australia/Lord Howe', label: 'Lord Howe' },
       { value: 'Australia/Melbourne', label: 'Melbourne' },
       { value: 'Australia/Perth', label: 'Perth' },
       { value: 'Australia/Sydney', label: 'Sydney' },
@@ -500,7 +500,7 @@ export const TIMEZONES = [
       { value: 'Europe/Gibraltar', label: 'Gibraltar' },
       { value: 'Europe/Guernsey', label: 'Guernsey' },
       { value: 'Europe/Helsinki', label: 'Helsinki' },
-      { value: 'Europe/Isle_of_Man', label: 'Isle of Man' },
+      { value: 'Europe/Isle of Man', label: 'Isle of Man' },
       { value: 'Europe/Istanbul', label: 'Istanbul' },
       { value: 'Europe/Jersey', label: 'Jersey' },
       { value: 'Europe/Kaliningrad', label: 'Kaliningrad' },
@@ -523,7 +523,7 @@ export const TIMEZONES = [
       { value: 'Europe/Riga', label: 'Riga' },
       { value: 'Europe/Rome', label: 'Rome' },
       { value: 'Europe/Samara', label: 'Samara' },
-      { value: 'Europe/San_Marino', label: 'San Marino' },
+      { value: 'Europe/San Marino', label: 'San Marino' },
       { value: 'Europe/Sarajevo', label: 'Sarajevo' },
       { value: 'Europe/Saratov', label: 'Saratov' },
       { value: 'Europe/Simferopol', label: 'Simferopol' },
@@ -591,11 +591,11 @@ export const TIMEZONES = [
       { value: 'Pacific/Niue', label: 'Niue' },
       { value: 'Pacific/Norfolk', label: 'Norfolk' },
       { value: 'Pacific/Noumea', label: 'Noumea' },
-      { value: 'Pacific/Pago_Pago', label: 'Pago Pago' },
+      { value: 'Pacific/Pago Pago', label: 'Pago Pago' },
       { value: 'Pacific/Palau', label: 'Palau' },
       { value: 'Pacific/Pitcairn', label: 'Pitcairn' },
       { value: 'Pacific/Pohnpei', label: 'Pohnpei' },
-      { value: 'Pacific/Port_Moresby', label: 'Port Moresby' },
+      { value: 'Pacific/Port Moresby', label: 'Port Moresby' },
       { value: 'Pacific/Rarotonga', label: 'Rarotonga' },
       { value: 'Pacific/Saipan', label: 'Saipan' },
       { value: 'Pacific/Tahiti', label: 'Tahiti' },
diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
index b2a04ffa..39a803b0 100644
--- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
@@ -45,16 +45,16 @@ const AnswerLinks = () => {
             </a>
           </Col>
           <Col xs={6}>
-            <a href="https://meta.answer.dev" target="_blank" rel="noreferrer">
+            <a
+              href="https://answer.apache.org/community"
+              target="_blank"
+              rel="noreferrer">
               {t('support')}
             </a>
           </Col>
           <Col xs={6}>
-            <a
-              href="https://github.com/apache/incubator-answer"
-              target="_blank"
-              rel="noreferrer">
-              {t('github')}
+            <a href="https://meta.answer.dev" target="_blank" rel="noreferrer">
+              {t('forum')}
             </a>
           </Col>
           <Col xs={6}>
@@ -67,10 +67,10 @@ const AnswerLinks = () => {
           </Col>
           <Col xs={6}>
             <a
-              href="https://answer.apache.org/contact"
+              href="https://github.com/apache/incubator-answer"
               target="_blank"
               rel="noreferrer">
-              {t('contact')}
+              {t('github')}
             </a>
           </Col>
         </Row>
diff --git a/ui/src/pages/Users/Settings/Interface/index.tsx b/ui/src/pages/Users/Settings/Interface/index.tsx
index 575995ed..046bccd6 100644
--- a/ui/src/pages/Users/Settings/Interface/index.tsx
+++ b/ui/src/pages/Users/Settings/Interface/index.tsx
@@ -71,6 +71,7 @@ const Index = () => {
       },
     },
   };
+
   const uiSchema: UISchema = {
     language: {
       'ui:widget': 'select',
@@ -86,7 +87,7 @@ const Index = () => {
       ...formData,
       language: {
         ...formData.language,
-        value: res[0].value,
+        value: loggedUserInfo.language || res[0].value,
       },
     });
     setLangs(res);

From dabce296b8d084cc1de7db13f4bdae15c0b04608 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 19 Feb 2024 15:21:44 +0800
Subject: [PATCH 002/114] fix: replace timezone text _ to space

---
 ui/src/common/constants.ts                    | 116 +++++++++---------
 .../components/HealthStatus/index.tsx         |   4 +-
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 4af16945..373e41d2 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -128,7 +128,7 @@ export const TIMEZONES = [
     options: [
       { value: 'Africa/Abidjan', label: 'Abidjan' },
       { value: 'Africa/Accra', label: 'Accra' },
-      { value: 'Africa/Addis Ababa', label: 'Addis Ababa' },
+      { value: 'Africa/Addis_Ababa', label: 'Addis Ababa' },
       { value: 'Africa/Algiers', label: 'Algiers' },
       { value: 'Africa/Asmara', label: 'Asmara' },
       { value: 'Africa/Bamako', label: 'Bamako' },
@@ -143,10 +143,10 @@ export const TIMEZONES = [
       { value: 'Africa/Ceuta', label: 'Ceuta' },
       { value: 'Africa/Conakry', label: 'Conakry' },
       { value: 'Africa/Dakar', label: 'Dakar' },
-      { value: 'Africa/Dar es Salaam', label: 'Dar es Salaam' },
+      { value: 'Africa/Dar_es_Salaam', label: 'Dar es Salaam' },
       { value: 'Africa/Djibouti', label: 'Djibouti' },
       { value: 'Africa/Douala', label: 'Douala' },
-      { value: 'Africa/El Aaiun', label: 'El Aaiun' },
+      { value: 'Africa/El_Aaiun', label: 'El Aaiun' },
       { value: 'Africa/Freetown', label: 'Freetown' },
       { value: 'Africa/Gaborone', label: 'Gaborone' },
       { value: 'Africa/Harare', label: 'Harare' },
@@ -174,7 +174,7 @@ export const TIMEZONES = [
       { value: 'Africa/Nouakchott', label: 'Nouakchott' },
       { value: 'Africa/Ouagadougou', label: 'Ouagadougou' },
       { value: 'Africa/Porto-Novo', label: 'Porto-Novo' },
-      { value: 'Africa/Sao Tome', label: 'Sao Tome' },
+      { value: 'Africa/Sao_Tome', label: 'Sao Tome' },
       { value: 'Africa/Tripoli', label: 'Tripoli' },
       { value: 'Africa/Tunis', label: 'Tunis' },
       { value: 'Africa/Windhoek', label: 'Windhoek' },
@@ -189,62 +189,62 @@ export const TIMEZONES = [
       { value: 'America/Antigua', label: 'Antigua' },
       { value: 'America/Araguaina', label: 'Araguaina' },
       {
-        value: 'America/Argentina/Buenos Aires',
+        value: 'America/Argentina/Buenos_Aires',
         label: 'Argentina - Buenos Aires',
       },
       { value: 'America/Argentina/Catamarca', label: 'Argentina - Catamarca' },
       { value: 'America/Argentina/Cordoba', label: 'Argentina - Cordoba' },
       { value: 'America/Argentina/Jujuy', label: 'Argentina - Jujuy' },
-      { value: 'America/Argentina/La Rioja', label: 'Argentina - La Rioja' },
+      { value: 'America/Argentina/La_Rioja', label: 'Argentina - La Rioja' },
       { value: 'America/Argentina/Mendoza', label: 'Argentina - Mendoza' },
       {
-        value: 'America/Argentina/Rio Gallegos',
+        value: 'America/Argentina/Rio_Gallegos',
         label: 'Argentina - Rio Gallegos',
       },
       { value: 'America/Argentina/Salta', label: 'Argentina - Salta' },
-      { value: 'America/Argentina/San Juan', label: 'Argentina - San Juan' },
-      { value: 'America/Argentina/San Luis', label: 'Argentina - San Luis' },
+      { value: 'America/Argentina/San_Juan', label: 'Argentina - San Juan' },
+      { value: 'America/Argentina/San_Luis', label: 'Argentina - San Luis' },
       { value: 'America/Argentina/Tucuman', label: 'Argentina - Tucuman' },
       { value: 'America/Argentina/Ushuaia', label: 'Argentina - Ushuaia' },
       { value: 'America/Aruba', label: 'Aruba' },
       { value: 'America/Asuncion', label: 'Asuncion' },
       { value: 'America/Atikokan', label: 'Atikokan' },
       { value: 'America/Bahia', label: 'Bahia' },
-      { value: 'America/Bahia Banderas', label: 'Bahia Banderas' },
+      { value: 'America/Bahia_Banderas', label: 'Bahia Banderas' },
       { value: 'America/Barbados', label: 'Barbados' },
       { value: 'America/Belem', label: 'Belem' },
       { value: 'America/Belize', label: 'Belize' },
       { value: 'America/Blanc-Sablon', label: 'Blanc-Sablon' },
-      { value: 'America/Boa Vista', label: 'Boa Vista' },
+      { value: 'America/Boa_Vista', label: 'Boa Vista' },
       { value: 'America/Bogota', label: 'Bogota' },
       { value: 'America/Boise', label: 'Boise' },
-      { value: 'America/Cambridge Bay', label: 'Cambridge Bay' },
-      { value: 'America/Campo Grande', label: 'Campo Grande' },
+      { value: 'America/Cambridge_Bay', label: 'Cambridge Bay' },
+      { value: 'America/Campo_Grande', label: 'Campo Grande' },
       { value: 'America/Cancun', label: 'Cancun' },
       { value: 'America/Caracas', label: 'Caracas' },
       { value: 'America/Cayenne', label: 'Cayenne' },
       { value: 'America/Cayman', label: 'Cayman' },
       { value: 'America/Chicago', label: 'Chicago' },
       { value: 'America/Chihuahua', label: 'Chihuahua' },
-      { value: 'America/Costa Rica', label: 'Costa Rica' },
+      { value: 'America/Costa_Rica', label: 'Costa Rica' },
       { value: 'America/Creston', label: 'Creston' },
       { value: 'America/Cuiaba', label: 'Cuiaba' },
       { value: 'America/Curacao', label: 'Curacao' },
       { value: 'America/Danmarkshavn', label: 'Danmarkshavn' },
       { value: 'America/Dawson', label: 'Dawson' },
-      { value: 'America/Dawson Creek', label: 'Dawson Creek' },
+      { value: 'America/Dawson_Creek', label: 'Dawson Creek' },
       { value: 'America/Denver', label: 'Denver' },
       { value: 'America/Detroit', label: 'Detroit' },
       { value: 'America/Dominica', label: 'Dominica' },
       { value: 'America/Edmonton', label: 'Edmonton' },
       { value: 'America/Eirunepe', label: 'Eirunepe' },
-      { value: 'America/El Salvador', label: 'El Salvador' },
-      { value: 'America/Fort Nelson', label: 'Fort Nelson' },
+      { value: 'America/El_Salvador', label: 'El Salvador' },
+      { value: 'America/Fort_Nelson', label: 'Fort Nelson' },
       { value: 'America/Fortaleza', label: 'Fortaleza' },
-      { value: 'America/Glace Bay', label: 'Glace Bay' },
+      { value: 'America/Glace_Bay', label: 'Glace Bay' },
       { value: 'America/Godthab', label: 'Godthab' },
-      { value: 'America/Goose Bay', label: 'Goose Bay' },
-      { value: 'America/Grand Turk', label: 'Grand Turk' },
+      { value: 'America/Goose_Bay', label: 'Goose Bay' },
+      { value: 'America/Grand_Turk', label: 'Grand Turk' },
       { value: 'America/Grenada', label: 'Grenada' },
       { value: 'America/Guadeloupe', label: 'Guadeloupe' },
       { value: 'America/Guatemala', label: 'Guatemala' },
@@ -260,7 +260,7 @@ export const TIMEZONES = [
       { value: 'America/Indiana/Knox', label: 'Indiana - Knox' },
       { value: 'America/Indiana/Marengo', label: 'Indiana - Marengo' },
       { value: 'America/Indiana/Petersburg', label: 'Indiana - Petersburg' },
-      { value: 'America/Indiana/Tell City', label: 'Indiana - Tell City' },
+      { value: 'America/Indiana/Tell_City', label: 'Indiana - Tell City' },
       { value: 'America/Indiana/Vevay', label: 'Indiana - Vevay' },
       { value: 'America/Indiana/Vincennes', label: 'Indiana - Vincennes' },
       { value: 'America/Indiana/Winamac', label: 'Indiana - Winamac' },
@@ -271,10 +271,10 @@ export const TIMEZONES = [
       { value: 'America/Kentucky/Louisville', label: 'Kentucky - Louisville' },
       { value: 'America/Kentucky/Monticello', label: 'Kentucky - Monticello' },
       { value: 'America/Kralendijk', label: 'Kralendijk' },
-      { value: 'America/La Paz', label: 'La Paz' },
+      { value: 'America/La_Paz', label: 'La Paz' },
       { value: 'America/Lima', label: 'Lima' },
-      { value: 'America/Los Angeles', label: 'Los Angeles' },
-      { value: 'America/Lower Princes', label: 'Lower Princes' },
+      { value: 'America/Los_Angeles', label: 'Los Angeles' },
+      { value: 'America/Lower_Princes', label: 'Lower Princes' },
       { value: 'America/Maceio', label: 'Maceio' },
       { value: 'America/Managua', label: 'Managua' },
       { value: 'America/Manaus', label: 'Manaus' },
@@ -288,14 +288,14 @@ export const TIMEZONES = [
       { value: 'America/Montevideo', label: 'Montevideo' },
       { value: 'America/Montserrat', label: 'Montserrat' },
       { value: 'America/Nassau', label: 'Nassau' },
-      { value: 'America/New York', label: 'New York' },
+      { value: 'America/New_York', label: 'New York' },
       { value: 'America/Nipigon', label: 'Nipigon' },
       { value: 'America/Nome', label: 'Nome' },
       { value: 'America/Noronha', label: 'Noronha' },
-      { value: 'America/North Dakota/Beulah', label: 'North Dakota - Beulah' },
-      { value: 'America/North Dakota/Center', label: 'North Dakota - Center' },
+      { value: 'America/North_Dakota/Beulah', label: 'North Dakota - Beulah' },
+      { value: 'America/North_Dakota/Center', label: 'North Dakota - Center' },
       {
-        value: 'America/North Dakota/New Salem',
+        value: 'America/North_Dakota/New_Salem',
         label: 'North Dakota - New Salem',
       },
       { value: 'America/Ojinaga', label: 'Ojinaga' },
@@ -304,32 +304,32 @@ export const TIMEZONES = [
       { value: 'America/Paramaribo', label: 'Paramaribo' },
       { value: 'America/Phoenix', label: 'Phoenix' },
       { value: 'America/Port-au-Prince', label: 'Port-au-Prince' },
-      { value: 'America/Port of Spain', label: 'Port of Spain' },
-      { value: 'America/Porto Velho', label: 'Porto Velho' },
-      { value: 'America/Puerto Rico', label: 'Puerto Rico' },
-      { value: 'America/Punta Arenas', label: 'Punta Arenas' },
-      { value: 'America/Rainy River', label: 'Rainy River' },
-      { value: 'America/Rankin Inlet', label: 'Rankin Inlet' },
+      { value: 'America/Port_of_Spain', label: 'Port of Spain' },
+      { value: 'America/Porto_Velho', label: 'Porto Velho' },
+      { value: 'America/Puerto_Rico', label: 'Puerto Rico' },
+      { value: 'America/Punta_Arenas', label: 'Punta Arenas' },
+      { value: 'America/Rainy_River', label: 'Rainy River' },
+      { value: 'America/Rankin_Inlet', label: 'Rankin Inlet' },
       { value: 'America/Recife', label: 'Recife' },
       { value: 'America/Regina', label: 'Regina' },
       { value: 'America/Resolute', label: 'Resolute' },
-      { value: 'America/Rio Branco', label: 'Rio Branco' },
+      { value: 'America/Rio_Branco', label: 'Rio Branco' },
       { value: 'America/Santarem', label: 'Santarem' },
       { value: 'America/Santiago', label: 'Santiago' },
-      { value: 'America/Santo Domingo', label: 'Santo Domingo' },
-      { value: 'America/Sao Paulo', label: 'Sao Paulo' },
+      { value: 'America/Santo_Domingo', label: 'Santo Domingo' },
+      { value: 'America/Sao_Paulo', label: 'Sao Paulo' },
       { value: 'America/Scoresbysund', label: 'Scoresbysund' },
       { value: 'America/Sitka', label: 'Sitka' },
-      { value: 'America/St Barthelemy', label: 'St Barthelemy' },
-      { value: 'America/St Johns', label: 'St Johns' },
-      { value: 'America/St Kitts', label: 'St Kitts' },
-      { value: 'America/St Lucia', label: 'St Lucia' },
-      { value: 'America/St Thomas', label: 'St Thomas' },
-      { value: 'America/St Vincent', label: 'St Vincent' },
-      { value: 'America/Swift Current', label: 'Swift Current' },
+      { value: 'America/St_Barthelemy', label: 'St Barthelemy' },
+      { value: 'America/St_Johns', label: 'St Johns' },
+      { value: 'America/St_Kitts', label: 'St Kitts' },
+      { value: 'America/St_Lucia', label: 'St Lucia' },
+      { value: 'America/St_Thomas', label: 'St Thomas' },
+      { value: 'America/St_Vincent', label: 'St Vincent' },
+      { value: 'America/Swift_Current', label: 'Swift Current' },
       { value: 'America/Tegucigalpa', label: 'Tegucigalpa' },
       { value: 'America/Thule', label: 'Thule' },
-      { value: 'America/Thunder Bay', label: 'Thunder Bay' },
+      { value: 'America/Thunder_Bay', label: 'Thunder Bay' },
       { value: 'America/Tijuana', label: 'Tijuana' },
       { value: 'America/Toronto', label: 'Toronto' },
       { value: 'America/Tortola', label: 'Tortola' },
@@ -390,8 +390,8 @@ export const TIMEZONES = [
       { value: 'Asia/Famagusta', label: 'Famagusta' },
       { value: 'Asia/Gaza', label: 'Gaza' },
       { value: 'Asia/Hebron', label: 'Hebron' },
-      { value: 'Asia/Ho Chi Minh', label: 'Ho Chi Minh' },
-      { value: 'Asia/Hong Kong', label: 'Hong Kong' },
+      { value: 'Asia/Ho_Chi_Minh', label: 'Ho Chi Minh' },
+      { value: 'Asia/Hong_Kong', label: 'Hong Kong' },
       { value: 'Asia/Hovd', label: 'Hovd' },
       { value: 'Asia/Irkutsk', label: 'Irkutsk' },
       { value: 'Asia/Jakarta', label: 'Jakarta' },
@@ -404,7 +404,7 @@ export const TIMEZONES = [
       { value: 'Asia/Khandyga', label: 'Khandyga' },
       { value: 'Asia/Kolkata', label: 'Kolkata' },
       { value: 'Asia/Krasnoyarsk', label: 'Krasnoyarsk' },
-      { value: 'Asia/Kuala Lumpur', label: 'Kuala Lumpur' },
+      { value: 'Asia/Kuala_Lumpur', label: 'Kuala Lumpur' },
       { value: 'Asia/Kuching', label: 'Kuching' },
       { value: 'Asia/Kuwait', label: 'Kuwait' },
       { value: 'Asia/Macau', label: 'Macau' },
@@ -417,7 +417,7 @@ export const TIMEZONES = [
       { value: 'Asia/Novosibirsk', label: 'Novosibirsk' },
       { value: 'Asia/Omsk', label: 'Omsk' },
       { value: 'Asia/Oral', label: 'Oral' },
-      { value: 'Asia/Phnom Penh', label: 'Phnom Penh' },
+      { value: 'Asia/Phnom_Penh', label: 'Phnom Penh' },
       { value: 'Asia/Pontianak', label: 'Pontianak' },
       { value: 'Asia/Pyongyang', label: 'Pyongyang' },
       { value: 'Asia/Qatar', label: 'Qatar' },
@@ -454,13 +454,13 @@ export const TIMEZONES = [
       { value: 'Atlantic/Azores', label: 'Azores' },
       { value: 'Atlantic/Bermuda', label: 'Bermuda' },
       { value: 'Atlantic/Canary', label: 'Canary' },
-      { value: 'Atlantic/Cape Verde', label: 'Cape Verde' },
+      { value: 'Atlantic/Cape_Verde', label: 'Cape Verde' },
       { value: 'Atlantic/Faroe', label: 'Faroe' },
       { value: 'Atlantic/Madeira', label: 'Madeira' },
       { value: 'Atlantic/Reykjavik', label: 'Reykjavik' },
-      { value: 'Atlantic/South Georgia', label: 'South Georgia' },
+      { value: 'Atlantic/South_Georgia', label: 'South Georgia' },
       { value: 'Atlantic/Stanley', label: 'Stanley' },
-      { value: 'Atlantic/St Helena', label: 'St Helena' },
+      { value: 'Atlantic/St_Helena', label: 'St Helena' },
     ],
   },
   {
@@ -468,13 +468,13 @@ export const TIMEZONES = [
     options: [
       { value: 'Australia/Adelaide', label: 'Adelaide' },
       { value: 'Australia/Brisbane', label: 'Brisbane' },
-      { value: 'Australia/Broken Hill', label: 'Broken Hill' },
+      { value: 'Australia/Broken_Hill', label: 'Broken Hill' },
       { value: 'Australia/Currie', label: 'Currie' },
       { value: 'Australia/Darwin', label: 'Darwin' },
       { value: 'Australia/Eucla', label: 'Eucla' },
       { value: 'Australia/Hobart', label: 'Hobart' },
       { value: 'Australia/Lindeman', label: 'Lindeman' },
-      { value: 'Australia/Lord Howe', label: 'Lord Howe' },
+      { value: 'Australia/Lord_Howe', label: 'Lord Howe' },
       { value: 'Australia/Melbourne', label: 'Melbourne' },
       { value: 'Australia/Perth', label: 'Perth' },
       { value: 'Australia/Sydney', label: 'Sydney' },
@@ -500,7 +500,7 @@ export const TIMEZONES = [
       { value: 'Europe/Gibraltar', label: 'Gibraltar' },
       { value: 'Europe/Guernsey', label: 'Guernsey' },
       { value: 'Europe/Helsinki', label: 'Helsinki' },
-      { value: 'Europe/Isle of Man', label: 'Isle of Man' },
+      { value: 'Europe/Isle_of_Man', label: 'Isle of Man' },
       { value: 'Europe/Istanbul', label: 'Istanbul' },
       { value: 'Europe/Jersey', label: 'Jersey' },
       { value: 'Europe/Kaliningrad', label: 'Kaliningrad' },
@@ -523,7 +523,7 @@ export const TIMEZONES = [
       { value: 'Europe/Riga', label: 'Riga' },
       { value: 'Europe/Rome', label: 'Rome' },
       { value: 'Europe/Samara', label: 'Samara' },
-      { value: 'Europe/San Marino', label: 'San Marino' },
+      { value: 'Europe/San_Marino', label: 'San Marino' },
       { value: 'Europe/Sarajevo', label: 'Sarajevo' },
       { value: 'Europe/Saratov', label: 'Saratov' },
       { value: 'Europe/Simferopol', label: 'Simferopol' },
@@ -591,11 +591,11 @@ export const TIMEZONES = [
       { value: 'Pacific/Niue', label: 'Niue' },
       { value: 'Pacific/Norfolk', label: 'Norfolk' },
       { value: 'Pacific/Noumea', label: 'Noumea' },
-      { value: 'Pacific/Pago Pago', label: 'Pago Pago' },
+      { value: 'Pacific/Pago_Pago', label: 'Pago Pago' },
       { value: 'Pacific/Palau', label: 'Palau' },
       { value: 'Pacific/Pitcairn', label: 'Pitcairn' },
       { value: 'Pacific/Pohnpei', label: 'Pohnpei' },
-      { value: 'Pacific/Port Moresby', label: 'Port Moresby' },
+      { value: 'Pacific/Port_Moresby', label: 'Port Moresby' },
       { value: 'Pacific/Rarotonga', label: 'Rarotonga' },
       { value: 'Pacific/Saipan', label: 'Saipan' },
       { value: 'Pacific/Tahiti', label: 'Tahiti' },
diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
index c77f0bb1..64af4336 100644
--- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
@@ -91,7 +91,9 @@ const HealthStatus: FC<IProps> = ({ data }) => {
           </Col>
           <Col xs={6}>
             <span className="text-secondary me-1">{t('timezone')}</span>
-            <strong>{data.time_zone.split('/')?.[1]}</strong>
+            <strong>
+              {data.time_zone.split('/')?.[1].replaceAll('_', ' ')}
+            </strong>
           </Col>
           <Col xs={6}>
             <span className="text-secondary me-1">{t('smtp')}</span>

From bda7c40a1a460b0cde246d89dfca266e2e8bb880 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 26 Feb 2024 11:17:59 +0800
Subject: [PATCH 003/114] fix: edit comment

---
 ui/src/components/Comment/components/Form/index.tsx | 7 ++++++-
 ui/src/router/routes.ts                             | 1 -
 ui/src/utils/common.ts                              | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/Comment/components/Form/index.tsx b/ui/src/components/Comment/components/Form/index.tsx
index 8809778c..05ae5b2d 100644
--- a/ui/src/components/Comment/components/Form/index.tsx
+++ b/ui/src/components/Comment/components/Form/index.tsx
@@ -25,6 +25,7 @@ import classNames from 'classnames';
 
 import { TextArea, Mentions } from '@/components';
 import { usePageUsers, usePromptWithUnload } from '@/hooks';
+import { parseEditMentionUser } from '@/utils';
 
 const Index = ({
   className = '',
@@ -78,7 +79,11 @@ const Index = ({
           <Mentions
             pageUsers={pageUsers.getUsers()}
             onSelected={handleSelected}>
-            <TextArea size="sm" value={value} onChange={handleChange} />
+            <TextArea
+              size="sm"
+              value={type === 'edit' ? parseEditMentionUser(value) : value}
+              onChange={handleChange}
+            />
           </Mentions>
           <div className="form-text">{t(`tip_${mode}`)}</div>
         </div>
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index bab8b34b..9880dd38 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -219,7 +219,6 @@ const routes: RouteNode[] = [
           },
         ],
       },
-
       {
         path: 'users/login',
         page: 'pages/Users/Login',
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 07dc3400..8458afd1 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -108,6 +108,11 @@ function parseUserInfo(markdown) {
   return markdown.replace(globalReg, '[@$1](/u/$1)');
 }
 
+function parseEditMentionUser(markdown) {
+  const globalReg = /\[@([^\]]+)\]\([^)]+\)/g;
+  return markdown.replace(globalReg, '@$1');
+}
+
 function formatUptime(value) {
   const t = i18next.t.bind(i18next);
   const second = parseInt(value, 10);
@@ -273,6 +278,7 @@ export {
   bgFadeOut,
   matchedUsers,
   parseUserInfo,
+  parseEditMentionUser,
   formatUptime,
   escapeRemove,
   handleFormError,

From 3376b0157beb406142e9395d81cb31caf11e67fa Mon Sep 17 00:00:00 2001
From: Han Gao <dhangao@hotmail.com>
Date: Tue, 27 Feb 2024 10:35:06 +0800
Subject: [PATCH 004/114] fix: incomplete text display when pasting text into
 the tags field (#776)

fix #773 .

---------

Co-authored-by: LinkinStars <linkinstar@foxmail.com>
---
 .goreleaser.yaml                        |  2 +
 internal/service/uploader/upload.go     |  2 +-
 pkg/checker/file_type.go                | 81 +++++++++++++++++++------
 ui/src/components/TagSelector/index.tsx | 22 ++++---
 4 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index bd27419a..457674e9 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -65,6 +65,7 @@ archives:
         dst: licenses/
       - src: "DISCLAIMER"
         dst: DISCLAIMER
+    wrap_in_directory: true
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -79,6 +80,7 @@ changelog:
 source:
   enabled: true
   name_template: apache-answer-{{ .RawVersion }}-incubating-src
+  prefix_template: "apache-answer-{{ .RawVersion }}-incubating-src/"
 
 # goreleaser release --skip-validate  --skip-publish --clean
 
diff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.go
index fb0b2af0..3619a6e1 100644
--- a/internal/service/uploader/upload.go
+++ b/internal/service/uploader/upload.go
@@ -244,7 +244,7 @@ func (us *uploaderService) uploadFile(ctx *gin.Context, file *multipart.FileHead
 	}
 	defer src.Close()
 
-	if !checker.IsSupportedImageFile(src, filepath.Ext(fileSubPath)) {
+	if !checker.IsSupportedImageFile(filePath) {
 		return "", errors.BadRequest(reason.UploadFileUnsupportedFileFormat)
 	}
 
diff --git a/pkg/checker/file_type.go b/pkg/checker/file_type.go
index 3599270a..6c61dca2 100644
--- a/pkg/checker/file_type.go
+++ b/pkg/checker/file_type.go
@@ -20,13 +20,18 @@
 package checker
 
 import (
-	"golang.org/x/image/webp"
+	"fmt"
 	"image"
 	_ "image/gif" // use init to support decode jpeg,jpg,png,gif
 	_ "image/jpeg"
 	_ "image/png"
 	"io"
+	"os"
+	"path/filepath"
 	"strings"
+
+	"github.com/segmentfault/pacman/log"
+	"golang.org/x/image/webp"
 )
 
 const (
@@ -35,47 +40,85 @@ const (
 
 // IsSupportedImageFile currently answers support image type is
 // `image/jpeg, image/jpg, image/png, image/gif, image/webp`
-func IsSupportedImageFile(file io.Reader, ext string) bool {
-	ext = strings.ToLower(strings.TrimPrefix(ext, "."))
-	var err error
+func IsSupportedImageFile(localFilePath string) bool {
+	ext := strings.ToLower(strings.TrimPrefix(filepath.Ext(localFilePath), "."))
 	switch ext {
 	case "jpg", "jpeg", "png", "gif": // only allow for `image/jpeg,image/jpg,image/png, image/gif`
-		if !checkImageSize(file) {
+		if !decodeAndCheckImageFile(localFilePath, standardImageConfigCheck) {
+			return false
+		}
+		if !decodeAndCheckImageFile(localFilePath, standardImageCheck) {
 			return false
 		}
-		_, _, err = image.Decode(file)
 	case "ico":
 		// TODO: There is currently no good Golang library to parse whether the image is in ico format.
 		return true
 	case "webp":
-		if !checkWebpSize(file) {
+		if !decodeAndCheckImageFile(localFilePath, webpImageConfigCheck) {
+			return false
+		}
+		if !decodeAndCheckImageFile(localFilePath, webpImageCheck) {
 			return false
 		}
-		_, err = webp.Decode(file)
 	default:
 		return false
 	}
-	return err == nil
+	return true
 }
 
-func checkImageSize(file io.Reader) bool {
+func decodeAndCheckImageFile(localFilePath string, checker func(io.Reader) error) bool {
+	file, err := os.Open(localFilePath)
+	if err != nil {
+		log.Errorf("open file error: %v", err)
+		return false
+	}
+	defer file.Close()
+
+	if err = checker(file); err != nil {
+		log.Errorf("check image format error: %v", err)
+		return false
+	}
+	return true
+}
+
+func standardImageConfigCheck(file io.Reader) error {
 	config, _, err := image.DecodeConfig(file)
 	if err != nil {
-		return false
+		return fmt.Errorf("decode image config error: %v", err)
 	}
-	if (config.Width * config.Height) > maxImageSize {
-		return false
+	if imageSizeTooLarge(config) {
+		return fmt.Errorf("image size too large")
 	}
-	return true
+	return nil
 }
 
-func checkWebpSize(file io.Reader) bool {
+func standardImageCheck(file io.Reader) error {
+	_, _, err := image.Decode(file)
+	if err != nil {
+		return fmt.Errorf("decode image error: %v", err)
+	}
+	return nil
+}
+
+func webpImageConfigCheck(file io.Reader) error {
 	config, err := webp.DecodeConfig(file)
 	if err != nil {
-		return false
+		return fmt.Errorf("decode webp image config error: %v", err)
 	}
-	if (config.Width * config.Height) > maxImageSize {
-		return false
+	if imageSizeTooLarge(config) {
+		return fmt.Errorf("image size too large")
 	}
-	return true
+	return nil
+}
+
+func webpImageCheck(file io.Reader) error {
+	_, err := webp.Decode(file)
+	if err != nil {
+		return fmt.Errorf("decode webp image error: %v", err)
+	}
+	return nil
+}
+
+func imageSizeTooLarge(config image.Config) bool {
+	return config.Width*config.Height > maxImageSize
 }
diff --git a/ui/src/components/TagSelector/index.tsx b/ui/src/components/TagSelector/index.tsx
index 5afffc0d..0998804d 100644
--- a/ui/src/components/TagSelector/index.tsx
+++ b/ui/src/components/TagSelector/index.tsx
@@ -203,15 +203,6 @@ const TagSelector: FC<IProps> = ({
     console.log('handleSearch');
     const searchStr = e.currentTarget.value.replace(';', '');
     setSearchValue(searchStr);
-    const ele = document.querySelector('.a-input-width') as HTMLElement;
-    if (ele.offsetWidth > 60) {
-      inputRef.current?.setAttribute(
-        'style',
-        `width:${ele.offsetWidth + 16}px`,
-      );
-    } else {
-      inputRef.current?.setAttribute('style', 'width: 60px');
-    }
     fetchTags(searchStr);
   };
 
@@ -331,6 +322,19 @@ const TagSelector: FC<IProps> = ({
     }
   }, [focusState, tags, hiddenCreateBtn, searchValue, maxTagLength]);
 
+  useEffect(() => {
+    // set width of tag Form.Control
+    const ele = document.querySelector('.a-input-width') as HTMLElement;
+    if (ele.offsetWidth > 60) {
+      inputRef.current?.setAttribute(
+        'style',
+        `width:${ele.offsetWidth + 16}px`,
+      );
+    } else {
+      inputRef.current?.setAttribute('style', 'width: 60px');
+    }
+  }, [searchValue]);
+
   return (
     <div ref={containerRef} className="position-relative">
       <div

From 7a4cc161c9dc5872f0b9dba86aa12e2537ca528a Mon Sep 17 00:00:00 2001
From: wzy <770954908@qq.com>
Date: Thu, 8 Feb 2024 00:37:18 +0800
Subject: [PATCH 005/114] fix: update answer count when update status

---
 internal/repo/answer/answer_repo.go |  2 +-
 internal/service/answer_service.go  | 38 +++++++++++------------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go
index 60a49fa4..aca7517c 100644
--- a/internal/repo/answer/answer_repo.go
+++ b/internal/repo/answer/answer_repo.go
@@ -183,7 +183,7 @@ func (ar *answerRepo) GetAnswer(ctx context.Context, id string) (
 	return
 }
 
-// GetQuestionCount
+// GetAnswerCount count answer
 func (ar *answerRepo) GetAnswerCount(ctx context.Context) (count int64, err error) {
 	var resp = new(entity.Answer)
 	count, err = ar.data.DB.Context(ctx).Where("status = ?", entity.AnswerStatusAvailable).Count(resp)
diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go
index 7da98582..303e156d 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/answer_service.go
@@ -165,6 +165,7 @@ func (as *AnswerService) RemoveAnswer(ctx context.Context, req *schema.RemoveAns
 	//}
 	as.activityQueueService.Send(ctx, &schema.ActivityMsg{
 		UserID:           req.UserID,
+		TriggerUserID:    converter.StringToInt64(req.UserID),
 		ObjectID:         answerInfo.ID,
 		OriginalObjectID: answerInfo.ID,
 		ActivityTypeKey:  constant.ActAnswerDeleted,
@@ -511,25 +512,15 @@ func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, req *schema.A
 	if !exist {
 		return errors.BadRequest(reason.AnswerNotFound)
 	}
-	err = as.answerRepo.UpdateAnswerStatus(ctx, answerInfo.ID, setStatus)
-	if err != nil {
-		return err
-	}
 
 	if setStatus == entity.AnswerStatusDeleted {
-		// #2372 In order to simplify the process and complexity, as well as to consider if it is in-house,
-		// facing the problem of recovery.
-		//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())
-		//}
-		as.activityQueueService.Send(ctx, &schema.ActivityMsg{
-			UserID:           req.UserID,
-			TriggerUserID:    converter.StringToInt64(req.UserID),
-			ObjectID:         answerInfo.ID,
-			OriginalObjectID: answerInfo.ID,
-			ActivityTypeKey:  constant.ActAnswerDeleted,
-		})
+		if err := as.RemoveAnswer(ctx, &schema.RemoveAnswerReq{
+			ID:        req.AnswerID,
+			UserID:    req.UserID,
+			CanDelete: true,
+		}); err != nil {
+			return err
+		}
 
 		msg := &schema.NotificationMsg{}
 		msg.ObjectID = answerInfo.ID
@@ -543,13 +534,12 @@ func (as *AnswerService) AdminSetAnswerStatus(ctx context.Context, req *schema.A
 
 	// recover
 	if setStatus == entity.QuestionStatusAvailable && answerInfo.Status == entity.QuestionStatusDeleted {
-		as.activityQueueService.Send(ctx, &schema.ActivityMsg{
-			UserID:           req.UserID,
-			TriggerUserID:    converter.StringToInt64(req.UserID),
-			ObjectID:         answerInfo.ID,
-			OriginalObjectID: answerInfo.ID,
-			ActivityTypeKey:  constant.ActAnswerUndeleted,
-		})
+		if err := as.RecoverAnswer(ctx, &schema.RecoverAnswerReq{
+			AnswerID: req.AnswerID,
+			UserID:   req.UserID,
+		}); err != nil {
+			return err
+		}
 	}
 	return nil
 }

From d1a0e6cfaf85ac0746caf3e9ca5864f25b78c188 Mon Sep 17 00:00:00 2001
From: zahash <zahash.z@gmail.com>
Date: Fri, 23 Feb 2024 16:02:28 +0530
Subject: [PATCH 006/114] fixes issue with deleted comments (#796)

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

diff --git a/internal/repo/comment/comment_repo.go b/internal/repo/comment/comment_repo.go
index c8a135cf..0969ee47 100644
--- a/internal/repo/comment/comment_repo.go
+++ b/internal/repo/comment/comment_repo.go
@@ -95,7 +95,7 @@ func (cr *commentRepo) UpdateCommentContent(
 func (cr *commentRepo) GetComment(ctx context.Context, commentID string) (
 	comment *entity.Comment, exist bool, err error) {
 	comment = &entity.Comment{}
-	exist, err = cr.data.DB.Context(ctx).ID(commentID).Get(comment)
+	exist, err = cr.data.DB.Context(ctx).Where("status = ?", entity.CommentStatusAvailable).ID(commentID).Get(comment)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}

From fea7394558e26baed8de5f20c5e9d9fc5f051566 Mon Sep 17 00:00:00 2001
From: Han Gao <dhangao@hotmail.com>
Date: Tue, 27 Feb 2024 11:31:12 +0800
Subject: [PATCH 007/114] fix: only display vote number and acceptance if
 necessary (#806)

fix #803 .


![image](https://github.com/apache/incubator-answer/assets/11908658/1d71e6cc-966f-47ca-9a42-c0e2f870d54f)
---
 ui/src/pages/Search/components/SearchItem/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/src/pages/Search/components/SearchItem/index.tsx b/ui/src/pages/Search/components/SearchItem/index.tsx
index d9136b80..b1ebca56 100644
--- a/ui/src/pages/Search/components/SearchItem/index.tsx
+++ b/ui/src/pages/Search/components/SearchItem/index.tsx
@@ -76,6 +76,8 @@ const Index: FC<Props> = ({ data }) => {
           className="my-2 my-sm-0"
           showViews={false}
           isAccepted={data.object?.accepted}
+          showAnswers={data.object_type === 'question'}
+          showAccepted={data.object?.accepted && data.object_type === 'answer'}
           data={{
             votes: data.object?.vote_count,
             answers: data.object?.answer_count,

From cf3cc8a827883b97300d4794552b774eddd22540 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 27 Feb 2024 11:34:43 +0800
Subject: [PATCH 008/114] fix: review ui change

---
 i18n/en_US.yaml               |  12 ++
 ui/src/common/interface.ts    |   1 +
 ui/src/pages/Review/index.tsx | 227 +++++++++++++++++++---------------
 3 files changed, 138 insertions(+), 102 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 785cc3ed..afe6c201 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1158,6 +1158,9 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: post
+    filter: Filter
   search:
     title: Search Results
     keywords: Keywords
@@ -1797,6 +1800,15 @@ ui:
     edit_answer: Edit answer
     edit_tag: Edit tag
     empty: No review tasks left.
+    approve_tip: Do you approve this revision?
+    suggest_type_edit: Suggest {{ type }} edit
+    filter_label: Type
+    queued_post: Queued post
+    queued_user: Queued user
+    flagged_post: Flagged post
+    flagged_user: Flagged user
+    suggested_post_edit: Suggested post edit
+    suggested_tag_edit: Suggested tag edit
   timeline:
     undeleted: undeleted
     deleted: deleted
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 201a5ae0..bebf9a57 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -56,6 +56,7 @@ export interface TagBase {
 export interface Tag extends TagBase {
   main_tag_slug_name?: string;
   parsed_text?: string;
+  tag_id?: string;
 }
 
 export interface SynonymsTag extends Tag {
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 927e95a1..6f0632c6 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -18,7 +18,7 @@
  */
 
 import { FC, useEffect, useState } from 'react';
-import { Row, Col, Alert, Stack, Button } from 'react-bootstrap';
+import { Row, Col, Alert, Stack, Button, Card, Form } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
@@ -109,15 +109,13 @@ const Index: FC = () => {
   };
 
   let itemLink = '';
-  let itemTitle = '';
-  let editBadge = '';
+  let itemId = '';
   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, info?.url_title);
-    itemTitle = info?.title;
-    editBadge = t('question_edit');
+    itemId = info?.object_id;
     editSummary ||= t('edit_question');
   } else if (type === 'answer') {
     itemLink = pathFactory.answerLanding({
@@ -126,14 +124,12 @@ const Index: FC = () => {
       slugTitle: info?.url_title,
       answerId: unreviewed_info.object_id,
     });
-    itemTitle = info?.title;
-    editBadge = t('answer_edit');
+    itemId = unreviewed_info.object_id;
     editSummary ||= t('edit_answer');
   } else if (type === 'tag') {
     const tagInfo = unreviewed_info.content as Type.Tag;
     itemLink = pathFactory.tagLanding(tagInfo.slug_name);
-    itemTitle = tagInfo.display_name;
-    editBadge = t('tag_edit');
+    itemId = tagInfo?.tag_id || tagInfo.slug_name;
     editSummary ||= t('edit_tag');
   }
   useEffect(() => {
@@ -147,106 +143,133 @@ const Index: FC = () => {
       <h3 className="mb-4">{t('review')}</h3>
       <Col className="page-main flex-auto">
         {!noTasks && ro && (
-          <>
-            <Alert variant="secondary">
-              <Stack className="align-items-start">
-                <span className="badge text-bg-secondary mb-2">
-                  {editBadge}
-                </span>
-                <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')}
+          <Card>
+            <Card.Header>
+              {t('suggest_type_edit', {
+                type:
+                  type === 'question' || type === 'answer'
+                    ? t('post_lowercase', { keyPrefix: 'btns' })
+                    : type,
+              })}
+            </Card.Header>
+            <Card.Body className="p-0">
+              <Alert variant="info" className="border-0 rounded-0 mb-0">
+                <Stack
+                  direction="horizontal"
+                  gap={1}
+                  className="align-items-center mb-2">
+                  <BaseUserCard data={editor} avatarSize="24" />
+                  {editTime && (
+                    <FormatTime
+                      time={editTime}
+                      className="small text-secondary"
+                      preFix={t('proposed')}
+                    />
+                  )}
+                </Stack>
+                <Stack className="align-items-start">
+                  <p className="mb-0">{editSummary}</p>
+                </Stack>
+              </Alert>
+              <div className="p-3">
+                <small className="d-block text-secondary mb-4">
+                  <span>{t(type, { keyPrefix: 'btns' })} </span>
+                  <Link
+                    to={itemLink}
+                    target="_blank"
+                    className="link-secondary">
+                    #{itemId}
+                  </Link>
+                </small>
+                {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 }}
                   />
                 )}
+              </div>
+            </Card.Body>
+            <Card.Footer className="p-3">
+              <p>{t('approve_tip')}</p>
+              <Stack direction="horizontal" gap={2}>
+                <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>
-            </Alert>
-            {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 }}
-              />
-            )}
-            <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>
-          </>
+            </Card.Footer>
+          </Card>
         )}
         {noTasks && <Empty>{t('empty')}</Empty>}
       </Col>
 
-      <Col className="page-right-side mt-4 mt-xl-0" />
+      <Col className="page-right-side mt-4 mt-xl-0">
+        <Card>
+          <Card.Header>{t('filter', { keyPrefix: 'btns' })}</Card.Header>
+          <Card.Body>
+            <Form.Group>
+              <Form.Label>{t('filter_label')}</Form.Label>
+              <Form.Check type="radio" label="Queued post (99+)" />
+            </Form.Group>
+          </Card.Body>
+        </Card>
+      </Col>
     </Row>
   );
 };

From d4af6f5e86f16155c58fc794a01888093fd7fe7e Mon Sep 17 00:00:00 2001
From: Han Gao <dhangao@hotmail.com>
Date: Tue, 27 Feb 2024 16:19:45 +0800
Subject: [PATCH 009/114] feat: support list and unlist in admin contents page
 for questions (#780)

fix #721 .
---
 i18n/en_US.yaml                               | 13 ++++++
 i18n/zh_CN.yaml                               | 13 ++++++
 internal/schema/question_schema.go            |  2 +
 ui/src/common/constants.ts                    |  4 ++
 .../Questions/components/Action/index.tsx     | 42 ++++++++++++++++++-
 ui/src/pages/Admin/Questions/index.tsx        | 17 +++++++-
 6 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index e155edff..2d595775 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1103,6 +1103,14 @@ ui:
       confirm_btn: Reopen
       title: Reopen this post
       content: Are you sure you want to reopen?
+    list:
+      confirm_btn: List
+      title: List this post
+      content: Are you sure you want to list?
+    unlist:
+      confirm_btn: Unlist
+      title: Unlist this post
+      content: Are you sure you want to unlist?
     pin:
       title: Pin this post
       content: Are you sure you wish to pinned globally? This post will appear at the top of all post lists.
@@ -1130,6 +1138,8 @@ ui:
     save: Save
     delete: Delete
     undelete: Undelete
+    list: List
+    unlist: Unlist
     login: Log in
     signup: Sign up
     logout: Log out
@@ -1538,6 +1548,7 @@ ui:
       normal: Normal
       closed: Closed
       deleted: Deleted
+      unlisted: Unlisted
       post: Post
       votes: Votes
       answers: Answers
@@ -1846,3 +1857,5 @@ ui:
     post_hide_list:  This post has been hidden from list.
     post_show_list: This post has been shown to list.
     post_reopen: This post has been reopened.
+    post_list: This post has been listed.
+    post_unlist: This post has been unlisted.
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index 81ca99f4..a0b84535 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1073,6 +1073,14 @@ ui:
       confirm_btn: 重新打开
       title: 重新打开这个帖子
       content: 确定要重新打开吗？
+    list:
+      confirm_btn: 列表显示
+      title: 列表中显示这个帖子
+      content: 确定要列表中显示这个帖子吗？
+    unlist:
+      confirm_btn: 列表隐藏
+      title: 从列表中隐藏这个帖子
+      content: 确定要从列表中隐藏这个帖子吗？
     pin:
       title: 置顶该帖子
       content: 你确定要全局置顶吗？这个帖子将出现在所有帖子列表的顶部。
@@ -1094,6 +1102,8 @@ ui:
     save: 保存
     delete: 删除
     undelete: 撤消删除
+    list: 列表显示
+    unlist: 列表隐藏
     login: 登录
     signup: 注册
     logout: 退出
@@ -1494,6 +1504,7 @@ ui:
       closed: 已关闭
       deleted: 已删除
       post: 标题
+      unlisted: 已隐藏
       votes: 得票数
       answers: 回答数
       created: 创建于
@@ -1802,3 +1813,5 @@ ui:
     post_hide_list: 此帖子已经从列表中隐藏。
     post_show_list: 该帖子已显示到列表中。
     post_reopen: 这个帖子已被重新打开.
+    post_list: 这个帖子已经被显示
+    post_unlist: 这个帖子已经被隐藏
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 5b583993..a7c305dd 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -265,6 +265,8 @@ type AdminQuestionInfo struct {
 	ID               string         `json:"id"`
 	Title            string         `json:"title"`
 	VoteCount        int            `json:"vote_count"`
+	Show             int            `json:"show"`
+	Pin              int            `json:"pin"`
 	AnswerCount      int            `json:"answer_count"`
 	AcceptedAnswerID string         `json:"accepted_answer_id"`
 	CreateTime       int64          `json:"create_time"`
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 373e41d2..8868c9a0 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -66,6 +66,10 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
+  unlisted: {
+    variant: 'text-bg-secondary',
+    name: 'unlisted',
+  },
 };
 
 export const ADMIN_NAV_MENUS = [
diff --git a/ui/src/pages/Admin/Questions/components/Action/index.tsx b/ui/src/pages/Admin/Questions/components/Action/index.tsx
index 3861a839..a1f7e2a2 100644
--- a/ui/src/pages/Admin/Questions/components/Action/index.tsx
+++ b/ui/src/pages/Admin/Questions/components/Action/index.tsx
@@ -21,10 +21,14 @@ import { Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import { Icon, Modal } from '@/components';
-import { changeQuestionStatus, reopenQuestion } from '@/services';
+import {
+  changeQuestionStatus,
+  questionOperation,
+  reopenQuestion,
+} from '@/services';
 import { useReportModal, useToast } from '@/hooks';
 
-const AnswerActions = ({ itemData, refreshList, curFilter }) => {
+const AnswerActions = ({ itemData, refreshList, curFilter, show, pin }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'delete' });
   const closeModal = useReportModal(refreshList);
   const toast = useToast();
@@ -90,6 +94,29 @@ const AnswerActions = ({ itemData, refreshList, curFilter }) => {
         },
       });
     }
+
+    if (type === 'list' || type === 'unlist') {
+      const keyPrefix =
+        type === 'list' ? 'question_detail.list' : 'question_detail.unlist';
+      Modal.confirm({
+        title: t('title', { keyPrefix }),
+        content: t('content', { keyPrefix }),
+        cancelBtnVariant: 'link',
+        confirmText: t('confirm_btn', { keyPrefix }),
+        onConfirm: () => {
+          questionOperation({
+            id: itemData.id,
+            operation: type === 'list' ? 'show' : 'hide',
+          }).then(() => {
+            toast.onShow({
+              msg: t(`post_${type}`, { keyPrefix: 'messages' }),
+              variant: 'success',
+            });
+            refreshList();
+          });
+        },
+      });
+    }
   };
 
   return (
@@ -120,6 +147,17 @@ const AnswerActions = ({ itemData, refreshList, curFilter }) => {
             {t('undelete', { keyPrefix: 'btns' })}
           </Dropdown.Item>
         )}
+        {show === 2 ? (
+          <Dropdown.Item onClick={() => handleAction('list')}>
+            {t('list', { keyPrefix: 'btns' })}
+          </Dropdown.Item>
+        ) : (
+          pin !== 2 && (
+            <Dropdown.Item onClick={() => handleAction('unlist')}>
+              {t('unlist', { keyPrefix: 'btns' })}
+            </Dropdown.Item>
+          )
+        )}
       </Dropdown.Menu>
     </Dropdown>
   );
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 89ff51cb..27565fa6 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -96,8 +96,8 @@ const Questions: FC = () => {
             <th>{t('post')}</th>
             <th style={{ width: '8%' }}>{t('votes')}</th>
             <th style={{ width: '8%' }}>{t('answers')}</th>
-            <th style={{ width: '20%' }}>{t('created')}</th>
-            <th style={{ width: '9%' }}>{t('status')}</th>
+            <th style={{ width: '15%' }}>{t('created')}</th>
+            <th style={{ width: '14%' }}>{t('status')}</th>
             <th style={{ width: '10%' }} className="text-end">
               {t('action')}
             </th>
@@ -143,10 +143,21 @@ const Questions: FC = () => {
                   <span
                     className={classNames(
                       'badge',
+                      'me-1',
+                      'mb-1',
                       ADMIN_LIST_STATUS[curFilter]?.variant,
                     )}>
                     {t(ADMIN_LIST_STATUS[curFilter]?.name)}
                   </span>
+                  {li.show === 2 && (
+                    <span
+                      className={classNames(
+                        'badge',
+                        ADMIN_LIST_STATUS.unlisted.variant,
+                      )}>
+                      {t(ADMIN_LIST_STATUS.unlisted.name)}
+                    </span>
+                  )}
                 </td>
 
                 <td className="text-end">
@@ -154,6 +165,8 @@ const Questions: FC = () => {
                     itemData={{ id: li.id, answer_count: li.answer_count }}
                     refreshList={refreshList}
                     curFilter={curFilter}
+                    show={li.show}
+                    pin={li.pin}
                   />
                 </td>
               </tr>

From 0339b36330a6ded608e6a11ee1a5eb7e637b4add Mon Sep 17 00:00:00 2001
From: Hosein Beigi <hbsciw@gmail.com>
Date: Tue, 27 Feb 2024 11:00:35 +0330
Subject: [PATCH 010/114] feat/add-persian

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

diff --git a/i18n/i18n.yaml b/i18n/i18n.yaml
index fa8d5aec..190ac0bf 100644
--- a/i18n/i18n.yaml
+++ b/i18n/i18n.yaml
@@ -59,3 +59,6 @@ language_options:
   - label: "Slovak"
     value: "sk_SK"
     progress: 62
+  - label: "فارسی"
+    value: "fa_IR"
+    progress: 85

From 34e56f3e81e70c5ccc736d3072d7a99c7cc1ed36 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 29 Feb 2024 17:53:26 +0800
Subject: [PATCH 011/114] feat(review): add API about reviewing type

---
 cmd/wire_gen.go                            | 26 ++-----------
 internal/base/constant/revision.go         | 11 ++++++
 internal/controller/revision_controller.go | 29 +++++++++++++++
 internal/repo/revision/revision_repo.go    | 15 ++++++++
 internal/router/answer_api_router.go       |  1 +
 internal/schema/revision_schema.go         | 30 +++++++++++++++
 internal/service/revision/revision.go      |  1 +
 internal/service/revision_service.go       | 43 ++++++++++++++++++++++
 8 files changed, 133 insertions(+), 23 deletions(-)
 create mode 100644 internal/base/constant/revision.go

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 199c2ce9..96bdade4 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -1,28 +1,8 @@
-//go:build !wireinject
-// +build !wireinject
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 // Code generated by Wire. DO NOT EDIT.
 
 //go:generate go run github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
 
 package answercmd
 
@@ -210,7 +190,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)
 	searchService := service.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService, captchaService)
-	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService)
+	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo)
 	revisionController := controller.NewRevisionController(serviceRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	reportHandle := report_handle_admin.NewReportHandle(questionCommon, commentRepo, configService, notificationQueueService)
diff --git a/internal/base/constant/revision.go b/internal/base/constant/revision.go
new file mode 100644
index 00000000..ac65c487
--- /dev/null
+++ b/internal/base/constant/revision.go
@@ -0,0 +1,11 @@
+package constant
+
+type ReviewingType string
+
+const (
+	QueuedPost        ReviewingType = "queued_post"
+	QueuedUser        ReviewingType = "queued_user"
+	FlaggedPost       ReviewingType = "flagged_post"
+	FlaggedUser       ReviewingType = "flagged_user"
+	SuggestedPostEdit ReviewingType = "suggested_post_edit"
+)
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index 7bc892cd..a9d9164f 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -191,3 +191,32 @@ func (rc *RevisionController) CheckCanUpdateRevision(ctx *gin.Context) {
 	resp, err := rc.revisionListService.CheckCanUpdateRevision(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
+
+// GetReviewingType get reviewing type
+// @Summary get reviewing type
+// @Description get reviewing type
+// @Tags Revision
+// @Produce json
+// @Security ApiKeyAuth
+// @Success 200 {object} handler.RespBody{data=[]schema.GetReviewingTypeResp}
+// @Router /answer/api/v1/reviewing/type [get]
+func (rc *RevisionController) GetReviewingType(ctx *gin.Context) {
+	req := &schema.GetReviewingTypeReq{}
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	canList, err := rc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		permission.QuestionAudit,
+		permission.AnswerAudit,
+		permission.TagAudit,
+	})
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanReviewQuestion = canList[0]
+	req.CanReviewAnswer = canList[1]
+	req.CanReviewTag = canList[2]
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
+
+	resp, err := rc.revisionListService.GetReviewingType(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
+}
diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go
index 958e6d7e..eba23251 100644
--- a/internal/repo/revision/revision_repo.go
+++ b/internal/repo/revision/revision_repo.go
@@ -206,3 +206,18 @@ func (rr *revisionRepo) GetUnreviewedRevisionPage(ctx context.Context, page int,
 	}
 	return
 }
+
+// CountUnreviewedRevision get unreviewed revision count
+func (rr *revisionRepo) CountUnreviewedRevision(ctx context.Context, objectTypeList []int) (count int64, err error) {
+	if len(objectTypeList) == 0 {
+		return 0, nil
+	}
+	session := rr.data.DB.Context(ctx)
+	session = session.And("status = ?", entity.RevisionUnreviewedStatus)
+	session = session.In("object_type", objectTypeList)
+	count, err = session.Count(&entity.Revision{})
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 7e856903..0469103e 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -194,6 +194,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	r.GET("/revisions/unreviewed", a.revisionController.GetUnreviewedRevisionList)
 	r.PUT("/revisions/audit", a.revisionController.RevisionAudit)
 	r.GET("/revisions/edit/check", a.revisionController.CheckCanUpdateRevision)
+	r.GET("/reviewing/type", a.revisionController.GetReviewingType)
 
 	// comment
 	r.POST("/comment", a.commentController.AddComment)
diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index d52c1c4a..04b3439f 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -112,3 +112,33 @@ type GetRevisionResp struct {
 	UserInfo        UserBasicInfo `json:"user_info"`
 	Log             string        `json:"reason"`
 }
+
+// GetReviewingTypeReq get reviewing type request
+type GetReviewingTypeReq struct {
+	CanReviewQuestion bool   `json:"-"`
+	CanReviewAnswer   bool   `json:"-"`
+	CanReviewTag      bool   `json:"-"`
+	IsAdmin           bool   `json:"-"`
+	UserID            string `json:"-"`
+}
+
+func (r *GetReviewingTypeReq) 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
+}
+
+// GetReviewingTypeResp get reviewing type response
+type GetReviewingTypeResp struct {
+	Name       string `json:"name"`
+	Label      string `json:"label"`
+	TodoAmount int64  `json:"todo_amount"`
+}
diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go
index 658c92f6..6844054b 100644
--- a/internal/service/revision/revision.go
+++ b/internal/service/revision/revision.go
@@ -35,5 +35,6 @@ 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)
+	CountUnreviewedRevision(ctx context.Context, objectTypeList []int) (count int64, 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 552bccd4..9479a2c6 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/revision_service.go
@@ -34,6 +34,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/notice_queue"
 	"github.com/apache/incubator-answer/internal/service/object_info"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+	"github.com/apache/incubator-answer/internal/service/report_common"
 	"github.com/apache/incubator-answer/internal/service/revision"
 	"github.com/apache/incubator-answer/internal/service/tag_common"
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
@@ -58,6 +59,7 @@ type RevisionService struct {
 	tagCommon                *tagcommon.TagCommonService
 	notificationQueueService notice_queue.NotificationQueueService
 	activityQueueService     activity_queue.ActivityQueueService
+	reportRepo               report_common.ReportRepo
 }
 
 func NewRevisionService(
@@ -72,6 +74,7 @@ func NewRevisionService(
 	tagCommon *tagcommon.TagCommonService,
 	notificationQueueService notice_queue.NotificationQueueService,
 	activityQueueService activity_queue.ActivityQueueService,
+	reportRepo report_common.ReportRepo,
 ) *RevisionService {
 	return &RevisionService{
 		revisionRepo:             revisionRepo,
@@ -85,6 +88,7 @@ func NewRevisionService(
 		tagCommon:                tagCommon,
 		notificationQueueService: notificationQueueService,
 		activityQueueService:     activityQueueService,
+		reportRepo:               reportRepo,
 	}
 }
 
@@ -442,3 +446,42 @@ func (rs *RevisionService) CheckCanUpdateRevision(ctx context.Context, req *sche
 	}
 	return nil, nil
 }
+
+// GetReviewingType get reviewing type
+func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.GetReviewingTypeReq) (resp []*schema.GetReviewingTypeResp, err error) {
+	resp = make([]*schema.GetReviewingTypeResp, 0)
+
+	// TODO: get queue amount
+	resp = append(resp, &schema.GetReviewingTypeResp{
+		Name:       string(constant.QueuedPost),
+		Label:      "",
+		TodoAmount: 0,
+	})
+
+	// get flag amount
+	if req.IsAdmin {
+		reportCount, err := rs.reportRepo.GetReportCount(ctx)
+		if err != nil {
+			log.Errorf("get report count failed: %v", err)
+		} else {
+			resp = append(resp, &schema.GetReviewingTypeResp{
+				Name:       string(constant.FlaggedPost),
+				Label:      "",
+				TodoAmount: reportCount,
+			})
+		}
+	}
+
+	// get suggestion amount
+	countUnreviewedRevision, err := rs.revisionRepo.CountUnreviewedRevision(ctx, req.GetCanReviewObjectTypes())
+	if err != nil {
+		log.Errorf("get unreviewed revision count failed: %v", err)
+	} else {
+		resp = append(resp, &schema.GetReviewingTypeResp{
+			Name:       string(constant.SuggestedPostEdit),
+			Label:      "",
+			TodoAmount: countUnreviewedRevision,
+		})
+	}
+	return resp, nil
+}

From cd8dd140c630d7eae510d3e0c65d4df5ebe21af9 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 1 Mar 2024 18:08:08 +0800
Subject: [PATCH 012/114] fix: review ui split

---
 i18n/en_US.yaml                               |   5 +-
 .../components/ApproveDropdown/index.tsx      |  37 ++++
 .../components/EditPostModal/index.scss       |   4 +
 .../Review/components/EditPostModal/index.tsx | 195 ++++++++++++++++++
 .../pages/Review/components/Filter/index.tsx  |  33 +++
 .../Review/components/FlagContent/index.tsx   | 103 +++++++++
 ui/src/pages/Review/components/index.ts       |   6 +
 ui/src/pages/Review/index.tsx                 | 121 +++++------
 8 files changed, 444 insertions(+), 60 deletions(-)
 create mode 100644 ui/src/pages/Review/components/ApproveDropdown/index.tsx
 create mode 100644 ui/src/pages/Review/components/EditPostModal/index.scss
 create mode 100644 ui/src/pages/Review/components/EditPostModal/index.tsx
 create mode 100644 ui/src/pages/Review/components/Filter/index.tsx
 create mode 100644 ui/src/pages/Review/components/FlagContent/index.tsx
 create mode 100644 ui/src/pages/Review/components/index.ts

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index afe6c201..1abe4db0 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1161,6 +1161,7 @@ ui:
     tag: Tag
     post_lowercase: post
     filter: Filter
+    ignore: Ignore
   search:
     title: Search Results
     keywords: Keywords
@@ -1800,8 +1801,9 @@ ui:
     edit_answer: Edit answer
     edit_tag: Edit tag
     empty: No review tasks left.
-    approve_tip: Do you approve this revision?
+    approve_this_type: Do you approve this {{ type }}?
     suggest_type_edit: Suggest {{ type }} edit
+    flag_type: Flag {{ type }}
     filter_label: Type
     queued_post: Queued post
     queued_user: Queued user
@@ -1809,6 +1811,7 @@ ui:
     flagged_user: Flagged user
     suggested_post_edit: Suggested post edit
     suggested_tag_edit: Suggested tag edit
+    reputation: reputation
   timeline:
     undeleted: undeleted
     deleted: deleted
diff --git a/ui/src/pages/Review/components/ApproveDropdown/index.tsx b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
new file mode 100644
index 00000000..7f0e6bd7
--- /dev/null
+++ b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
@@ -0,0 +1,37 @@
+import { useState } from 'react';
+import { Dropdown, Button } from 'react-bootstrap';
+
+import EditPostModal from '../EditPostModal';
+
+const Index = () => {
+  const [showEditPostModal, setShowEditPostModal] = useState(false);
+
+  const handleEditPostModalState = () => {
+    setShowEditPostModal(!showEditPostModal);
+  };
+
+  return (
+    <div>
+      <Dropdown>
+        <Dropdown.Toggle
+          as={Button}
+          variant="outline-primary"
+          id="dropdown-basic">
+          Approve
+        </Dropdown.Toggle>
+
+        <Dropdown.Menu>
+          <Dropdown.Item href="#/action-1">Deactivate user</Dropdown.Item>
+          <Dropdown.Item href="#/action-2">Suspend user</Dropdown.Item>
+          <Dropdown.Item href="#/action-3">Delete user</Dropdown.Item>
+        </Dropdown.Menu>
+      </Dropdown>
+      <EditPostModal
+        visible={showEditPostModal}
+        handleClose={handleEditPostModalState}
+      />
+    </div>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/EditPostModal/index.scss b/ui/src/pages/Review/components/EditPostModal/index.scss
new file mode 100644
index 00000000..550155b2
--- /dev/null
+++ b/ui/src/pages/Review/components/EditPostModal/index.scss
@@ -0,0 +1,4 @@
+.edit-post-modal {
+  max-width: 746px;
+  width: 58.3333% !important;
+}
diff --git a/ui/src/pages/Review/components/EditPostModal/index.tsx b/ui/src/pages/Review/components/EditPostModal/index.tsx
new file mode 100644
index 00000000..a07a70cf
--- /dev/null
+++ b/ui/src/pages/Review/components/EditPostModal/index.tsx
@@ -0,0 +1,195 @@
+import { FC, useState } from 'react';
+import { Modal, Button, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import classNames from 'classnames';
+
+import { modifyQuestion } from '@/services';
+import { useCaptchaModal } from '@/hooks';
+import { Editor, TagSelector } from '@/components';
+import { handleFormError } from '@/utils';
+import type * as Type from '@/common/interface';
+
+import './index.scss';
+
+interface Props {
+  visible: boolean;
+  handleClose: () => void;
+}
+
+interface FormDataItem {
+  title: Type.FormValue<string>;
+  tags: Type.FormValue<Type.Tag[]>;
+  content: Type.FormValue<string>;
+}
+
+const Index: FC<Props> = ({ visible = false, handleClose }) => {
+  const initFormData = {
+    title: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    tags: {
+      value: [],
+      isInvalid: false,
+      errorMsg: '',
+    },
+    content: {
+      value: '',
+      isInvalid: false,
+      errorMsg: '',
+    },
+  };
+  const { t } = useTranslation('translation', { keyPrefix: 'ask' });
+  const [formData, setFormData] = useState<FormDataItem>(initFormData);
+  const [focusEditor, setFocusEditor] = useState(false);
+
+  const editCaptcha = useCaptchaModal('edit');
+
+  const handleInput = (data: Partial<FormDataItem>) => {
+    setFormData({
+      ...formData,
+      ...data,
+    });
+  };
+
+  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    const params: Type.QuestionParams = {
+      title: formData.title.value,
+      content: formData.content.value,
+      tags: formData.tags.value,
+    };
+
+    editCaptcha.check(() => {
+      const ep = {
+        ...params,
+        id: '',
+        edit_summary: '',
+      };
+      const imgCode = editCaptcha.getCaptcha();
+      if (imgCode.verify) {
+        ep.captcha_code = imgCode.captcha_code;
+        ep.captcha_id = imgCode.captcha_id;
+      }
+      modifyQuestion(ep)
+        .then(async (res) => {
+          await editCaptcha.close();
+          console.log('res', res);
+          // navigate(pathFactory.questionLanding(qid, res?.url_title), {
+          //   state: { isReview: res?.wait_for_review },
+          // });
+        })
+        .catch((err) => {
+          if (err.isError) {
+            editCaptcha.handleCaptchaError(err.list);
+            const data = handleFormError(err, formData);
+            setFormData({ ...data });
+          }
+        });
+    });
+  };
+  return (
+    <Modal
+      show={visible}
+      onHide={handleClose}
+      className="w-100"
+      dialogClassName="edit-post-modal">
+      <Modal.Header closeButton>
+        <Modal.Title>Edit post</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <Form noValidate onSubmit={handleSubmit}>
+          <Form.Group controlId="title" className="mb-3">
+            <Form.Label>{t('form.fields.title.label')}</Form.Label>
+            <Form.Control
+              type="text"
+              value={formData.title.value}
+              isInvalid={formData.title.isInvalid}
+              onChange={(e) => {
+                handleInput({
+                  title: {
+                    value: e.target.value,
+                    isInvalid: false,
+                    errorMsg: '',
+                  },
+                });
+              }}
+              placeholder={t('form.fields.title.placeholder')}
+              autoFocus
+              contentEditable
+            />
+
+            <Form.Control.Feedback type="invalid">
+              {formData.title.errorMsg}
+            </Form.Control.Feedback>
+          </Form.Group>
+
+          <Form.Group controlId="body">
+            <Form.Label>{t('form.fields.body.label')}</Form.Label>
+            <Form.Control
+              defaultValue={formData.content.value}
+              isInvalid={formData.content.isInvalid}
+              hidden
+            />
+            <Editor
+              value={formData.content.value}
+              onChange={(value) => {
+                handleInput({
+                  content: { value, errorMsg: '', isInvalid: false },
+                });
+              }}
+              className={classNames(
+                'form-control p-0',
+                focusEditor ? 'focus' : '',
+              )}
+              onFocus={() => {
+                setFocusEditor(true);
+              }}
+              onBlur={() => {
+                setFocusEditor(false);
+              }}
+            />
+            <Form.Control.Feedback type="invalid">
+              {formData.content.errorMsg}
+            </Form.Control.Feedback>
+          </Form.Group>
+          <Form.Group controlId="tags" className="my-3">
+            <Form.Label>{t('form.fields.tags.label')}</Form.Label>
+            <Form.Control
+              defaultValue={JSON.stringify(formData.tags.value)}
+              isInvalid={formData.tags.isInvalid}
+              hidden
+            />
+            <TagSelector
+              value={formData.tags.value}
+              onChange={(value) => {
+                handleInput({
+                  tags: { value, errorMsg: '', isInvalid: false },
+                });
+              }}
+              showRequiredTag
+              maxTagLength={5}
+            />
+            <Form.Control.Feedback type="invalid">
+              {formData.tags.errorMsg}
+            </Form.Control.Feedback>
+          </Form.Group>
+        </Form>
+      </Modal.Body>
+      <Modal.Footer>
+        <Button variant="secondary" onClick={handleClose}>
+          {t('close', { keyPrefix: 'btns' })}
+        </Button>
+        <Button variant="primary" onClick={handleClose}>
+          {t('submit', { keyPrefix: 'btns' })}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/Filter/index.tsx b/ui/src/pages/Review/components/Filter/index.tsx
new file mode 100644
index 00000000..2eccf86a
--- /dev/null
+++ b/ui/src/pages/Review/components/Filter/index.tsx
@@ -0,0 +1,33 @@
+import { useState } from 'react';
+import { Card, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+const Index = () => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [checked, setValue] = useState(false);
+  return (
+    <Card>
+      <Card.Header>{t('filter', { keyPrefix: 'btns' })}</Card.Header>
+      <Card.Body>
+        <Form.Group>
+          <Form.Label>{t('filter_label')}</Form.Label>
+          <Form.Check
+            type="radio"
+            label="Queued post (99+)"
+            checked={checked}
+            onChange={(e) => setValue(e.target.checked)}
+          />
+
+          <Form.Check
+            type="radio"
+            label="Queued post (199+)"
+            checked={checked}
+            onChange={(e) => setValue(e.target.checked)}
+          />
+        </Form.Group>
+      </Card.Body>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
new file mode 100644
index 00000000..fdead753
--- /dev/null
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -0,0 +1,103 @@
+import { FC } from 'react';
+import { Card, Badge } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+
+import { BaseUserCard, Tag, FormatTime, Avatar } from '@/components';
+
+const tag = [
+  {
+    display_name: 'bug',
+    slug_name: 'bug',
+    original_text: '111',
+    recommend: true,
+  },
+  {
+    display_name: 'react',
+    slug_name: 'react',
+    original_text: '222',
+    reserved: true,
+  },
+  {
+    display_name: 'test',
+    slug_name: 'test',
+    original_text: '111',
+    recommend: false,
+    reserved: false,
+  },
+];
+
+const Index: FC = () => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const objectType = 'question';
+  return (
+    <Card>
+      <Card.Header>{t('flag_type', { type: 'post' })}</Card.Header>
+      <Card.Body className="p-0">
+        <div className="p-3">
+          <h5 className="mb-3">
+            How do I test weather variable against multiple
+          </h5>
+          {objectType === 'question' && (
+            <div className="mb-4">
+              {tag?.map((item) => {
+                return (
+                  <Tag key={item.slug_name} className="me-1" data={item} />
+                );
+              })}
+            </div>
+          )}
+          <div className="small font-monospace">
+            Python is a multi-paradigm, dynamically typed, multi-purpose
+            programming language. It is designed to be quick to learn,
+            understand, and use, and enforces a clean and uniform syntax. Please
+            note that Python 2 is officially out of support as of 2020-01-01.
+            For version-specific Python questions, add the [python-2.7] or
+            [python-3.x] tag. When using a Python variant library (e.g. Pandas,
+            NumPy), please include it in the tags.
+          </div>
+          <div className="d-flex align-items-center justify-content-between mt-4">
+            <Badge bg="success">normal</Badge>
+            <div className="d-flex align-items-center small">
+              <BaseUserCard
+                data={{
+                  username: 'username',
+                  display_name: 'username',
+                  avatar: '',
+                  reputation: 100,
+                }}
+                avatarSize="24"
+              />
+              <FormatTime
+                time={1688107033}
+                className="text-secondary ms-1 flex-shrink-0"
+                preFix="answered"
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className="p-3 d-flex">
+          <Avatar
+            avatar=""
+            size="40"
+            searchStr="s=48"
+            alt=""
+            className="me-2"
+          />
+          <div className="small">
+            <Link to="/test">
+              111 <span className="text-secondary">@111</span>
+            </Link>
+            <div className="mt-1">
+              I'm a web developer with in-depth experience in UI/UX design.
+            </div>
+            <div className="text-secondary mt-1">280 {t('reputation')}</div>
+          </div>
+        </div>
+      </Card.Body>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/index.ts b/ui/src/pages/Review/components/index.ts
new file mode 100644
index 00000000..74f4f1df
--- /dev/null
+++ b/ui/src/pages/Review/components/index.ts
@@ -0,0 +1,6 @@
+import Filter from './Filter';
+import ApproveDropdown from './ApproveDropdown';
+import EditPostModal from './EditPostModal';
+import FlagContent from './FlagContent';
+
+export { Filter, ApproveDropdown, EditPostModal, FlagContent };
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 6f0632c6..77af95b9 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -18,7 +18,7 @@
  */
 
 import { FC, useEffect, useState } from 'react';
-import { Row, Col, Alert, Stack, Button, Card, Form } from 'react-bootstrap';
+import { Row, Col, Alert, Stack, Button, Card } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
@@ -29,6 +29,8 @@ import { pathFactory } from '@/router/pathFactory';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 
+import { Filter, ApproveDropdown, FlagContent } from './components';
+
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [isLoading, setIsLoading] = useState(false);
@@ -107,7 +109,6 @@ const Index: FC = () => {
         setIsLoading(false);
       });
   };
-
   let itemLink = '';
   let itemId = '';
   let editSummary = unreviewed_info?.reason;
@@ -138,6 +139,47 @@ const Index: FC = () => {
   usePageTags({
     title: t('review'),
   });
+
+  let newData: Record<string, any> = {};
+  let oldData: Record<string, any> = {};
+  let diffOpts: Partial<{
+    showTitle: boolean;
+    showTagUrlSlug: boolean;
+  }> = {
+    showTitle: true,
+    showTagUrlSlug: true,
+  };
+  if (type === 'question' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      title: reviewInfo.title,
+      original_text: reviewInfo.content,
+      tags: reviewInfo.tags,
+    };
+    oldData = {
+      title: info.title,
+      original_text: info.content,
+      tags: info.tags,
+    };
+  }
+  if (type === 'answer' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      original_text: reviewInfo.content,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+  }
+
+  if (type === 'tag' && info && reviewInfo) {
+    newData = {
+      original_text: reviewInfo.original_text,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+    diffOpts = { showTitle: false, showTagUrlSlug: false };
+  }
+
   return (
     <Row className="pt-4 mb-5">
       <h3 className="mb-4">{t('review')}</h3>
@@ -181,58 +223,18 @@ const Index: FC = () => {
                     #{itemId}
                   </Link>
                 </small>
-                {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 }}
-                  />
-                )}
+                <DiffContent
+                  className="mt-2"
+                  objectType={type}
+                  newData={newData}
+                  oldData={oldData}
+                  opts={diffOpts}
+                />
               </div>
             </Card.Body>
             <Card.Footer className="p-3">
-              <p>{t('approve_tip')}</p>
+              <p>{t('approve_this_type', { type: 'revision' })}</p>
               <Stack direction="horizontal" gap={2}>
                 <Button
                   variant="outline-primary"
@@ -240,12 +242,19 @@ const Index: FC = () => {
                   onClick={handlingApprove}>
                   {t('approve', { keyPrefix: 'btns' })}
                 </Button>
+                <ApproveDropdown />
                 <Button
                   variant="outline-primary"
                   disabled={isLoading}
                   onClick={handlingReject}>
                   {t('reject', { keyPrefix: 'btns' })}
                 </Button>
+                <Button
+                  variant="outline-primary"
+                  disabled={isLoading}
+                  onClick={handlingReject}>
+                  {t('ignore', { keyPrefix: 'btns' })}
+                </Button>
                 <Button
                   variant="outline-primary"
                   disabled={isLoading}
@@ -257,18 +266,12 @@ const Index: FC = () => {
           </Card>
         )}
         {noTasks && <Empty>{t('empty')}</Empty>}
+
+        <FlagContent />
       </Col>
 
       <Col className="page-right-side mt-4 mt-xl-0">
-        <Card>
-          <Card.Header>{t('filter', { keyPrefix: 'btns' })}</Card.Header>
-          <Card.Body>
-            <Form.Group>
-              <Form.Label>{t('filter_label')}</Form.Label>
-              <Form.Check type="radio" label="Queued post (99+)" />
-            </Form.Group>
-          </Card.Body>
-        </Card>
+        <Filter />
       </Col>
     </Row>
   );

From bee1f5624e7789fdb9bf113cff9e54acfbea9c66 Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Fri, 1 Mar 2024 22:01:06 +0800
Subject: [PATCH 013/114] fix: remove delete action for deleted question even
 for admin

---
 internal/service/permission/question_permission.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/service/permission/question_permission.go b/internal/service/permission/question_permission.go
index 1df244e3..b93cdfc1 100644
--- a/internal/service/permission/question_permission.go
+++ b/internal/service/permission/question_permission.go
@@ -92,7 +92,8 @@ func GetQuestionPermission(ctx context.Context, userID string, creatorUserID str
 			Type:   "confirm",
 		})
 	}
-	if canDelete || userID == creatorUserID {
+
+	if (canDelete || userID == creatorUserID) && status != entity.QuestionStatusDeleted {
 		actions = append(actions, &schema.PermissionMemberAction{
 			Action: "delete",
 			Name:   translator.Tr(lang, deleteActionName),

From fd6c2b1cd5898db5e9deb76e10b4bf8700ca5013 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 4 Mar 2024 18:00:24 +0800
Subject: [PATCH 014/114] feat(notification): Add a notification when replying
 to a comment.

---
 internal/service/comment/comment_service.go | 38 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
index 0caa2a14..f9e3a56f 100644
--- a/internal/service/comment/comment_service.go
+++ b/internal/service/comment/comment_service.go
@@ -21,6 +21,8 @@ package comment
 
 import (
 	"context"
+	"time"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/pager"
 	"github.com/apache/incubator-answer/internal/base/reason"
@@ -40,7 +42,6 @@ import (
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
-	"time"
 )
 
 // CommentRepo comment repository
@@ -211,7 +212,8 @@ func (cs *CommentService) addCommentNotification(
 			resp.ReplyUserDisplayName = replyUser.DisplayName
 			resp.ReplyUserStatus = replyUser.Status
 		}
-		cs.notificationCommentReply(ctx, replyUser.ID, comment.ID, req.UserID)
+		cs.notificationCommentReply(ctx, replyUser.ID, comment.ID, req.UserID,
+			objInfo.QuestionID, objInfo.Title, comment.OriginalText)
 		alreadyNotifiedUserID[replyUser.ID] = true
 		return nil, nil
 	}
@@ -579,7 +581,8 @@ func (cs *CommentService) notificationAnswerComment(ctx context.Context,
 	cs.externalNotificationQueueService.Send(ctx, externalNotificationMsg)
 }
 
-func (cs *CommentService) notificationCommentReply(ctx context.Context, replyUserID, commentID, commentUserID string) {
+func (cs *CommentService) notificationCommentReply(ctx context.Context, replyUserID, commentID, commentUserID,
+	questionID, questionTitle, commentSummary string) {
 	msg := &schema.NotificationMsg{
 		ReceiverUserID: replyUserID,
 		TriggerUserID:  commentUserID,
@@ -589,6 +592,35 @@ func (cs *CommentService) notificationCommentReply(ctx context.Context, replyUse
 	msg.ObjectType = constant.CommentObjectType
 	msg.NotificationAction = constant.NotificationReplyToYou
 	cs.notificationQueueService.Send(ctx, msg)
+
+	// Send external notification.
+	receiverUserInfo, exist, err := cs.userRepo.GetByUserID(ctx, replyUserID)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	if !exist {
+		log.Warnf("user %s not found", replyUserID)
+		return
+	}
+	externalNotificationMsg := &schema.ExternalNotificationMsg{
+		ReceiverUserID: receiverUserInfo.ID,
+		ReceiverEmail:  receiverUserInfo.EMail,
+		ReceiverLang:   receiverUserInfo.Language,
+	}
+	rawData := &schema.NewCommentTemplateRawData{
+		QuestionTitle:   questionTitle,
+		QuestionID:      questionID,
+		CommentID:       commentID,
+		CommentSummary:  commentSummary,
+		UnsubscribeCode: token.GenerateToken(),
+	}
+	commentUser, _, _ := cs.userCommon.GetUserBasicInfoByID(ctx, commentUserID)
+	if commentUser != nil {
+		rawData.CommentUserDisplayName = commentUser.DisplayName
+	}
+	externalNotificationMsg.NewCommentTemplateRawData = rawData
+	cs.externalNotificationQueueService.Send(ctx, externalNotificationMsg)
 }
 
 func (cs *CommentService) notificationMention(

From b4f61190b074bab4f94ec1e1535552620dc23719 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 4 Mar 2024 18:30:33 +0800
Subject: [PATCH 015/114] feat(url): Add default url title

---
 pkg/htmltext/htmltext.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/htmltext/htmltext.go b/pkg/htmltext/htmltext.go
index 792063f4..9e847d6a 100644
--- a/pkg/htmltext/htmltext.go
+++ b/pkg/htmltext/htmltext.go
@@ -20,14 +20,15 @@
 package htmltext
 
 import (
-	"github.com/Chain-Zhang/pinyin"
-	"github.com/apache/incubator-answer/pkg/checker"
 	"io"
 	"net/http"
 	"net/url"
 	"regexp"
 	"strings"
 
+	"github.com/Chain-Zhang/pinyin"
+	"github.com/apache/incubator-answer/pkg/checker"
+
 	"github.com/Machiel/slugify"
 	strip "github.com/grokify/html-strip-tags-go"
 )
@@ -72,6 +73,9 @@ func UrlTitle(title string) (text string) {
 	title = slugify.Slugify(title)
 	title = url.QueryEscape(title)
 	title = cutLongTitle(title)
+	if len(title) == 0 {
+		title = "topic"
+	}
 	return title
 }
 

From d26079a1886826803bc19075b615e7eb2114507e Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Mon, 4 Mar 2024 22:10:47 +0800
Subject: [PATCH 016/114] fix: can't search username with '-' charactor

---
 internal/schema/search_schema.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/internal/schema/search_schema.go b/internal/schema/search_schema.go
index 90b08ceb..786fb9bb 100644
--- a/internal/schema/search_schema.go
+++ b/internal/schema/search_schema.go
@@ -20,11 +20,12 @@
 package schema
 
 import (
+	"regexp"
+	"strings"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/plugin"
-	"regexp"
-	"strings"
 )
 
 type SearchDTO struct {
@@ -40,7 +41,7 @@ type SearchDTO struct {
 func (s *SearchDTO) Check() (errField []*validator.FormErrorField, err error) {
 	// Replace special characters.
 	// Special characters will cause the search abnormal, such as search for "#" will get nearly all the content that Markdown format.
-	s.Query = regexp.MustCompile(`[+#.<>\-_()*]`).ReplaceAllString(s.Query, " ")
+	s.Query = regexp.MustCompile(`[+#.<>_()*]`).ReplaceAllString(s.Query, " ")
 	s.Query = regexp.MustCompile(`\s+`).ReplaceAllString(s.Query, " ")
 	s.Query = strings.TrimSpace(s.Query)
 	return nil, nil

From 1934ddbe27240c7768642c30ba4f0d3bb7bf4d3d Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Tue, 5 Mar 2024 00:34:23 +0800
Subject: [PATCH 017/114] update

---
 internal/schema/search_schema.go      | 28 ++++++++++++++++++++++++---
 internal/schema/search_schema_test.go | 22 +++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 internal/schema/search_schema_test.go

diff --git a/internal/schema/search_schema.go b/internal/schema/search_schema.go
index 786fb9bb..59f32c5e 100644
--- a/internal/schema/search_schema.go
+++ b/internal/schema/search_schema.go
@@ -41,12 +41,34 @@ type SearchDTO struct {
 func (s *SearchDTO) Check() (errField []*validator.FormErrorField, err error) {
 	// Replace special characters.
 	// Special characters will cause the search abnormal, such as search for "#" will get nearly all the content that Markdown format.
-	s.Query = regexp.MustCompile(`[+#.<>_()*]`).ReplaceAllString(s.Query, " ")
-	s.Query = regexp.MustCompile(`\s+`).ReplaceAllString(s.Query, " ")
-	s.Query = strings.TrimSpace(s.Query)
+	replacedContent, patterns := ReplaceSearchContent(s.Query)
+	s.Query = strings.Join(append(patterns, replacedContent), " ")
+
 	return nil, nil
 }
 
+func ReplaceSearchContent(content string) (string, []string) {
+	// Define the regular expressions for key:value pairs and [tag]
+	keyValueRegex := regexp.MustCompile(`\w+:\S+`)
+	tagRegex := regexp.MustCompile(`\[\w+\]`)
+	// Define the pattern for characters to replace
+	replaceCharsPattern := regexp.MustCompile(`[+#.<>\-_()*]`)
+
+	// Extract key:value pairs
+	keyValues := keyValueRegex.FindAllString(content, -1)
+	// Extract [tag]
+	tags := tagRegex.FindAllString(content, -1)
+
+	// Replace key:value pairs and [tag] with empty string
+	contentWithoutPatterns := keyValueRegex.ReplaceAllString(content, "")
+	contentWithoutPatterns = tagRegex.ReplaceAllString(contentWithoutPatterns, "")
+
+	// Replace characters with pattern [+#.<>_()*] with space
+	replacedContent := replaceCharsPattern.ReplaceAllString(contentWithoutPatterns, " ")
+
+	return strings.TrimSpace(replacedContent), append(keyValues, tags...)
+}
+
 type SearchCondition struct {
 	// search target type: all/question/answer
 	TargetType string
diff --git a/internal/schema/search_schema_test.go b/internal/schema/search_schema_test.go
new file mode 100644
index 00000000..1549f0e1
--- /dev/null
+++ b/internal/schema/search_schema_test.go
@@ -0,0 +1,22 @@
+package schema
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestReplaceSearchContent(t *testing.T) {
+	content := "user:aaa [tag] ssssfdfdf-as#fsadf"
+	replacedContent, patterns := ReplaceSearchContent(content)
+	ret := strings.Join(append(patterns, replacedContent), " ")
+
+	assert.Equal(t, "user:aaa [tag]ssssfdfdf as fsadf", ret)
+
+	content = "user:aaa-sss [tag1] ssssfdfdf-as#fsadf [tag2] score:3"
+	replacedContent, patterns = ReplaceSearchContent(content)
+	ret = strings.Join(append(patterns, replacedContent), " ")
+
+	assert.Equal(t, "user:aaa-sss score:3 [tag1] [tag2] ssssfdfdf as fsadf", ret)
+}

From 16cafbaf95bbc7d2a919fdc92c4771b7833186d7 Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Tue, 5 Mar 2024 00:36:53 +0800
Subject: [PATCH 018/114] update

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

diff --git a/internal/schema/search_schema_test.go b/internal/schema/search_schema_test.go
index 1549f0e1..50ffdf14 100644
--- a/internal/schema/search_schema_test.go
+++ b/internal/schema/search_schema_test.go
@@ -12,7 +12,7 @@ func TestReplaceSearchContent(t *testing.T) {
 	replacedContent, patterns := ReplaceSearchContent(content)
 	ret := strings.Join(append(patterns, replacedContent), " ")
 
-	assert.Equal(t, "user:aaa [tag]ssssfdfdf as fsadf", ret)
+	assert.Equal(t, "user:aaa [tag] ssssfdfdf as fsadf", ret)
 
 	content = "user:aaa-sss [tag1] ssssfdfdf-as#fsadf [tag2] score:3"
 	replacedContent, patterns = ReplaceSearchContent(content)

From fa4782a4dca1e4a396bd620c15a3bca41a1a5d43 Mon Sep 17 00:00:00 2001
From: kumfo <kumfo@sifou.com>
Date: Tue, 5 Mar 2024 11:35:36 +0800
Subject: [PATCH 019/114] feat(flag): move flag(admin) -> flag(foreground)

---
 cmd/wire_gen.go                               |  31 +-
 docs/docs.go                                  | 344 +++++++++++-------
 docs/swagger.json                             | 322 ++++++++++------
 docs/swagger.yaml                             | 218 ++++++-----
 internal/controller/report_controller.go      |  59 +++
 internal/controller_admin/controller.go       |   1 -
 .../controller_admin/report_controller.go     |  96 -----
 internal/router/answer_api_router.go          |  11 +-
 internal/service/provider.go                  |   6 +-
 internal/service/report/report_service.go     | 151 +++++++-
 .../service/report_admin/report_backyard.go   | 194 ----------
 .../report_handle.go                          |   2 +-
 12 files changed, 775 insertions(+), 660 deletions(-)
 delete mode 100644 internal/controller_admin/report_controller.go
 delete mode 100644 internal/service/report_admin/report_backyard.go
 rename internal/service/{report_handle_admin => report_handle}/report_handle.go (99%)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 96bdade4..33c943a5 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -68,8 +68,7 @@ import (
 	rank2 "github.com/apache/incubator-answer/internal/service/rank"
 	reason2 "github.com/apache/incubator-answer/internal/service/reason"
 	report2 "github.com/apache/incubator-answer/internal/service/report"
-	"github.com/apache/incubator-answer/internal/service/report_admin"
-	"github.com/apache/incubator-answer/internal/service/report_handle_admin"
+	"github.com/apache/incubator-answer/internal/service/report_handle"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	role2 "github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
@@ -159,24 +158,25 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	rateLimitMiddleware := middleware.NewRateLimitMiddleware(limitRepo)
 	commentController := controller.NewCommentController(commentService, rankService, captchaService, rateLimitMiddleware)
 	reportRepo := report.NewReportRepo(dataData, uniqueIDRepo)
-	reportService := report2.NewReportService(reportRepo, objService)
-	reportController := controller.NewReportController(reportService, rankService, captchaService)
-	serviceVoteRepo := activity.NewVoteRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
-	voteService := service.NewVoteService(serviceVoteRepo, configService, questionRepo, answerRepo, commentCommonRepo, objService)
-	voteController := controller.NewVoteController(voteService, rankService, captchaService)
 	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
-	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService, activityQueueService)
-	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
-	followFollowRepo := activity.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
-	followService := follow.NewFollowService(followFollowRepo, followRepo, tagCommonRepo)
-	followController := controller.NewFollowController(followService)
 	collectionRepo := collection.NewCollectionRepo(dataData, uniqueIDRepo)
-	collectionGroupRepo := collection.NewCollectionGroupRepo(dataData)
 	collectionCommon := collectioncommon.NewCollectionCommon(collectionRepo)
 	answerCommon := answercommon.NewAnswerCommon(answerRepo)
 	metaRepo := meta.NewMetaRepo(dataData)
 	metaService := meta2.NewMetaService(metaRepo)
 	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, dataData)
+	reportHandle := report_handle.NewReportHandle(questionCommon, commentRepo, configService, notificationQueueService)
+	reportService := report2.NewReportService(reportRepo, objService, userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle, configService)
+	reportController := controller.NewReportController(reportService, rankService, captchaService)
+	serviceVoteRepo := activity.NewVoteRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
+	voteService := service.NewVoteService(serviceVoteRepo, configService, questionRepo, answerRepo, commentCommonRepo, objService)
+	voteController := controller.NewVoteController(voteService, rankService, captchaService)
+	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService, activityQueueService)
+	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
+	followFollowRepo := activity.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
+	followService := follow.NewFollowService(followFollowRepo, followRepo, tagCommonRepo)
+	followController := controller.NewFollowController(followService)
+	collectionGroupRepo := collection.NewCollectionGroupRepo(dataData)
 	collectionService := service.NewCollectionService(collectionRepo, collectionGroupRepo, questionCommon)
 	collectionController := controller.NewCollectionController(collectionService)
 	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
@@ -193,9 +193,6 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo)
 	revisionController := controller.NewRevisionController(serviceRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
-	reportHandle := report_handle_admin.NewReportHandle(questionCommon, commentRepo, configService, notificationQueueService)
-	reportAdminService := report_admin.NewReportAdminService(reportRepo, userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle, configService, objService)
-	controller_adminReportController := controller_admin.NewReportController(reportAdminService)
 	userAdminRepo := user.NewUserAdminRepo(dataData, authRepo)
 	userAdminService := user_admin.NewUserAdminService(userAdminRepo, userRoleRelService, authService, userCommon, userActiveActivityRepo, siteInfoCommonService, emailService, questionRepo, answerRepo, commentCommonRepo)
 	userAdminController := controller_admin.NewUserAdminController(userAdminService)
@@ -226,7 +223,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	pluginController := controller_admin.NewPluginController(pluginCommonService)
 	permissionController := controller.NewPermissionController(rankService)
 	userPluginController := controller.NewUserPluginController(pluginCommonService)
-	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, controller_adminReportController, userAdminController, reasonController, themeController, siteInfoController, controllerSiteInfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController, userPluginController)
+	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, userAdminController, reasonController, themeController, siteInfoController, controllerSiteInfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController, userPluginController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
 	uiRouter := router.NewUIRouter(controllerSiteInfoController, siteInfoCommonService)
 	authUserMiddleware := middleware.NewAuthUserMiddleware(authService, siteInfoCommonService)
diff --git a/docs/docs.go b/docs/docs.go
index dc56880a..85abcbb8 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,24 +1,4 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"
@@ -535,117 +515,6 @@ const docTemplate = `{
                 }
             }
         },
-        "/answer/admin/api/report/": {
-            "put": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "handle flag",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "admin"
-                ],
-                "summary": "handle flag",
-                "parameters": [
-                    {
-                        "description": "flag",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/schema.ReportHandleReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
-        "/answer/admin/api/reports/page": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "list report records",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "admin"
-                ],
-                "summary": "list report page",
-                "parameters": [
-                    {
-                        "enum": [
-                            "pending",
-                            "completed"
-                        ],
-                        "type": "string",
-                        "description": "status",
-                        "name": "status",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "enum": [
-                            "all",
-                            "question",
-                            "answer",
-                            "comment"
-                        ],
-                        "type": "string",
-                        "description": "object_type",
-                        "name": "object_type",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page_size",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
         "/answer/admin/api/roles": {
             "get": {
                 "description": "get role list",
@@ -4466,6 +4335,157 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/report/": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "handle flag",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Report"
+                ],
+                "summary": "handle flag",
+                "parameters": [
+                    {
+                        "description": "flag",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.ReportHandleReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/reports/page": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "list report records",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Report"
+                ],
+                "summary": "list report page",
+                "parameters": [
+                    {
+                        "enum": [
+                            "pending",
+                            "completed"
+                        ],
+                        "type": "string",
+                        "description": "status",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "enum": [
+                            "all",
+                            "question",
+                            "answer",
+                            "comment"
+                        ],
+                        "type": "string",
+                        "description": "object_type",
+                        "name": "object_type",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "page size",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "page size",
+                        "name": "page_size",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/reviewing/type": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "get reviewing type",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "get reviewing type",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/schema.GetReviewingTypeResp"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions": {
             "get": {
                 "description": "get revision list",
@@ -6554,7 +6574,8 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "value": {
-                    "type": "integer"
+                    "type": "integer",
+                    "minimum": 1
                 }
             }
         },
@@ -7094,6 +7115,12 @@ const docTemplate = `{
                 "action": {
                     "$ref": "#/definitions/schema.UIOptionAction"
                 },
+                "class_name": {
+                    "type": "string"
+                },
+                "field_class_name": {
+                    "type": "string"
+                },
                 "input_type": {
                     "type": "string"
                 },
@@ -7374,6 +7401,10 @@ const docTemplate = `{
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
@@ -7686,6 +7717,20 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.GetReviewingTypeResp": {
+            "type": "object",
+            "properties": {
+                "label": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "todo_amount": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.GetRevisionResp": {
             "type": "object",
             "properties": {
@@ -8161,12 +8206,14 @@ const docTemplate = `{
             "enum": [
                 1,
                 2,
-                3
+                3,
+                99
             ],
             "x-enum-varnames": [
                 "PrivilegeLevel1",
                 "PrivilegeLevel2",
-                "PrivilegeLevel3"
+                "PrivilegeLevel3",
+                "PrivilegeLevelCustom"
             ]
         },
         "schema.PrivilegeOption": {
@@ -9074,6 +9121,10 @@ const docTemplate = `{
                 "theme"
             ],
             "properties": {
+                "color_scheme": {
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "theme": {
                     "type": "string",
                     "maxLength": 255
@@ -9087,6 +9138,9 @@ const docTemplate = `{
         "schema.SiteThemeResp": {
             "type": "object",
             "properties": {
+                "color_scheme": {
+                    "type": "string"
+                },
                 "theme": {
                     "type": "string"
                 },
@@ -9435,8 +9489,13 @@ const docTemplate = `{
                 "level"
             ],
             "properties": {
+                "custom_privileges": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/constant.Privilege"
+                    }
+                },
                 "level": {
-                    "maximum": 3,
                     "minimum": 1,
                     "allOf": [
                         {
@@ -9542,9 +9601,15 @@ const docTemplate = `{
         "schema.UpdateUserInterfaceRequest": {
             "type": "object",
             "required": [
+                "color_scheme",
                 "language"
             ],
             "properties": {
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "language": {
                     "description": "language",
                     "type": "string",
@@ -9652,6 +9717,9 @@ const docTemplate = `{
                 "id": {
                     "type": "string"
                 },
+                "language": {
+                    "type": "string"
+                },
                 "location": {
                     "type": "string"
                 },
@@ -9757,6 +9825,10 @@ const docTemplate = `{
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
diff --git a/docs/swagger.json b/docs/swagger.json
index 83bde221..41858d60 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -504,117 +504,6 @@
                 }
             }
         },
-        "/answer/admin/api/report/": {
-            "put": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "handle flag",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "admin"
-                ],
-                "summary": "handle flag",
-                "parameters": [
-                    {
-                        "description": "flag",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/schema.ReportHandleReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
-        "/answer/admin/api/reports/page": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "list report records",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "admin"
-                ],
-                "summary": "list report page",
-                "parameters": [
-                    {
-                        "enum": [
-                            "pending",
-                            "completed"
-                        ],
-                        "type": "string",
-                        "description": "status",
-                        "name": "status",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "enum": [
-                            "all",
-                            "question",
-                            "answer",
-                            "comment"
-                        ],
-                        "type": "string",
-                        "description": "object_type",
-                        "name": "object_type",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page_size",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/handler.RespBody"
-                        }
-                    }
-                }
-            }
-        },
         "/answer/admin/api/roles": {
             "get": {
                 "description": "get role list",
@@ -4435,6 +4324,157 @@
                 }
             }
         },
+        "/answer/api/v1/report/": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "handle flag",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Report"
+                ],
+                "summary": "handle flag",
+                "parameters": [
+                    {
+                        "description": "flag",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.ReportHandleReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/reports/page": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "list report records",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Report"
+                ],
+                "summary": "list report page",
+                "parameters": [
+                    {
+                        "enum": [
+                            "pending",
+                            "completed"
+                        ],
+                        "type": "string",
+                        "description": "status",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "enum": [
+                            "all",
+                            "question",
+                            "answer",
+                            "comment"
+                        ],
+                        "type": "string",
+                        "description": "object_type",
+                        "name": "object_type",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "page size",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "page size",
+                        "name": "page_size",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/handler.RespBody"
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/reviewing/type": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "get reviewing type",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Revision"
+                ],
+                "summary": "get reviewing type",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/schema.GetReviewingTypeResp"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/revisions": {
             "get": {
                 "description": "get revision list",
@@ -6523,7 +6563,8 @@
                     "type": "string"
                 },
                 "value": {
-                    "type": "integer"
+                    "type": "integer",
+                    "minimum": 1
                 }
             }
         },
@@ -7063,6 +7104,12 @@
                 "action": {
                     "$ref": "#/definitions/schema.UIOptionAction"
                 },
+                "class_name": {
+                    "type": "string"
+                },
+                "field_class_name": {
+                    "type": "string"
+                },
                 "input_type": {
                     "type": "string"
                 },
@@ -7343,6 +7390,10 @@
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
@@ -7655,6 +7706,20 @@
                 }
             }
         },
+        "schema.GetReviewingTypeResp": {
+            "type": "object",
+            "properties": {
+                "label": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "todo_amount": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.GetRevisionResp": {
             "type": "object",
             "properties": {
@@ -8130,12 +8195,14 @@
             "enum": [
                 1,
                 2,
-                3
+                3,
+                99
             ],
             "x-enum-varnames": [
                 "PrivilegeLevel1",
                 "PrivilegeLevel2",
-                "PrivilegeLevel3"
+                "PrivilegeLevel3",
+                "PrivilegeLevelCustom"
             ]
         },
         "schema.PrivilegeOption": {
@@ -9043,6 +9110,10 @@
                 "theme"
             ],
             "properties": {
+                "color_scheme": {
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "theme": {
                     "type": "string",
                     "maxLength": 255
@@ -9056,6 +9127,9 @@
         "schema.SiteThemeResp": {
             "type": "object",
             "properties": {
+                "color_scheme": {
+                    "type": "string"
+                },
                 "theme": {
                     "type": "string"
                 },
@@ -9404,8 +9478,13 @@
                 "level"
             ],
             "properties": {
+                "custom_privileges": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/constant.Privilege"
+                    }
+                },
                 "level": {
-                    "maximum": 3,
                     "minimum": 1,
                     "allOf": [
                         {
@@ -9511,9 +9590,15 @@
         "schema.UpdateUserInterfaceRequest": {
             "type": "object",
             "required": [
+                "color_scheme",
                 "language"
             ],
             "properties": {
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "language": {
                     "description": "language",
                     "type": "string",
@@ -9621,6 +9706,9 @@
                 "id": {
                     "type": "string"
                 },
+                "language": {
+                    "type": "string"
+                },
                 "location": {
                     "type": "string"
                 },
@@ -9726,6 +9814,10 @@
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ca78bc49..40331dcf 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 definitions:
   constant.NotificationChannelKey:
     enum:
@@ -29,6 +12,7 @@ definitions:
       label:
         type: string
       value:
+        minimum: 1
         type: integer
     type: object
   handler.RespBody:
@@ -403,6 +387,10 @@ definitions:
     properties:
       action:
         $ref: '#/definitions/schema.UIOptionAction'
+      class_name:
+        type: string
+      field_class_name:
+        type: string
       input_type:
         type: string
       label:
@@ -603,6 +591,9 @@ definitions:
       bio_html:
         description: bio html
         type: string
+      color_scheme:
+        description: Color scheme
+        type: string
       created_at:
         description: create time
         type: integer
@@ -828,6 +819,15 @@ definitions:
         description: url title
         type: string
     type: object
+  schema.GetReviewingTypeResp:
+    properties:
+      label:
+        type: string
+      name:
+        type: string
+      todo_amount:
+        type: integer
+    type: object
   schema.GetRevisionResp:
     properties:
       content:
@@ -1156,11 +1156,13 @@ definitions:
     - 1
     - 2
     - 3
+    - 99
     type: integer
     x-enum-varnames:
     - PrivilegeLevel1
     - PrivilegeLevel2
     - PrivilegeLevel3
+    - PrivilegeLevelCustom
   schema.PrivilegeOption:
     properties:
       level:
@@ -1783,6 +1785,9 @@ definitions:
     type: object
   schema.SiteThemeReq:
     properties:
+      color_scheme:
+        maxLength: 100
+        type: string
       theme:
         maxLength: 255
         type: string
@@ -1794,6 +1799,8 @@ definitions:
     type: object
   schema.SiteThemeResp:
     properties:
+      color_scheme:
+        type: string
       theme:
         type: string
       theme_config:
@@ -2030,10 +2037,13 @@ definitions:
     type: object
   schema.UpdatePrivilegesConfigReq:
     properties:
+      custom_privileges:
+        items:
+          $ref: '#/definitions/constant.Privilege'
+        type: array
       level:
         allOf:
         - $ref: '#/definitions/schema.PrivilegeLevel'
-        maximum: 3
         minimum: 1
     required:
     - level
@@ -2107,11 +2117,16 @@ definitions:
     type: object
   schema.UpdateUserInterfaceRequest:
     properties:
+      color_scheme:
+        description: Color scheme
+        maxLength: 100
+        type: string
       language:
         description: language
         maxLength: 100
         type: string
     required:
+    - color_scheme
     - language
     type: object
   schema.UpdateUserNotificationConfigReq:
@@ -2183,6 +2198,8 @@ definitions:
         type: string
       id:
         type: string
+      language:
+        type: string
       location:
         type: string
       rank:
@@ -2257,6 +2274,9 @@ definitions:
       bio_html:
         description: bio html
         type: string
+      color_scheme:
+        description: Color scheme
+        type: string
       created_at:
         description: create time
         type: integer
@@ -2772,76 +2792,6 @@ paths:
       summary: get reasons by object type and action
       tags:
       - reason
-  /answer/admin/api/report/:
-    put:
-      consumes:
-      - application/json
-      description: handle flag
-      parameters:
-      - description: flag
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/schema.ReportHandleReq'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.RespBody'
-      security:
-      - ApiKeyAuth: []
-      - ApiKeyAuth: []
-      summary: handle flag
-      tags:
-      - admin
-  /answer/admin/api/reports/page:
-    get:
-      consumes:
-      - application/json
-      description: list report records
-      parameters:
-      - description: status
-        enum:
-        - pending
-        - completed
-        in: query
-        name: status
-        required: true
-        type: string
-      - description: object_type
-        enum:
-        - all
-        - question
-        - answer
-        - comment
-        in: query
-        name: object_type
-        required: true
-        type: string
-      - description: page size
-        in: query
-        name: page
-        type: integer
-      - description: page size
-        in: query
-        name: page_size
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/handler.RespBody'
-      security:
-      - ApiKeyAuth: []
-      - ApiKeyAuth: []
-      summary: list report page
-      tags:
-      - admin
   /answer/admin/api/roles:
     get:
       description: get role list
@@ -5147,6 +5097,98 @@ paths:
       summary: add report
       tags:
       - Report
+  /answer/api/v1/report/:
+    put:
+      consumes:
+      - application/json
+      description: handle flag
+      parameters:
+      - description: flag
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/schema.ReportHandleReq'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RespBody'
+      security:
+      - ApiKeyAuth: []
+      - ApiKeyAuth: []
+      summary: handle flag
+      tags:
+      - Report
+  /answer/api/v1/reports/page:
+    get:
+      consumes:
+      - application/json
+      description: list report records
+      parameters:
+      - description: status
+        enum:
+        - pending
+        - completed
+        in: query
+        name: status
+        required: true
+        type: string
+      - description: object_type
+        enum:
+        - all
+        - question
+        - answer
+        - comment
+        in: query
+        name: object_type
+        required: true
+        type: string
+      - description: page size
+        in: query
+        name: page
+        type: integer
+      - description: page size
+        in: query
+        name: page_size
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/handler.RespBody'
+      security:
+      - ApiKeyAuth: []
+      - ApiKeyAuth: []
+      summary: list report page
+      tags:
+      - Report
+  /answer/api/v1/reviewing/type:
+    get:
+      description: get reviewing type
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/schema.GetReviewingTypeResp'
+                  type: array
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: get reviewing type
+      tags:
+      - Revision
   /answer/api/v1/revisions:
     get:
       description: get revision list
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index e0765154..a2efbc2d 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -31,6 +31,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/permission"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/report"
+	"github.com/apache/incubator-answer/pkg/converter"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
@@ -103,3 +104,61 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {
 	}
 	handler.HandleResponse(ctx, err, nil)
 }
+
+// ListReportPage godoc
+// @Summary list report page
+// @Description list report records
+// @Security ApiKeyAuth
+// @Tags Report
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param status query string true "status" Enums(pending, completed)
+// @Param object_type query string true "object_type" Enums(all, question,answer,comment)
+// @Param page query int false "page size"
+// @Param page_size query int false "page size"
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/reports/page [get]
+func (rc *ReportController) ListReportPage(ctx *gin.Context) {
+	var (
+		objectType = ctx.Query("object_type")
+		status     = ctx.Query("status")
+		page       = converter.StringToInt(ctx.DefaultQuery("page", "1"))
+		pageSize   = converter.StringToInt(ctx.DefaultQuery("page_size", "20"))
+	)
+
+	dto := schema.GetReportListPageDTO{
+		ObjectType: objectType,
+		Status:     status,
+		Page:       page,
+		PageSize:   pageSize,
+	}
+
+	resp, err := rc.reportService.ListReportPage(ctx, dto)
+	if err != nil {
+		handler.HandleResponse(ctx, err, schema.ErrTypeModal)
+	} else {
+		handler.HandleResponse(ctx, err, resp)
+	}
+}
+
+// Handle godoc
+// @Summary handle flag
+// @Description handle flag
+// @Security ApiKeyAuth
+// @Tags Report
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param data body schema.ReportHandleReq true "flag"
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/report/ [put]
+func (rc *ReportController) Handle(ctx *gin.Context) {
+	req := schema.ReportHandleReq{}
+	if handler.BindAndCheck(ctx, &req) {
+		return
+	}
+
+	err := rc.reportService.HandleReported(ctx, req)
+	handler.HandleResponse(ctx, err, nil)
+}
diff --git a/internal/controller_admin/controller.go b/internal/controller_admin/controller.go
index f51c62a0..de87d105 100644
--- a/internal/controller_admin/controller.go
+++ b/internal/controller_admin/controller.go
@@ -23,7 +23,6 @@ import "github.com/google/wire"
 
 // ProviderSetController is controller providers.
 var ProviderSetController = wire.NewSet(
-	NewReportController,
 	NewUserAdminController,
 	NewThemeController,
 	NewSiteInfoController,
diff --git a/internal/controller_admin/report_controller.go b/internal/controller_admin/report_controller.go
deleted file mode 100644
index 435b5af8..00000000
--- a/internal/controller_admin/report_controller.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package controller_admin
-
-import (
-	"github.com/apache/incubator-answer/internal/base/handler"
-	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service/report_admin"
-	"github.com/apache/incubator-answer/pkg/converter"
-	"github.com/gin-gonic/gin"
-)
-
-// ReportController report controller
-type ReportController struct {
-	reportService *report_admin.ReportAdminService
-}
-
-// NewReportController new controller
-func NewReportController(reportService *report_admin.ReportAdminService) *ReportController {
-	return &ReportController{reportService: reportService}
-}
-
-// ListReportPage godoc
-// @Summary list report page
-// @Description list report records
-// @Security ApiKeyAuth
-// @Tags admin
-// @Accept json
-// @Produce json
-// @Security ApiKeyAuth
-// @Param status query string true "status" Enums(pending, completed)
-// @Param object_type query string true "object_type" Enums(all, question,answer,comment)
-// @Param page query int false "page size"
-// @Param page_size query int false "page size"
-// @Success 200 {object} handler.RespBody
-// @Router /answer/admin/api/reports/page [get]
-func (rc *ReportController) ListReportPage(ctx *gin.Context) {
-	var (
-		objectType = ctx.Query("object_type")
-		status     = ctx.Query("status")
-		page       = converter.StringToInt(ctx.DefaultQuery("page", "1"))
-		pageSize   = converter.StringToInt(ctx.DefaultQuery("page_size", "20"))
-	)
-
-	dto := schema.GetReportListPageDTO{
-		ObjectType: objectType,
-		Status:     status,
-		Page:       page,
-		PageSize:   pageSize,
-	}
-
-	resp, err := rc.reportService.ListReportPage(ctx, dto)
-	if err != nil {
-		handler.HandleResponse(ctx, err, schema.ErrTypeModal)
-	} else {
-		handler.HandleResponse(ctx, err, resp)
-	}
-}
-
-// Handle godoc
-// @Summary handle flag
-// @Description handle flag
-// @Security ApiKeyAuth
-// @Tags admin
-// @Accept json
-// @Produce json
-// @Security ApiKeyAuth
-// @Param data body schema.ReportHandleReq true "flag"
-// @Success 200 {object} handler.RespBody
-// @Router /answer/admin/api/report/ [put]
-func (rc *ReportController) Handle(ctx *gin.Context) {
-	req := schema.ReportHandleReq{}
-	if handler.BindAndCheck(ctx, &req) {
-		return
-	}
-
-	err := rc.reportService.HandleReported(ctx, req)
-	handler.HandleResponse(ctx, err, nil)
-}
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 0469103e..2895d103 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -40,7 +40,6 @@ type AnswerAPIRouter struct {
 	searchController        *controller.SearchController
 	revisionController      *controller.RevisionController
 	rankController          *controller.RankController
-	adminReportController   *controller_admin.ReportController
 	adminUserController     *controller_admin.UserAdminController
 	reasonController        *controller.ReasonController
 	themeController         *controller_admin.ThemeController
@@ -70,7 +69,6 @@ func NewAnswerAPIRouter(
 	searchController *controller.SearchController,
 	revisionController *controller.RevisionController,
 	rankController *controller.RankController,
-	adminReportController *controller_admin.ReportController,
 	adminUserController *controller_admin.UserAdminController,
 	reasonController *controller.ReasonController,
 	themeController *controller_admin.ThemeController,
@@ -99,7 +97,6 @@ func NewAnswerAPIRouter(
 		searchController:        searchController,
 		revisionController:      revisionController,
 		rankController:          rankController,
-		adminReportController:   adminReportController,
 		adminUserController:     adminUserController,
 		reasonController:        reasonController,
 		themeController:         themeController,
@@ -279,6 +276,10 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	r.GET("/user/plugin/configs", a.userPluginController.GetUserPluginList)
 	r.GET("/user/plugin/config", a.userPluginController.GetUserPluginConfig)
 	r.PUT("/user/plugin/config", a.userPluginController.UpdatePluginUserConfig)
+
+	// report
+	r.GET("/reports/page", a.reportController.ListReportPage)
+	r.PUT("/report", a.reportController.Handle)
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerAdminAPIRouter(r *gin.RouterGroup) {
@@ -287,10 +288,6 @@ func (a *AnswerAPIRouter) RegisterAnswerAdminAPIRouter(r *gin.RouterGroup) {
 	r.GET("/answer/page", a.questionController.AdminAnswerPage)
 	r.PUT("/answer/status", a.answerController.AdminUpdateAnswerStatus)
 
-	// report
-	r.GET("/reports/page", a.adminReportController.ListReportPage)
-	r.PUT("/report", a.adminReportController.Handle)
-
 	// user
 	r.GET("/users/page", a.adminUserController.GetUserPage)
 	r.PUT("/user/status", a.adminUserController.UpdateUserStatus)
diff --git a/internal/service/provider.go b/internal/service/provider.go
index 38b9cd72..462d2ce4 100644
--- a/internal/service/provider.go
+++ b/internal/service/provider.go
@@ -43,8 +43,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/reason"
 	"github.com/apache/incubator-answer/internal/service/report"
-	"github.com/apache/incubator-answer/internal/service/report_admin"
-	"github.com/apache/incubator-answer/internal/service/report_handle_admin"
+	"github.com/apache/incubator-answer/internal/service/report_handle"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	"github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
@@ -89,8 +88,7 @@ var ProviderSetService = wire.NewSet(
 	NewSearchService,
 	meta.NewMetaService,
 	object_info.NewObjService,
-	report_handle_admin.NewReportHandle,
-	report_admin.NewReportAdminService,
+	report_handle.NewReportHandle,
 	user_admin.NewUserAdminService,
 	reason.NewReasonService,
 	siteinfo_common.NewSiteInfoCommonService,
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 55ac4272..287ad57b 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -20,11 +20,25 @@
 package report
 
 import (
+	"encoding/json"
+	"github.com/apache/incubator-answer/internal/base/handler"
+	"github.com/apache/incubator-answer/internal/base/pager"
+	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
+	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
+	"github.com/apache/incubator-answer/internal/service/comment_common"
+	"github.com/apache/incubator-answer/internal/service/config"
 	"github.com/apache/incubator-answer/internal/service/object_info"
+	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/report_common"
+	"github.com/apache/incubator-answer/internal/service/report_handle"
+	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/obj"
+	"github.com/jinzhu/copier"
+	"github.com/segmentfault/pacman/errors"
+	"github.com/segmentfault/pacman/log"
 	"golang.org/x/net/context"
 )
 
@@ -32,15 +46,34 @@ import (
 type ReportService struct {
 	reportRepo        report_common.ReportRepo
 	objectInfoService *object_info.ObjService
+	commonUser        *usercommon.UserCommon
+	answerRepo        answercommon.AnswerRepo
+	questionRepo      questioncommon.QuestionRepo
+	commentCommonRepo comment_common.CommentCommonRepo
+	reportHandle      *report_handle.ReportHandle
+	configService     *config.ConfigService
 }
 
 // NewReportService new report service
-func NewReportService(reportRepo report_common.ReportRepo,
+func NewReportService(
+	reportRepo report_common.ReportRepo,
 	objectInfoService *object_info.ObjService,
+	commonUser *usercommon.UserCommon,
+	answerRepo answercommon.AnswerRepo,
+	questionRepo questioncommon.QuestionRepo,
+	commentCommonRepo comment_common.CommentCommonRepo,
+	reportHandle *report_handle.ReportHandle,
+	configService *config.ConfigService,
 ) *ReportService {
 	return &ReportService{
 		reportRepo:        reportRepo,
 		objectInfoService: objectInfoService,
+		commonUser:        commonUser,
+		answerRepo:        answerRepo,
+		questionRepo:      questionRepo,
+		commentCommonRepo: commentCommonRepo,
+		reportHandle:      reportHandle,
+		configService:     configService,
 	}
 }
 
@@ -68,3 +101,119 @@ func (rs *ReportService) AddReport(ctx context.Context, req *schema.AddReportReq
 	}
 	return rs.reportRepo.AddReport(ctx, report)
 }
+
+// ListReportPage list report pages
+func (rs *ReportService) ListReportPage(ctx context.Context, dto schema.GetReportListPageDTO) (pageModel *pager.PageModel, err error) {
+	var (
+		resp  []*schema.GetReportListPageResp
+		flags []entity.Report
+		total int64
+
+		flaggedUserIds,
+		userIds []string
+
+		flaggedUsers,
+		users map[string]*schema.UserBasicInfo
+	)
+
+	flags, total, err = rs.reportRepo.GetReportListPage(ctx, dto)
+	if err != nil {
+		return
+	}
+
+	_ = copier.Copy(&resp, flags)
+	for _, r := range resp {
+		flaggedUserIds = append(flaggedUserIds, r.ReportedUserID)
+		userIds = append(userIds, r.UserID)
+		r.Format()
+	}
+
+	// flagged users
+	flaggedUsers, err = rs.commonUser.BatchUserBasicInfoByID(ctx, flaggedUserIds)
+	if err != nil {
+		return nil, err
+	}
+
+	// flag users
+	users, err = rs.commonUser.BatchUserBasicInfoByID(ctx, userIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, r := range resp {
+		r.ReportedUser = flaggedUsers[r.ReportedUserID]
+		r.ReportUser = users[r.UserID]
+		rs.decorateReportResp(ctx, r)
+	}
+	return pager.NewPageModel(total, resp), nil
+}
+
+// HandleReported handle the reported object
+func (rs *ReportService) HandleReported(ctx context.Context, req schema.ReportHandleReq) (err error) {
+	var (
+		reported   *entity.Report
+		handleData = entity.Report{
+			FlaggedContent: req.FlaggedContent,
+			FlaggedType:    req.FlaggedType,
+			Status:         entity.ReportStatusCompleted,
+		}
+		exist bool
+	)
+
+	reported, exist, err = rs.reportRepo.GetByID(ctx, req.ID)
+	if err != nil {
+		err = errors.BadRequest(reason.ReportHandleFailed).WithError(err).WithStack()
+		return
+	}
+	if !exist {
+		err = errors.NotFound(reason.ReportNotFound)
+		return
+	}
+
+	// check if handle or not
+	if reported.Status != entity.ReportStatusPending {
+		return
+	}
+
+	if err = rs.reportHandle.HandleObject(ctx, reported, req); err != nil {
+		return
+	}
+
+	err = rs.reportRepo.UpdateByID(ctx, reported.ID, handleData)
+	return
+}
+
+func (rs *ReportService) decorateReportResp(ctx context.Context, resp *schema.GetReportListPageResp) {
+	lang := handler.GetLangByCtx(ctx)
+	objectInfo, err := rs.objectInfoService.GetInfo(ctx, resp.ObjectID)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	resp.QuestionID = objectInfo.QuestionID
+	resp.AnswerID = objectInfo.AnswerID
+	resp.CommentID = objectInfo.CommentID
+	resp.Title = objectInfo.Title
+	resp.Excerpt = htmltext.FetchExcerpt(objectInfo.Content, "...", 240)
+
+	if resp.ReportType > 0 {
+		resp.Reason = &schema.ReasonItem{ReasonType: resp.ReportType}
+		cf, err := rs.configService.GetConfigByID(ctx, resp.ReportType)
+		if err != nil {
+			log.Error(err)
+		} else {
+			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
+			resp.Reason.Translate(cf.Key, lang)
+		}
+	}
+	if resp.FlaggedType > 0 {
+		resp.FlaggedReason = &schema.ReasonItem{ReasonType: resp.FlaggedType}
+		cf, err := rs.configService.GetConfigByID(ctx, resp.FlaggedType)
+		if err != nil {
+			log.Error(err)
+		} else {
+			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
+			resp.Reason.Translate(cf.Key, lang)
+		}
+	}
+}
diff --git a/internal/service/report_admin/report_backyard.go b/internal/service/report_admin/report_backyard.go
deleted file mode 100644
index 3b141796..00000000
--- a/internal/service/report_admin/report_backyard.go
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package report_admin
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/apache/incubator-answer/internal/base/handler"
-	"github.com/apache/incubator-answer/internal/service/config"
-	"github.com/apache/incubator-answer/internal/service/object_info"
-	"github.com/apache/incubator-answer/pkg/htmltext"
-	"github.com/segmentfault/pacman/log"
-
-	"github.com/apache/incubator-answer/internal/base/pager"
-	"github.com/apache/incubator-answer/internal/base/reason"
-	"github.com/apache/incubator-answer/internal/entity"
-	"github.com/apache/incubator-answer/internal/schema"
-	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
-	"github.com/apache/incubator-answer/internal/service/comment_common"
-	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
-	"github.com/apache/incubator-answer/internal/service/report_common"
-	"github.com/apache/incubator-answer/internal/service/report_handle_admin"
-	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
-	"github.com/jinzhu/copier"
-	"github.com/segmentfault/pacman/errors"
-)
-
-// ReportAdminService user service
-type ReportAdminService struct {
-	reportRepo        report_common.ReportRepo
-	commonUser        *usercommon.UserCommon
-	answerRepo        answercommon.AnswerRepo
-	questionRepo      questioncommon.QuestionRepo
-	commentCommonRepo comment_common.CommentCommonRepo
-	reportHandle      *report_handle_admin.ReportHandle
-	configService     *config.ConfigService
-	objectInfoService *object_info.ObjService
-}
-
-// NewReportAdminService new report service
-func NewReportAdminService(
-	reportRepo report_common.ReportRepo,
-	commonUser *usercommon.UserCommon,
-	answerRepo answercommon.AnswerRepo,
-	questionRepo questioncommon.QuestionRepo,
-	commentCommonRepo comment_common.CommentCommonRepo,
-	reportHandle *report_handle_admin.ReportHandle,
-	configService *config.ConfigService,
-	objectInfoService *object_info.ObjService) *ReportAdminService {
-	return &ReportAdminService{
-		reportRepo:        reportRepo,
-		commonUser:        commonUser,
-		answerRepo:        answerRepo,
-		questionRepo:      questionRepo,
-		commentCommonRepo: commentCommonRepo,
-		reportHandle:      reportHandle,
-		configService:     configService,
-		objectInfoService: objectInfoService,
-	}
-}
-
-// ListReportPage list report pages
-func (rs *ReportAdminService) ListReportPage(ctx context.Context, dto schema.GetReportListPageDTO) (pageModel *pager.PageModel, err error) {
-	var (
-		resp  []*schema.GetReportListPageResp
-		flags []entity.Report
-		total int64
-
-		flaggedUserIds,
-		userIds []string
-
-		flaggedUsers,
-		users map[string]*schema.UserBasicInfo
-	)
-
-	flags, total, err = rs.reportRepo.GetReportListPage(ctx, dto)
-	if err != nil {
-		return
-	}
-
-	_ = copier.Copy(&resp, flags)
-	for _, r := range resp {
-		flaggedUserIds = append(flaggedUserIds, r.ReportedUserID)
-		userIds = append(userIds, r.UserID)
-		r.Format()
-	}
-
-	// flagged users
-	flaggedUsers, err = rs.commonUser.BatchUserBasicInfoByID(ctx, flaggedUserIds)
-	if err != nil {
-		return nil, err
-	}
-
-	// flag users
-	users, err = rs.commonUser.BatchUserBasicInfoByID(ctx, userIds)
-	if err != nil {
-		return nil, err
-	}
-	for _, r := range resp {
-		r.ReportedUser = flaggedUsers[r.ReportedUserID]
-		r.ReportUser = users[r.UserID]
-		rs.decorateReportResp(ctx, r)
-	}
-	return pager.NewPageModel(total, resp), nil
-}
-
-// HandleReported handle the reported object
-func (rs *ReportAdminService) HandleReported(ctx context.Context, req schema.ReportHandleReq) (err error) {
-	var (
-		reported   *entity.Report
-		handleData = entity.Report{
-			FlaggedContent: req.FlaggedContent,
-			FlaggedType:    req.FlaggedType,
-			Status:         entity.ReportStatusCompleted,
-		}
-		exist bool
-	)
-
-	reported, exist, err = rs.reportRepo.GetByID(ctx, req.ID)
-	if err != nil {
-		err = errors.BadRequest(reason.ReportHandleFailed).WithError(err).WithStack()
-		return
-	}
-	if !exist {
-		err = errors.NotFound(reason.ReportNotFound)
-		return
-	}
-
-	// check if handle or not
-	if reported.Status != entity.ReportStatusPending {
-		return
-	}
-
-	if err = rs.reportHandle.HandleObject(ctx, reported, req); err != nil {
-		return
-	}
-
-	err = rs.reportRepo.UpdateByID(ctx, reported.ID, handleData)
-	return
-}
-
-func (rs *ReportAdminService) decorateReportResp(ctx context.Context, resp *schema.GetReportListPageResp) {
-	lang := handler.GetLangByCtx(ctx)
-	objectInfo, err := rs.objectInfoService.GetInfo(ctx, resp.ObjectID)
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	resp.QuestionID = objectInfo.QuestionID
-	resp.AnswerID = objectInfo.AnswerID
-	resp.CommentID = objectInfo.CommentID
-	resp.Title = objectInfo.Title
-	resp.Excerpt = htmltext.FetchExcerpt(objectInfo.Content, "...", 240)
-
-	if resp.ReportType > 0 {
-		resp.Reason = &schema.ReasonItem{ReasonType: resp.ReportType}
-		cf, err := rs.configService.GetConfigByID(ctx, resp.ReportType)
-		if err != nil {
-			log.Error(err)
-		} else {
-			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
-			resp.Reason.Translate(cf.Key, lang)
-		}
-	}
-	if resp.FlaggedType > 0 {
-		resp.FlaggedReason = &schema.ReasonItem{ReasonType: resp.FlaggedType}
-		cf, err := rs.configService.GetConfigByID(ctx, resp.FlaggedType)
-		if err != nil {
-			log.Error(err)
-		} else {
-			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
-			resp.Reason.Translate(cf.Key, lang)
-		}
-	}
-}
diff --git a/internal/service/report_handle_admin/report_handle.go b/internal/service/report_handle/report_handle.go
similarity index 99%
rename from internal/service/report_handle_admin/report_handle.go
rename to internal/service/report_handle/report_handle.go
index 37170396..8b51d7fa 100644
--- a/internal/service/report_handle_admin/report_handle.go
+++ b/internal/service/report_handle/report_handle.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package report_handle_admin
+package report_handle
 
 import (
 	"context"

From 652f5de7c7c9b17a4dd04f5eed6d0412b68d5d17 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 5 Mar 2024 16:03:31 +0800
Subject: [PATCH 020/114] fix: split main.js  #809 #784

---
 ui/config-overrides.js                        |  86 +++++++++++++++
 ui/package.json                               |   2 +
 ui/pnpm-lock.yaml                             | 100 ++++++++++++------
 ui/src/components/Comment/index.tsx           |   2 +-
 ui/src/components/SchemaForm/index.tsx        |   2 +-
 ui/src/hooks/usePageUsers/index.tsx           |   2 +-
 ui/src/i18n/init.ts                           |   8 +-
 ui/src/pages/Admin/index.tsx                  |   2 +-
 ui/src/pages/Questions/Ask/index.tsx          |   3 +-
 .../components/Achievements/index.tsx         |   2 +-
 .../Notifications/components/Inbox/index.tsx  |   2 +-
 ui/src/utils/common.ts                        |  43 ++++----
 ui/src/utils/saveDraft.ts                     |   2 +-
 13 files changed, 190 insertions(+), 66 deletions(-)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 293d6bc1..19698173 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -20,6 +20,7 @@
 const {
   addWebpackModuleRule,
   addWebpackAlias,
+  setWebpackOptimizationSplitChunks,
 } = require("customize-cra");
 
 const path = require("path");
@@ -37,6 +38,91 @@ module.exports = {
       use: "yaml-loader"
     })(config);
 
+    setWebpackOptimizationSplitChunks({
+      maxInitialRequests: 20,
+      minSize: 20 * 1024,
+      minChunks: 2,
+      cacheGroups: {
+        automaticNamePrefix: 'chunk',
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 13,
+          minChunks: 2,
+          reuseExistingChunk: true,
+          enforce: true,
+        },
+        commons: {
+          test: /[\\/]common[\\/]/,
+          name: 'common',
+          priority: 12,
+          minChunks: 2,
+          reuseExistingChunk: true,
+          enforce: true,
+        },
+        i18next: {
+          name: 'i18next',
+          test: /[\/]node_modules[\/](i18next)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 11,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        reactBootstrap: {
+          name: 'react-bootstrap',
+          test: /[\/]node_modules[\/](react-bootstrap)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 10,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+        codemirror: {
+          name: 'codemirror',
+          test: /[\/]node_modules[\/](codemirror)[\/]/,
+          priority: 9,
+          reuseExistingChunk: true,
+          enforce: true,
+        },
+        nextShare: {
+          name: 'next-share',
+          test: /[\/]node_modules[\/](next-share)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 8,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        marked: {
+          name: 'marked',
+          test: /[\/]node_modules[\/](marked)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        nodesAsync: {
+          name: 'chunk-nodesAsync',
+          test: /[\/]node_modules[\/]/,
+          priority: 2,
+          minChunks: 2,
+          chunks: 'async', // 仅打包异步引用的依赖
+          reuseExistingChunk: true, // 重复使用已经存在的块
+        },
+        nodesInitial: {
+          name: 'chunk-nodesInitial',
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          test: /[\/]node_modules[\/]/,
+          priority: 1,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+      },
+    })(config);
+
     // add i18n dir to ModuleScopePlugin allowedPaths
     const moduleScopePlugin = config.resolve.plugins.find(_ => _.constructor.name === "ModuleScopePlugin");
     if (moduleScopePlugin) {
diff --git a/ui/package.json b/ui/package.json
index ac7e4411..99543e12 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "homepage": "/",
   "scripts": {
+    "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
     "lint": "eslint . --cache --fix --ext .ts,.tsx",
@@ -38,6 +39,7 @@
     "react-i18next": "^11.18.3",
     "react-router-dom": "^6.8.1",
     "semver": "^7.3.8",
+    "source-map-explorer": "^2.5.3",
     "swr": "^1.3.0",
     "zustand": "^4.1.1"
   },
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index 77f3c9b1..a46f8f75 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 lockfileVersion: '6.0'
 
 settings:
@@ -94,6 +77,9 @@ importers:
       semver:
         specifier: ^7.3.8
         version: 7.3.8
+      source-map-explorer:
+        specifier: ^2.5.3
+        version: 2.5.3
       swr:
         specifier: ^1.3.0
         version: 1.3.0(react@18.2.0)
@@ -2223,7 +2209,7 @@ packages:
       chalk: 4.1.2
       emittery: 0.8.1
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-changed-files: 27.5.1
       jest-config: 27.5.1(ts-node@10.9.1)
       jest-haste-map: 27.5.1
@@ -2295,7 +2281,7 @@ packages:
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       istanbul-lib-coverage: 3.2.0
       istanbul-lib-instrument: 5.2.0
       istanbul-lib-report: 3.0.0
@@ -2324,7 +2310,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       callsites: 3.1.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       source-map: 0.6.1
 
   /@jest/test-result@27.5.1:
@@ -2350,7 +2336,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/test-result': 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-runtime: 27.5.1
     transitivePeerDependencies:
@@ -4550,6 +4536,12 @@ packages:
     dependencies:
       node-int64: 0.4.0
 
+  /btoa@1.2.1:
+    resolution: {integrity: sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==}
+    engines: {node: '>= 0.4.0'}
+    hasBin: true
+    dev: false
+
   /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -5914,7 +5906,7 @@ packages:
     resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
     engines: {node: '>=10.13.0'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       tapable: 2.2.1
 
   /enhanced-resolve@5.15.0:
@@ -7899,7 +7891,7 @@ packages:
       '@jest/types': 27.5.1
       chalk: 4.1.2
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       import-local: 3.1.0
       jest-config: 27.5.1(ts-node@10.9.1)
       jest-util: 27.5.1
@@ -7930,7 +7922,7 @@ packages:
       ci-info: 3.4.0
       deepmerge: 4.2.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-circus: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -8034,7 +8026,7 @@ packages:
       '@types/node': 16.11.59
       anymatch: 3.1.2
       fb-watchman: 2.0.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-regex-util: 27.5.1
       jest-serializer: 27.5.1
       jest-util: 27.5.1
@@ -8102,7 +8094,7 @@ packages:
       '@jest/types': 27.5.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 27.5.1
       slash: 3.0.0
@@ -8185,7 +8177,7 @@ packages:
       '@types/node': 16.11.59
       chalk: 4.1.2
       emittery: 0.8.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-docblock: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -8220,7 +8212,7 @@ packages:
       collect-v8-coverage: 1.0.1
       execa: 5.1.1
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
@@ -8238,7 +8230,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@types/node': 16.11.59
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jest-snapshot@27.5.1:
     resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
@@ -8256,7 +8248,7 @@ packages:
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.19.1)
       chalk: 4.1.2
       expect: 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-diff: 27.5.1
       jest-get-type: 27.5.1
       jest-haste-map: 27.5.1
@@ -8277,7 +8269,7 @@ packages:
       '@types/node': 16.11.59
       chalk: 4.1.2
       ci-info: 3.4.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       picomatch: 2.3.1
 
   /jest-util@28.1.3:
@@ -8483,7 +8475,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jsonp@0.2.1:
     resolution: {integrity: sha512-pfog5gdDxPdV4eP7Kg87M8/bHgshlZ5pybl+yKxAnCZ5O7lCIn7Ixydj03wOlnDQesky2BPyA91SQ+5Y/mNwzw==}
@@ -9153,6 +9145,14 @@ packages:
       mimic-fn: 4.0.0
     dev: true
 
+  /open@7.4.2:
+    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
+    engines: {node: '>=8'}
+    dependencies:
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+    dev: false
+
   /open@8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
@@ -10792,6 +10792,13 @@ packages:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
     dev: true
 
+  /rimraf@2.6.3:
+    resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    hasBin: true
+    dependencies:
+      glob: 7.2.3
+    dev: false
+
   /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
@@ -11151,6 +11158,25 @@ packages:
   /source-list-map@2.0.1:
     resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
 
+  /source-map-explorer@2.5.3:
+    resolution: {integrity: sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      btoa: 1.2.1
+      chalk: 4.1.2
+      convert-source-map: 1.8.0
+      ejs: 3.1.8
+      escape-html: 1.0.3
+      glob: 7.2.3
+      gzip-size: 6.0.0
+      lodash: 4.17.21
+      open: 7.4.2
+      source-map: 0.7.4
+      temp: 0.9.4
+      yargs: 16.2.0
+    dev: false
+
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -11593,6 +11619,14 @@ packages:
     resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
     engines: {node: '>=8'}
 
+  /temp@0.9.4:
+    resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      mkdirp: 0.5.6
+      rimraf: 2.6.3
+    dev: false
+
   /tempy@0.6.0:
     resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==}
     engines: {node: '>=10'}
@@ -12184,7 +12218,7 @@ packages:
     engines: {node: '>=10.13.0'}
     dependencies:
       glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /wbuf@1.7.3:
     resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index be2d5553..81345e7e 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -23,7 +23,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
 import classNames from 'classnames';
-import { unionBy } from 'lodash';
+import unionBy from 'lodash/unionBy';
 
 import * as Types from '@/common/interface';
 import { Modal } from '@/components';
diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index 2bb91e31..d0afb692 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -26,7 +26,7 @@ import React, {
 import { Form, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import classnames from 'classnames';
 
 import type * as Type from '@/common/interface';
diff --git a/ui/src/hooks/usePageUsers/index.tsx b/ui/src/hooks/usePageUsers/index.tsx
index 9db172da..c0b3836e 100644
--- a/ui/src/hooks/usePageUsers/index.tsx
+++ b/ui/src/hooks/usePageUsers/index.tsx
@@ -19,7 +19,7 @@
 
 import { useState } from 'react';
 
-import { uniqBy } from 'lodash';
+import uniqBy from 'lodash/uniqBy';
 
 import * as Types from '@/common/interface';
 
diff --git a/ui/src/i18n/init.ts b/ui/src/i18n/init.ts
index 03f775cb..66d9576e 100644
--- a/ui/src/i18n/init.ts
+++ b/ui/src/i18n/init.ts
@@ -21,7 +21,7 @@ import { initReactI18next } from 'react-i18next';
 
 import i18next from 'i18next';
 import en_US from '@i18n/en_US.yaml';
-import zh_CN from '@i18n/zh_CN.yaml';
+// import zh_CN from '@i18n/zh_CN.yaml';
 
 import { DEFAULT_LANG, LANG_RESOURCE_STORAGE_KEY } from '@/common/constants';
 import Storage from '@/utils/storage';
@@ -34,9 +34,9 @@ const initResources = {
   en_US: {
     translation: en_US.ui,
   },
-  zh_CN: {
-    translation: zh_CN.ui,
-  },
+  // zh_CN: {
+  //   translation: zh_CN.ui,
+  // },
 };
 
 const storageLang = Storage.get(LANG_RESOURCE_STORAGE_KEY);
diff --git a/ui/src/pages/Admin/index.tsx b/ui/src/pages/Admin/index.tsx
index 2ce145f9..b527088f 100644
--- a/ui/src/pages/Admin/index.tsx
+++ b/ui/src/pages/Admin/index.tsx
@@ -22,7 +22,7 @@ import { Container, Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Outlet, useMatch } from 'react-router-dom';
 
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 import { usePageTags } from '@/hooks';
 import { AccordionNav } from '@/components';
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 165e061a..9a1ff14a 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -24,7 +24,8 @@ import { useTranslation } from 'react-i18next';
 
 import dayjs from 'dayjs';
 import classNames from 'classnames';
-import { isEqual, debounce } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import debounce from 'lodash/debounce';
 
 import { usePageTags, usePromptWithUnload, useCaptchaModal } from '@/hooks';
 import { Editor, EditorRef, TagSelector } from '@/components';
diff --git a/ui/src/pages/Users/Notifications/components/Achievements/index.tsx b/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
index d8a96ab3..5f2e8f58 100644
--- a/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
+++ b/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
@@ -21,7 +21,7 @@ import { ListGroup } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 import { Empty } from '@/components';
 
diff --git a/ui/src/pages/Users/Notifications/components/Inbox/index.tsx b/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
index 6e6e5c2f..64a2c34b 100644
--- a/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
+++ b/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
@@ -22,7 +22,7 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 import { FormatTime, Empty } from '@/components';
 
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 8458afd1..13644cd0 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -175,8 +175,6 @@ function escapeHtml(str: string) {
   return str.replace(/[&<>"'`]/g, (tag) => tagsToReplace[tag] || tag);
 }
 
-const Diff = require('diff');
-
 function diffText(newText: string, oldText?: string): string {
   if (!newText) {
     return '';
@@ -185,28 +183,31 @@ function diffText(newText: string, oldText?: string): string {
   if (typeof oldText !== 'string') {
     return escapeHtml(newText);
   }
-  const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
-  const result = diff.map((part) => {
-    if (part.added) {
-      if (part.value.replace(/\n/g, '').length <= 0) {
-        return `<span class="review-text-add d-block">${part.value.replace(
-          /\n/g,
-          '↵\n',
-        )}</span>`;
+  let result = [];
+  import('diff').then((Diff) => {
+    const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
+    result = diff.map((part) => {
+      if (part.added) {
+        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">${part.value}</span>`;
       }
-      return `<span class="review-text-add">${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>`;
+      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 `<span class="review-text-delete">${part.value}</span>`;
-    }
 
-    return part.value;
+      return part.value;
+    });
   });
 
   return result.join('');
diff --git a/ui/src/utils/saveDraft.ts b/ui/src/utils/saveDraft.ts
index e2dd7c17..6d7f1814 100644
--- a/ui/src/utils/saveDraft.ts
+++ b/ui/src/utils/saveDraft.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 
 import {
   DRAFT_QUESTION_STORAGE_KEY,

From 3e1b20e9fb8ae9dfa1b12af3c6a0d63ff53b77ff Mon Sep 17 00:00:00 2001
From: sy-records <52o@qq52o.cn>
Date: Mon, 4 Mar 2024 17:30:29 +0800
Subject: [PATCH 021/114] feat: Add a order filter called "Oldest" in answer

---
 i18n/en_US.yaml                                      |  1 +
 i18n/zh_CN.yaml                                      |  1 +
 internal/entity/answer_entity.go                     |  1 +
 internal/repo/answer/answer_repo.go                  |  2 ++
 ui/src/common/interface.ts                           |  2 +-
 .../Questions/Detail/components/AnswerHead/index.tsx | 12 +++++++++++-
 ui/src/pages/Questions/Detail/index.tsx              |  2 +-
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 2d595775..484d62d1 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1079,6 +1079,7 @@ ui:
       title: Answers
       score: Score
       newest: Newest
+      oldest: Oldest
       btn_accept: Accept
       btn_accepted: Accepted
     write_answer:
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index a0b84535..f204860a 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1050,6 +1050,7 @@ ui:
       title: 个回答
       score: 评分
       newest: 最新
+      oldest: 最旧
       btn_accept: 采纳
       btn_accepted: 已被采纳
     write_answer:
diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index e3520b8c..5eec9728 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -25,6 +25,7 @@ const (
 	AnswerSearchOrderByDefault = "default"
 	AnswerSearchOrderByTime    = "updated"
 	AnswerSearchOrderByVote    = "vote"
+	AnswerSearchOrderByTimeAsc = "created"
 
 	AnswerStatusAvailable = 1
 	AnswerStatusDeleted   = 10
diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go
index aca7517c..b34a9600 100644
--- a/internal/repo/answer/answer_repo.go
+++ b/internal/repo/answer/answer_repo.go
@@ -336,6 +336,8 @@ func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearc
 	switch search.Order {
 	case entity.AnswerSearchOrderByTime:
 		session = session.OrderBy("created_at desc")
+	case entity.AnswerSearchOrderByTimeAsc:
+		session = session.OrderBy("created_at asc")
 	case entity.AnswerSearchOrderByVote:
 		session = session.OrderBy("vote_count desc")
 	default:
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 201a5ae0..71b14080 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -250,7 +250,7 @@ export interface QuestionDetailRes {
 }
 
 export interface AnswersReq extends Paging {
-  order?: 'default' | 'updated';
+  order?: 'default' | 'updated' | 'created';
   question_id: string;
 }
 
diff --git a/ui/src/pages/Questions/Detail/components/AnswerHead/index.tsx b/ui/src/pages/Questions/Detail/components/AnswerHead/index.tsx
index c15f44e1..bc81ec37 100644
--- a/ui/src/pages/Questions/Detail/components/AnswerHead/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/AnswerHead/index.tsx
@@ -36,6 +36,10 @@ const sortBtns = [
     name: 'newest',
     sort: 'updated',
   },
+  {
+    name: 'oldest',
+    sort: 'created',
+  },
 ];
 
 const Index: FC<Props> = ({ count = 0, order = 'default' }) => {
@@ -52,7 +56,13 @@ const Index: FC<Props> = ({ count = 0, order = 'default' }) => {
       </h5>
       <QueryGroup
         data={sortBtns}
-        currentSort={order === 'updated' ? 'newest' : 'score'}
+        currentSort={
+          order === 'updated'
+            ? 'newest'
+            : order === 'created'
+              ? 'oldest'
+              : 'score'
+        }
         i18nKeyPrefix="question_detail.answers"
       />
     </div>
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index aac8e184..e0908eac 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -92,7 +92,7 @@ const Index = () => {
 
   const requestAnswers = async () => {
     const res = await getAnswers({
-      order: order === 'updated' ? order : 'default',
+      order: order === 'updated' || order === 'created' ? order : 'default',
       question_id: qid,
       page: 1,
       page_size: 999,

From c014be823b494007c379ece3416512fa9067cef1 Mon Sep 17 00:00:00 2001
From: sy-records <52o@qq52o.cn>
Date: Tue, 5 Mar 2024 17:14:18 +0800
Subject: [PATCH 022/114] chore: sync swagger

---
 docs/docs.go      | 46 ++++++++++++++++++++++++++++++++++++++++++----
 docs/swagger.json | 46 ++++++++++++++++++++++++++++++++++++++++++----
 docs/swagger.yaml | 30 +++++++++++++++++++++++++++++-
 3 files changed, 113 insertions(+), 9 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index dc56880a..ee259828 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -6554,7 +6554,8 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "value": {
-                    "type": "integer"
+                    "type": "integer",
+                    "minimum": 1
                 }
             }
         },
@@ -7094,6 +7095,12 @@ const docTemplate = `{
                 "action": {
                     "$ref": "#/definitions/schema.UIOptionAction"
                 },
+                "class_name": {
+                    "type": "string"
+                },
+                "field_class_name": {
+                    "type": "string"
+                },
                 "input_type": {
                     "type": "string"
                 },
@@ -7374,6 +7381,10 @@ const docTemplate = `{
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
@@ -8161,12 +8172,14 @@ const docTemplate = `{
             "enum": [
                 1,
                 2,
-                3
+                3,
+                99
             ],
             "x-enum-varnames": [
                 "PrivilegeLevel1",
                 "PrivilegeLevel2",
-                "PrivilegeLevel3"
+                "PrivilegeLevel3",
+                "PrivilegeLevelCustom"
             ]
         },
         "schema.PrivilegeOption": {
@@ -9074,6 +9087,10 @@ const docTemplate = `{
                 "theme"
             ],
             "properties": {
+                "color_scheme": {
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "theme": {
                     "type": "string",
                     "maxLength": 255
@@ -9087,6 +9104,9 @@ const docTemplate = `{
         "schema.SiteThemeResp": {
             "type": "object",
             "properties": {
+                "color_scheme": {
+                    "type": "string"
+                },
                 "theme": {
                     "type": "string"
                 },
@@ -9435,8 +9455,13 @@ const docTemplate = `{
                 "level"
             ],
             "properties": {
+                "custom_privileges": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/constant.Privilege"
+                    }
+                },
                 "level": {
-                    "maximum": 3,
                     "minimum": 1,
                     "allOf": [
                         {
@@ -9542,9 +9567,15 @@ const docTemplate = `{
         "schema.UpdateUserInterfaceRequest": {
             "type": "object",
             "required": [
+                "color_scheme",
                 "language"
             ],
             "properties": {
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "language": {
                     "description": "language",
                     "type": "string",
@@ -9652,6 +9683,9 @@ const docTemplate = `{
                 "id": {
                     "type": "string"
                 },
+                "language": {
+                    "type": "string"
+                },
                 "location": {
                     "type": "string"
                 },
@@ -9757,6 +9791,10 @@ const docTemplate = `{
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
diff --git a/docs/swagger.json b/docs/swagger.json
index 83bde221..d65e30bd 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -6523,7 +6523,8 @@
                     "type": "string"
                 },
                 "value": {
-                    "type": "integer"
+                    "type": "integer",
+                    "minimum": 1
                 }
             }
         },
@@ -7063,6 +7064,12 @@
                 "action": {
                     "$ref": "#/definitions/schema.UIOptionAction"
                 },
+                "class_name": {
+                    "type": "string"
+                },
+                "field_class_name": {
+                    "type": "string"
+                },
                 "input_type": {
                     "type": "string"
                 },
@@ -7343,6 +7350,10 @@
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
@@ -8130,12 +8141,14 @@
             "enum": [
                 1,
                 2,
-                3
+                3,
+                99
             ],
             "x-enum-varnames": [
                 "PrivilegeLevel1",
                 "PrivilegeLevel2",
-                "PrivilegeLevel3"
+                "PrivilegeLevel3",
+                "PrivilegeLevelCustom"
             ]
         },
         "schema.PrivilegeOption": {
@@ -9043,6 +9056,10 @@
                 "theme"
             ],
             "properties": {
+                "color_scheme": {
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "theme": {
                     "type": "string",
                     "maxLength": 255
@@ -9056,6 +9073,9 @@
         "schema.SiteThemeResp": {
             "type": "object",
             "properties": {
+                "color_scheme": {
+                    "type": "string"
+                },
                 "theme": {
                     "type": "string"
                 },
@@ -9404,8 +9424,13 @@
                 "level"
             ],
             "properties": {
+                "custom_privileges": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/constant.Privilege"
+                    }
+                },
                 "level": {
-                    "maximum": 3,
                     "minimum": 1,
                     "allOf": [
                         {
@@ -9511,9 +9536,15 @@
         "schema.UpdateUserInterfaceRequest": {
             "type": "object",
             "required": [
+                "color_scheme",
                 "language"
             ],
             "properties": {
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string",
+                    "maxLength": 100
+                },
                 "language": {
                     "description": "language",
                     "type": "string",
@@ -9621,6 +9652,9 @@
                 "id": {
                     "type": "string"
                 },
+                "language": {
+                    "type": "string"
+                },
                 "location": {
                     "type": "string"
                 },
@@ -9726,6 +9760,10 @@
                     "description": "bio html",
                     "type": "string"
                 },
+                "color_scheme": {
+                    "description": "Color scheme",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "create time",
                     "type": "integer"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ca78bc49..21d72673 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -29,6 +29,7 @@ definitions:
       label:
         type: string
       value:
+        minimum: 1
         type: integer
     type: object
   handler.RespBody:
@@ -403,6 +404,10 @@ definitions:
     properties:
       action:
         $ref: '#/definitions/schema.UIOptionAction'
+      class_name:
+        type: string
+      field_class_name:
+        type: string
       input_type:
         type: string
       label:
@@ -603,6 +608,9 @@ definitions:
       bio_html:
         description: bio html
         type: string
+      color_scheme:
+        description: Color scheme
+        type: string
       created_at:
         description: create time
         type: integer
@@ -1156,11 +1164,13 @@ definitions:
     - 1
     - 2
     - 3
+    - 99
     type: integer
     x-enum-varnames:
     - PrivilegeLevel1
     - PrivilegeLevel2
     - PrivilegeLevel3
+    - PrivilegeLevelCustom
   schema.PrivilegeOption:
     properties:
       level:
@@ -1783,6 +1793,9 @@ definitions:
     type: object
   schema.SiteThemeReq:
     properties:
+      color_scheme:
+        maxLength: 100
+        type: string
       theme:
         maxLength: 255
         type: string
@@ -1794,6 +1807,8 @@ definitions:
     type: object
   schema.SiteThemeResp:
     properties:
+      color_scheme:
+        type: string
       theme:
         type: string
       theme_config:
@@ -2030,10 +2045,13 @@ definitions:
     type: object
   schema.UpdatePrivilegesConfigReq:
     properties:
+      custom_privileges:
+        items:
+          $ref: '#/definitions/constant.Privilege'
+        type: array
       level:
         allOf:
         - $ref: '#/definitions/schema.PrivilegeLevel'
-        maximum: 3
         minimum: 1
     required:
     - level
@@ -2107,11 +2125,16 @@ definitions:
     type: object
   schema.UpdateUserInterfaceRequest:
     properties:
+      color_scheme:
+        description: Color scheme
+        maxLength: 100
+        type: string
       language:
         description: language
         maxLength: 100
         type: string
     required:
+    - color_scheme
     - language
     type: object
   schema.UpdateUserNotificationConfigReq:
@@ -2183,6 +2206,8 @@ definitions:
         type: string
       id:
         type: string
+      language:
+        type: string
       location:
         type: string
       rank:
@@ -2257,6 +2282,9 @@ definitions:
       bio_html:
         description: bio html
         type: string
+      color_scheme:
+        description: Color scheme
+        type: string
       created_at:
         description: create time
         type: integer

From 009497ba6558af3c5e76d0d2f5cdecd11a27bf8a Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Wed, 6 Mar 2024 11:07:50 +0800
Subject: [PATCH 023/114] feat(review): Add review report API

---
 cmd/wire_gen.go                               |  29 ++--
 internal/base/constant/revision.go            |   8 +
 internal/base/cron/cron.go                    |   6 +-
 internal/controller/answer_controller.go      |   6 +-
 internal/controller/collection_controller.go  |   6 +-
 internal/controller/question_controller.go    |  13 +-
 internal/controller/report_controller.go      |  84 +++++-----
 internal/controller/revision_controller.go    |   6 +-
 internal/controller/search_controller.go      |   6 +-
 .../controller/template_render/controller.go  |  17 +-
 internal/controller/user_controller.go        |   9 +-
 internal/controller/vote_controller.go        |   6 +-
 internal/entity/report_entity.go              |   1 +
 internal/repo/activity/vote_repo.go           |   7 +-
 .../repo/collection/collection_group_repo.go  |   5 +-
 internal/repo/report/report_repo.go           |  37 +----
 internal/router/answer_api_router.go          |   6 +-
 internal/schema/report_schema.go              |  25 ++-
 .../collection_group_service.go               |   2 +-
 .../{ => collection}/collection_service.go    |   3 +-
 .../service/{ => content}/answer_service.go   |   2 +-
 .../service/{ => content}/question_service.go |   5 +-
 .../service/{ => content}/revision_service.go |   2 +-
 .../service/{ => content}/search_service.go   |   3 +-
 .../service/{ => content}/user_service.go     |   5 +-
 .../service/{ => content}/vote_service.go     |   5 +-
 internal/service/provider.go                  |  18 ++-
 internal/service/report/report_service.go     |  74 ++++-----
 .../service/report_common/report_common.go    |   5 +-
 .../service/report_handle/report_handle.go    | 147 ++++++++++--------
 30 files changed, 277 insertions(+), 271 deletions(-)
 rename internal/service/{ => collection}/collection_group_service.go (99%)
 rename internal/service/{ => collection}/collection_service.go (99%)
 rename internal/service/{ => content}/answer_service.go (99%)
 rename internal/service/{ => content}/question_service.go (99%)
 rename internal/service/{ => content}/revision_service.go (99%)
 rename internal/service/{ => content}/search_service.go (99%)
 rename internal/service/{ => content}/user_service.go (99%)
 rename internal/service/{ => content}/vote_service.go (99%)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 33c943a5..de173cfb 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -44,17 +44,18 @@ import (
 	"github.com/apache/incubator-answer/internal/repo/user_external_login"
 	"github.com/apache/incubator-answer/internal/repo/user_notification_config"
 	"github.com/apache/incubator-answer/internal/router"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
 	activity2 "github.com/apache/incubator-answer/internal/service/activity"
 	activity_common2 "github.com/apache/incubator-answer/internal/service/activity_common"
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
 	"github.com/apache/incubator-answer/internal/service/answer_common"
 	auth2 "github.com/apache/incubator-answer/internal/service/auth"
+	collection2 "github.com/apache/incubator-answer/internal/service/collection"
 	"github.com/apache/incubator-answer/internal/service/collection_common"
 	comment2 "github.com/apache/incubator-answer/internal/service/comment"
 	"github.com/apache/incubator-answer/internal/service/comment_common"
 	config2 "github.com/apache/incubator-answer/internal/service/config"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/dashboard"
 	export2 "github.com/apache/incubator-answer/internal/service/export"
 	"github.com/apache/incubator-answer/internal/service/follow"
@@ -131,7 +132,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	userNotificationConfigRepo := user_notification_config.NewUserNotificationConfigRepo(dataData)
 	userNotificationConfigService := user_notification_config2.NewUserNotificationConfigService(userRepo, userNotificationConfigRepo)
 	userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo, userNotificationConfigService)
-	userService := service.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService)
+	userService := content.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService)
 	captchaRepo := captcha.NewCaptchaRepo(dataData)
 	captchaService := action.NewCaptchaService(captchaRepo)
 	userController := controller.NewUserController(authService, userService, captchaService, emailService, siteInfoCommonService, userNotificationConfigService)
@@ -165,11 +166,16 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	metaRepo := meta.NewMetaRepo(dataData)
 	metaService := meta2.NewMetaService(metaRepo)
 	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, dataData)
-	reportHandle := report_handle.NewReportHandle(questionCommon, commentRepo, configService, notificationQueueService)
+	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
+	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
+	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
+	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService)
+	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService)
+	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
 	reportService := report2.NewReportService(reportRepo, objService, userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle, configService)
 	reportController := controller.NewReportController(reportService, rankService, captchaService)
-	serviceVoteRepo := activity.NewVoteRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
-	voteService := service.NewVoteService(serviceVoteRepo, configService, questionRepo, answerRepo, commentCommonRepo, objService)
+	contentVoteRepo := activity.NewVoteRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
+	voteService := content.NewVoteService(contentVoteRepo, configService, questionRepo, answerRepo, commentCommonRepo, objService)
 	voteController := controller.NewVoteController(voteService, rankService, captchaService)
 	tagService := tag2.NewTagService(tagRepo, tagCommonService, revisionService, followRepo, siteInfoCommonService, activityQueueService)
 	tagController := controller.NewTagController(tagService, tagCommonService, rankService)
@@ -177,21 +183,16 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	followService := follow.NewFollowService(followFollowRepo, followRepo, tagCommonRepo)
 	followController := controller.NewFollowController(followService)
 	collectionGroupRepo := collection.NewCollectionGroupRepo(dataData)
-	collectionService := service.NewCollectionService(collectionRepo, collectionGroupRepo, questionCommon)
+	collectionService := collection2.NewCollectionService(collectionRepo, collectionGroupRepo, questionCommon)
 	collectionController := controller.NewCollectionController(collectionService)
-	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
-	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
-	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
-	questionService := service.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService)
-	answerService := service.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService)
 	questionController := controller.NewQuestionController(questionService, answerService, rankService, siteInfoCommonService, captchaService, rateLimitMiddleware)
 	answerController := controller.NewAnswerController(answerService, rankService, captchaService, siteInfoCommonService, rateLimitMiddleware)
 	searchParser := search_parser.NewSearchParser(tagCommonService, userCommon)
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)
-	searchService := service.NewSearchService(searchParser, searchRepo)
+	searchService := content.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService, captchaService)
-	serviceRevisionService := service.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo)
-	revisionController := controller.NewRevisionController(serviceRevisionService, rankService)
+	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo)
+	revisionController := controller.NewRevisionController(contentRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	userAdminRepo := user.NewUserAdminRepo(dataData, authRepo)
 	userAdminService := user_admin.NewUserAdminService(userAdminRepo, userRoleRelService, authService, userCommon, userActiveActivityRepo, siteInfoCommonService, emailService, questionRepo, answerRepo, commentCommonRepo)
diff --git a/internal/base/constant/revision.go b/internal/base/constant/revision.go
index ac65c487..93ccf2ec 100644
--- a/internal/base/constant/revision.go
+++ b/internal/base/constant/revision.go
@@ -9,3 +9,11 @@ const (
 	FlaggedUser       ReviewingType = "flagged_user"
 	SuggestedPostEdit ReviewingType = "suggested_post_edit"
 )
+
+const (
+	ReportOperationEditPost     = "edit_post"
+	ReportOperationClosePost    = "close_post"
+	ReportOperationDeletePost   = "delete_post"
+	ReportOperationUnlistPost   = "unlist_post"
+	ReportOperationIgnoreReport = "ignore_report"
+)
diff --git a/internal/base/cron/cron.go b/internal/base/cron/cron.go
index bb9cb7e2..b7b05c26 100644
--- a/internal/base/cron/cron.go
+++ b/internal/base/cron/cron.go
@@ -23,7 +23,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/incubator-answer/internal/service"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/robfig/cron/v3"
 	"github.com/segmentfault/pacman/log"
@@ -32,13 +32,13 @@ import (
 // ScheduledTaskManager scheduled task manager
 type ScheduledTaskManager struct {
 	siteInfoService siteinfo_common.SiteInfoCommonService
-	questionService *service.QuestionService
+	questionService *content.QuestionService
 }
 
 // NewScheduledTaskManager new scheduled task manager
 func NewScheduledTaskManager(
 	siteInfoService siteinfo_common.SiteInfoCommonService,
-	questionService *service.QuestionService,
+	questionService *content.QuestionService,
 ) *ScheduledTaskManager {
 	manager := &ScheduledTaskManager{
 		siteInfoService: siteInfoService,
diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go
index 8fdb089c..390aa422 100644
--- a/internal/controller/answer_controller.go
+++ b/internal/controller/answer_controller.go
@@ -30,8 +30,8 @@ import (
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/permission"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
@@ -42,7 +42,7 @@ import (
 
 // AnswerController answer controller
 type AnswerController struct {
-	answerService         *service.AnswerService
+	answerService         *content.AnswerService
 	rankService           *rank.RankService
 	actionService         *action.CaptchaService
 	siteInfoCommonService siteinfo_common.SiteInfoCommonService
@@ -51,7 +51,7 @@ type AnswerController struct {
 
 // NewAnswerController new controller
 func NewAnswerController(
-	answerService *service.AnswerService,
+	answerService *content.AnswerService,
 	rankService *rank.RankService,
 	actionService *action.CaptchaService,
 	siteInfoCommonService siteinfo_common.SiteInfoCommonService,
diff --git a/internal/controller/collection_controller.go b/internal/controller/collection_controller.go
index 4e3eff38..a35ee693 100644
--- a/internal/controller/collection_controller.go
+++ b/internal/controller/collection_controller.go
@@ -23,18 +23,18 @@ import (
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/middleware"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
+	"github.com/apache/incubator-answer/internal/service/collection"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/gin-gonic/gin"
 )
 
 // CollectionController collection controller
 type CollectionController struct {
-	collectionService *service.CollectionService
+	collectionService *collection.CollectionService
 }
 
 // NewCollectionController new controller
-func NewCollectionController(collectionService *service.CollectionService) *CollectionController {
+func NewCollectionController(collectionService *collection.CollectionService) *CollectionController {
 	return &CollectionController{collectionService: collectionService}
 }
 
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 7d287210..3e21c87b 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -20,6 +20,8 @@
 package controller
 
 import (
+	"net/http"
+
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/middleware"
 	"github.com/apache/incubator-answer/internal/base/pager"
@@ -28,8 +30,8 @@ import (
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/permission"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
@@ -37,13 +39,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
-	"net/http"
 )
 
 // QuestionController question controller
 type QuestionController struct {
-	questionService     *service.QuestionService
-	answerService       *service.AnswerService
+	questionService     *content.QuestionService
+	answerService       *content.AnswerService
 	rankService         *rank.RankService
 	siteInfoService     siteinfo_common.SiteInfoCommonService
 	actionService       *action.CaptchaService
@@ -52,8 +53,8 @@ type QuestionController struct {
 
 // NewQuestionController new controller
 func NewQuestionController(
-	questionService *service.QuestionService,
-	answerService *service.AnswerService,
+	questionService *content.QuestionService,
+	answerService *content.AnswerService,
 	rankService *rank.RankService,
 	siteInfoService siteinfo_common.SiteInfoCommonService,
 	actionService *action.CaptchaService,
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index a2efbc2d..f4068579 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -31,7 +31,6 @@ import (
 	"github.com/apache/incubator-answer/internal/service/permission"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/report"
-	"github.com/apache/incubator-answer/pkg/converter"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
@@ -105,60 +104,47 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {
 	handler.HandleResponse(ctx, err, nil)
 }
 
-// ListReportPage godoc
-// @Summary list report page
-// @Description list report records
-// @Security ApiKeyAuth
+// GetUnreviewedReportPostPage get unreviewed report post page
+// @Summary get unreviewed report post page
+// @Description get unreviewed report post page
 // @Tags Report
 // @Accept json
 // @Produce json
 // @Security ApiKeyAuth
-// @Param status query string true "status" Enums(pending, completed)
-// @Param object_type query string true "object_type" Enums(all, question,answer,comment)
-// @Param page query int false "page size"
-// @Param page_size query int false "page size"
-// @Success 200 {object} handler.RespBody
-// @Router /answer/api/v1/reports/page [get]
-func (rc *ReportController) ListReportPage(ctx *gin.Context) {
-	var (
-		objectType = ctx.Query("object_type")
-		status     = ctx.Query("status")
-		page       = converter.StringToInt(ctx.DefaultQuery("page", "1"))
-		pageSize   = converter.StringToInt(ctx.DefaultQuery("page_size", "20"))
-	)
-
-	dto := schema.GetReportListPageDTO{
-		ObjectType: objectType,
-		Status:     status,
-		Page:       page,
-		PageSize:   pageSize,
-	}
-
-	resp, err := rc.reportService.ListReportPage(ctx, dto)
-	if err != nil {
-		handler.HandleResponse(ctx, err, schema.ErrTypeModal)
-	} else {
-		handler.HandleResponse(ctx, err, resp)
-	}
-}
-
-// Handle godoc
-// @Summary handle flag
-// @Description handle flag
-// @Security ApiKeyAuth
-// @Tags Report
-// @Accept json
-// @Produce json
-// @Security ApiKeyAuth
-// @Param data body schema.ReportHandleReq true "flag"
-// @Success 200 {object} handler.RespBody
-// @Router /answer/api/v1/report/ [put]
-func (rc *ReportController) Handle(ctx *gin.Context) {
-	req := schema.ReportHandleReq{}
-	if handler.BindAndCheck(ctx, &req) {
+// @Param page query int false "page"
+// @Success 200 {object} handler.RespBody{data=pager.PageModel{list=[]schema.GetReportListPageResp}}
+// @Router /answer/api/v1/report/unreviewed/post [get]
+func (rc *ReportController) GetUnreviewedReportPostPage(ctx *gin.Context) {
+	req := &schema.GetUnreviewedReportPostPageReq{}
+	if handler.BindAndCheck(ctx, req) {
 		return
 	}
 
-	err := rc.reportService.HandleReported(ctx, req)
+	// TODO: check permission
+
+	resp, err := rc.reportService.GetUnreviewedReportPostPage(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
+}
+
+// ReviewReport review report
+// @Summary review report
+// @Description review report
+// @Security ApiKeyAuth
+// @Tags Report
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param data body schema.ReviewReportReq true "flag"
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/report/review [put]
+func (rc *ReportController) ReviewReport(ctx *gin.Context) {
+	req := &schema.ReviewReportReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+
+	// TODO: check permission
+
+	err := rc.reportService.ReviewReport(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
 }
diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go
index a9d9164f..fd2735e0 100644
--- a/internal/controller/revision_controller.go
+++ b/internal/controller/revision_controller.go
@@ -26,7 +26,7 @@ import (
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/permission"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/pkg/obj"
@@ -37,13 +37,13 @@ import (
 
 // RevisionController revision controller
 type RevisionController struct {
-	revisionListService *service.RevisionService
+	revisionListService *content.RevisionService
 	rankService         *rank.RankService
 }
 
 // NewRevisionController new controller
 func NewRevisionController(
-	revisionListService *service.RevisionService,
+	revisionListService *content.RevisionService,
 	rankService *rank.RankService,
 ) *RevisionController {
 	return &RevisionController{
diff --git a/internal/controller/search_controller.go b/internal/controller/search_controller.go
index d08fd8f1..b74c0e9e 100644
--- a/internal/controller/search_controller.go
+++ b/internal/controller/search_controller.go
@@ -27,8 +27,8 @@ import (
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/plugin"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
@@ -36,13 +36,13 @@ import (
 
 // SearchController tag controller
 type SearchController struct {
-	searchService *service.SearchService
+	searchService *content.SearchService
 	actionService *action.CaptchaService
 }
 
 // NewSearchController new controller
 func NewSearchController(
-	searchService *service.SearchService,
+	searchService *content.SearchService,
 	actionService *action.CaptchaService,
 ) *SearchController {
 	return &SearchController{
diff --git a/internal/controller/template_render/controller.go b/internal/controller/template_render/controller.go
index 4fdcaf2b..521651b7 100644
--- a/internal/controller/template_render/controller.go
+++ b/internal/controller/template_render/controller.go
@@ -20,15 +20,16 @@
 package templaterender
 
 import (
-	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"math"
 
+	"github.com/apache/incubator-answer/internal/service/content"
+	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+
 	"github.com/apache/incubator-answer/internal/service/comment"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/google/wire"
 
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/tag"
 )
 
@@ -38,20 +39,20 @@ var ProviderSetTemplateRenderController = wire.NewSet(
 )
 
 type TemplateRenderController struct {
-	questionService *service.QuestionService
-	userService     *service.UserService
+	questionService *content.QuestionService
+	userService     *content.UserService
 	tagService      *tag.TagService
-	answerService   *service.AnswerService
+	answerService   *content.AnswerService
 	commentService  *comment.CommentService
 	siteInfoService siteinfo_common.SiteInfoCommonService
 	questionRepo    questioncommon.QuestionRepo
 }
 
 func NewTemplateRenderController(
-	questionService *service.QuestionService,
-	userService *service.UserService,
+	questionService *content.QuestionService,
+	userService *content.UserService,
 	tagService *tag.TagService,
-	answerService *service.AnswerService,
+	answerService *content.AnswerService,
 	commentService *comment.CommentService,
 	siteInfoService siteinfo_common.SiteInfoCommonService,
 	questionRepo questioncommon.QuestionRepo,
diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go
index 4ef50e9e..b95e86bd 100644
--- a/internal/controller/user_controller.go
+++ b/internal/controller/user_controller.go
@@ -20,6 +20,8 @@
 package controller
 
 import (
+	"net/url"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/middleware"
@@ -28,9 +30,9 @@ import (
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
 	"github.com/apache/incubator-answer/internal/service/auth"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/export"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/apache/incubator-answer/internal/service/user_notification_config"
@@ -38,12 +40,11 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
-	"net/url"
 )
 
 // UserController user controller
 type UserController struct {
-	userService                   *service.UserService
+	userService                   *content.UserService
 	authService                   *auth.AuthService
 	actionService                 *action.CaptchaService
 	emailService                  *export.EmailService
@@ -54,7 +55,7 @@ type UserController struct {
 // NewUserController new controller
 func NewUserController(
 	authService *auth.AuthService,
-	userService *service.UserService,
+	userService *content.UserService,
 	actionService *action.CaptchaService,
 	emailService *export.EmailService,
 	siteInfoCommonService siteinfo_common.SiteInfoCommonService,
diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.go
index 6417087b..09b5fb07 100644
--- a/internal/controller/vote_controller.go
+++ b/internal/controller/vote_controller.go
@@ -27,8 +27,8 @@ import (
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/action"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/gin-gonic/gin"
@@ -37,14 +37,14 @@ import (
 
 // VoteController activity controller
 type VoteController struct {
-	VoteService   *service.VoteService
+	VoteService   *content.VoteService
 	rankService   *rank.RankService
 	actionService *action.CaptchaService
 }
 
 // NewVoteController new controller
 func NewVoteController(
-	voteService *service.VoteService,
+	voteService *content.VoteService,
 	rankService *rank.RankService,
 	actionService *action.CaptchaService,
 ) *VoteController {
diff --git a/internal/entity/report_entity.go b/internal/entity/report_entity.go
index be0d76c7..07f5bc84 100644
--- a/internal/entity/report_entity.go
+++ b/internal/entity/report_entity.go
@@ -24,6 +24,7 @@ import "time"
 const (
 	ReportStatusPending   = 1
 	ReportStatusCompleted = 2
+	ReportStatusIgnore    = 3
 	ReportStatusDeleted   = 10
 )
 
diff --git a/internal/repo/activity/vote_repo.go b/internal/repo/activity/vote_repo.go
index e7d38d3e..7e8b02e6 100644
--- a/internal/repo/activity/vote_repo.go
+++ b/internal/repo/activity/vote_repo.go
@@ -22,9 +22,11 @@ package activity
 import (
 	"context"
 	"fmt"
-	"github.com/segmentfault/pacman/log"
 	"time"
 
+	"github.com/apache/incubator-answer/internal/service/content"
+	"github.com/segmentfault/pacman/log"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/service/notice_queue"
 	"github.com/apache/incubator-answer/pkg/converter"
@@ -39,7 +41,6 @@ import (
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/apache/incubator-answer/internal/service/activity_common"
 	"github.com/segmentfault/pacman/errors"
 	"xorm.io/xorm"
@@ -59,7 +60,7 @@ func NewVoteRepo(
 	activityRepo activity_common.ActivityRepo,
 	userRankRepo rank.UserRankRepo,
 	notificationQueueService notice_queue.NotificationQueueService,
-) service.VoteRepo {
+) content.VoteRepo {
 	return &VoteRepo{
 		data:                     data,
 		activityRepo:             activityRepo,
diff --git a/internal/repo/collection/collection_group_repo.go b/internal/repo/collection/collection_group_repo.go
index 0fc9c27a..05711f5a 100644
--- a/internal/repo/collection/collection_group_repo.go
+++ b/internal/repo/collection/collection_group_repo.go
@@ -21,6 +21,8 @@ package collection
 
 import (
 	"context"
+
+	"github.com/apache/incubator-answer/internal/service/collection"
 	"xorm.io/xorm"
 
 	"github.com/apache/incubator-answer/internal/base/data"
@@ -28,7 +30,6 @@ import (
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
-	"github.com/apache/incubator-answer/internal/service"
 	"github.com/segmentfault/pacman/errors"
 )
 
@@ -38,7 +39,7 @@ type collectionGroupRepo struct {
 }
 
 // NewCollectionGroupRepo new repository
-func NewCollectionGroupRepo(data *data.Data) service.CollectionGroupRepo {
+func NewCollectionGroupRepo(data *data.Data) collection.CollectionGroupRepo {
 	return &collectionGroupRepo{
 		data: data,
 	}
diff --git a/internal/repo/report/report_repo.go b/internal/repo/report/report_repo.go
index 0120f31c..013d036d 100644
--- a/internal/repo/report/report_repo.go
+++ b/internal/repo/report/report_repo.go
@@ -22,7 +22,6 @@ package report
 import (
 	"context"
 
-	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/pager"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/report_common"
@@ -62,31 +61,11 @@ func (rr *reportRepo) AddReport(ctx context.Context, report *entity.Report) (err
 }
 
 // GetReportListPage get report list page
-func (rr *reportRepo) GetReportListPage(ctx context.Context, dto schema.GetReportListPageDTO) (reports []entity.Report, total int64, err error) {
-	var (
-		ok         bool
-		status     int
-		objectType int
-		session    = rr.data.DB.Context(ctx)
-		cond       = entity.Report{}
-	)
-
-	// parse status
-	status, ok = entity.ReportStatus[dto.Status]
-	if !ok {
-		status = entity.ReportStatus["pending"]
-	}
-	cond.Status = status
-
-	// parse object type
-	objectType, ok = constant.ObjectTypeStrMapping[dto.ObjectType]
-	if ok {
-		cond.ObjectType = objectType
-	}
-
-	// order
-	session.OrderBy("updated_at desc")
-
+func (rr *reportRepo) GetReportListPage(ctx context.Context, dto *schema.GetReportListPageDTO) (
+	reports []*entity.Report, total int64, err error) {
+	cond := &entity.Report{}
+	cond.Status = dto.Status
+	session := rr.data.DB.Context(ctx).Desc("updated_at")
 	total, err = pager.Help(dto.Page, dto.PageSize, &reports, cond, session)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
@@ -104,9 +83,9 @@ func (rr *reportRepo) GetByID(ctx context.Context, id string) (report *entity.Re
 	return
 }
 
-// UpdateByID handle report by ID
-func (rr *reportRepo) UpdateByID(ctx context.Context, id string, handleData entity.Report) (err error) {
-	_, err = rr.data.DB.Context(ctx).ID(id).Update(&handleData)
+// UpdateStatus update report status by ID
+func (rr *reportRepo) UpdateStatus(ctx context.Context, id string, status int) (err error) {
+	_, err = rr.data.DB.Context(ctx).ID(id).Update(&entity.Report{Status: status})
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index 2895d103..b5786ba0 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -200,6 +200,8 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 
 	// report
 	r.POST("/report", a.reportController.AddReport)
+	r.GET("/report/unreviewed/post", a.reportController.GetUnreviewedReportPostPage)
+	r.PUT("/report/review", a.reportController.ReviewReport)
 
 	// vote
 	r.POST("/vote/up", a.voteController.VoteUp)
@@ -276,10 +278,6 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	r.GET("/user/plugin/configs", a.userPluginController.GetUserPluginList)
 	r.GET("/user/plugin/config", a.userPluginController.GetUserPluginConfig)
 	r.PUT("/user/plugin/config", a.userPluginController.UpdatePluginUserConfig)
-
-	// report
-	r.GET("/reports/page", a.reportController.ListReportPage)
-	r.PUT("/report", a.reportController.Handle)
 }
 
 func (a *AnswerAPIRouter) RegisterAnswerAdminAPIRouter(r *gin.RouterGroup) {
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index e853259c..45becee4 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -70,10 +70,9 @@ type ReportHandleReq struct {
 
 // GetReportListPageDTO report list data transfer object
 type GetReportListPageDTO struct {
-	ObjectType string
-	Status     string
-	Page       int
-	PageSize   int
+	Page     int
+	PageSize int
+	Status   int
 }
 
 // GetReportListPageResp get report list
@@ -106,7 +105,6 @@ type GetReportListPageResp struct {
 
 	UserID         string `json:"-"`
 	ReportedUserID string `json:"-"`
-	Status         int    `json:"-"`
 	ObjectType     int    `json:"-"`
 	ReportType     int    `json:"-"`
 	FlaggedType    int    `json:"-"`
@@ -119,3 +117,20 @@ func (r *GetReportListPageResp) Format() {
 	r.CreatedAtParsed = r.CreatedAt.Unix()
 	r.UpdatedAtParsed = r.UpdatedAt.Unix()
 }
+
+// GetUnreviewedReportPostPageReq get unreviewed report post page request
+type GetUnreviewedReportPostPageReq struct {
+	Page int `json:"page" form:"page"`
+}
+
+// ReviewReportReq review report request
+type ReviewReportReq struct {
+	ReportID      string     `validate:"required" json:"report_id"`
+	OperationType string     `validate:"required,oneof=edit_post close_post delete_post unlist_post ignore_report" json:"operation_type"`
+	CloseType     int        `validate:"omitempty" json:"close_type"`
+	CloseMsg      string     `validate:"omitempty" json:"close_msg"`
+	Title         string     `validate:"omitempty,notblank,gte=6,lte=150" json:"title"`
+	Content       string     `validate:"omitempty,notblank,gte=6,lte=65535" json:"content"`
+	Tags          []*TagItem `validate:"omitempty,dive" json:"tags"`
+	UserID        string     `json:"-"`
+}
diff --git a/internal/service/collection_group_service.go b/internal/service/collection/collection_group_service.go
similarity index 99%
rename from internal/service/collection_group_service.go
rename to internal/service/collection/collection_group_service.go
index 2620c54c..3f6f3db1 100644
--- a/internal/service/collection_group_service.go
+++ b/internal/service/collection/collection_group_service.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package service
+package collection
 
 import (
 	"context"
diff --git a/internal/service/collection_service.go b/internal/service/collection/collection_service.go
similarity index 99%
rename from internal/service/collection_service.go
rename to internal/service/collection/collection_service.go
index 1072d1ab..1820ac52 100644
--- a/internal/service/collection_service.go
+++ b/internal/service/collection/collection_service.go
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package service
+package collection
 
 import (
 	"context"
+
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common"
diff --git a/internal/service/answer_service.go b/internal/service/content/answer_service.go
similarity index 99%
rename from internal/service/answer_service.go
rename to internal/service/content/answer_service.go
index 303e156d..9cbcb255 100644
--- a/internal/service/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"context"
diff --git a/internal/service/question_service.go b/internal/service/content/question_service.go
similarity index 99%
rename from internal/service/question_service.go
rename to internal/service/content/question_service.go
index a4d5ffe6..c2bfe125 100644
--- a/internal/service/question_service.go
+++ b/internal/service/content/question_service.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"encoding/json"
@@ -513,7 +513,8 @@ func (qs *QuestionService) RemoveQuestion(ctx context.Context, req *schema.Remov
 	// 	 log.Errorf("user DeleteQuestion rank rollback error %s", err.Error())
 	// }
 	qs.activityQueueService.Send(ctx, &schema.ActivityMsg{
-		UserID:           req.UserID,
+		UserID:           questionInfo.UserID,
+		TriggerUserID:    converter.StringToInt64(req.UserID),
 		ObjectID:         questionInfo.ID,
 		OriginalObjectID: questionInfo.ID,
 		ActivityTypeKey:  constant.ActQuestionDeleted,
diff --git a/internal/service/revision_service.go b/internal/service/content/revision_service.go
similarity index 99%
rename from internal/service/revision_service.go
rename to internal/service/content/revision_service.go
index 9479a2c6..da051965 100644
--- a/internal/service/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"context"
diff --git a/internal/service/search_service.go b/internal/service/content/search_service.go
similarity index 99%
rename from internal/service/search_service.go
rename to internal/service/content/search_service.go
index 46d71374..e9f2d128 100644
--- a/internal/service/search_service.go
+++ b/internal/service/content/search_service.go
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"context"
+
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/search_common"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
diff --git a/internal/service/user_service.go b/internal/service/content/user_service.go
similarity index 99%
rename from internal/service/user_service.go
rename to internal/service/content/user_service.go
index c6d98fc2..fcf1ae0e 100644
--- a/internal/service/user_service.go
+++ b/internal/service/content/user_service.go
@@ -17,15 +17,16 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/service/user_notification_config"
-	"time"
 
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/reason"
diff --git a/internal/service/vote_service.go b/internal/service/content/vote_service.go
similarity index 99%
rename from internal/service/vote_service.go
rename to internal/service/content/vote_service.go
index b5ce73b8..9785e30d 100644
--- a/internal/service/vote_service.go
+++ b/internal/service/content/vote_service.go
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package service
+package content
 
 import (
 	"context"
-	"github.com/apache/incubator-answer/internal/service/activity_common"
 	"strings"
 
+	"github.com/apache/incubator-answer/internal/service/activity_common"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/pager"
diff --git a/internal/service/provider.go b/internal/service/provider.go
index 462d2ce4..5e381bf6 100644
--- a/internal/service/provider.go
+++ b/internal/service/provider.go
@@ -26,10 +26,12 @@ import (
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
 	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
 	"github.com/apache/incubator-answer/internal/service/auth"
+	"github.com/apache/incubator-answer/internal/service/collection"
 	collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common"
 	"github.com/apache/incubator-answer/internal/service/comment"
 	"github.com/apache/incubator-answer/internal/service/comment_common"
 	"github.com/apache/incubator-answer/internal/service/config"
+	"github.com/apache/incubator-answer/internal/service/content"
 	"github.com/apache/incubator-answer/internal/service/dashboard"
 	"github.com/apache/incubator-answer/internal/service/export"
 	"github.com/apache/incubator-answer/internal/service/follow"
@@ -64,16 +66,16 @@ var ProviderSetService = wire.NewSet(
 	comment.NewCommentService,
 	comment_common.NewCommentCommonService,
 	report.NewReportService,
-	NewVoteService,
+	content.NewVoteService,
 	tag.NewTagService,
 	follow.NewFollowService,
-	NewCollectionGroupService,
-	NewCollectionService,
+	collection.NewCollectionGroupService,
+	collection.NewCollectionService,
 	action.NewCaptchaService,
 	auth.NewAuthService,
-	NewUserService,
-	NewQuestionService,
-	NewAnswerService,
+	content.NewUserService,
+	content.NewQuestionService,
+	content.NewAnswerService,
 	export.NewEmailService,
 	tagcommon.NewTagCommonService,
 	usercommon.NewUserCommon,
@@ -82,10 +84,10 @@ var ProviderSetService = wire.NewSet(
 	uploader.NewUploaderService,
 	collectioncommon.NewCollectionCommon,
 	revision_common.NewRevisionService,
-	NewRevisionService,
+	content.NewRevisionService,
 	rank.NewRankService,
 	search_parser.NewSearchParser,
-	NewSearchService,
+	content.NewSearchService,
 	meta.NewMetaService,
 	object_info.NewObjService,
 	report_handle.NewReportHandle,
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 287ad57b..72ea83bf 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -21,6 +21,8 @@ package report
 
 import (
 	"encoding/json"
+
+	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/pager"
 	"github.com/apache/incubator-answer/internal/base/reason"
@@ -102,26 +104,21 @@ func (rs *ReportService) AddReport(ctx context.Context, req *schema.AddReportReq
 	return rs.reportRepo.AddReport(ctx, report)
 }
 
-// ListReportPage list report pages
-func (rs *ReportService) ListReportPage(ctx context.Context, dto schema.GetReportListPageDTO) (pageModel *pager.PageModel, err error) {
-	var (
-		resp  []*schema.GetReportListPageResp
-		flags []entity.Report
-		total int64
-
-		flaggedUserIds,
-		userIds []string
-
-		flaggedUsers,
-		users map[string]*schema.UserBasicInfo
-	)
-
-	flags, total, err = rs.reportRepo.GetReportListPage(ctx, dto)
+// GetUnreviewedReportPostPage get unreviewed report post page
+func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *schema.GetUnreviewedReportPostPageReq) (
+	pageModel *pager.PageModel, err error) {
+	reports, total, err := rs.reportRepo.GetReportListPage(ctx, &schema.GetReportListPageDTO{
+		Page:     req.Page,
+		PageSize: 1,
+		Status:   entity.ReportStatusPending,
+	})
 	if err != nil {
 		return
 	}
 
-	_ = copier.Copy(&resp, flags)
+	resp := make([]*schema.GetReportListPageResp, 0)
+	_ = copier.Copy(&resp, reports)
+	var flaggedUserIds, userIds []string
 	for _, r := range resp {
 		flaggedUserIds = append(flaggedUserIds, r.ReportedUserID)
 		userIds = append(userIds, r.UserID)
@@ -129,13 +126,13 @@ func (rs *ReportService) ListReportPage(ctx context.Context, dto schema.GetRepor
 	}
 
 	// flagged users
-	flaggedUsers, err = rs.commonUser.BatchUserBasicInfoByID(ctx, flaggedUserIds)
+	flaggedUsers, err := rs.commonUser.BatchUserBasicInfoByID(ctx, flaggedUserIds)
 	if err != nil {
 		return nil, err
 	}
 
 	// flag users
-	users, err = rs.commonUser.BatchUserBasicInfoByID(ctx, userIds)
+	users, err := rs.commonUser.BatchUserBasicInfoByID(ctx, userIds)
 	if err != nil {
 		return nil, err
 	}
@@ -147,39 +144,30 @@ func (rs *ReportService) ListReportPage(ctx context.Context, dto schema.GetRepor
 	return pager.NewPageModel(total, resp), nil
 }
 
-// HandleReported handle the reported object
-func (rs *ReportService) HandleReported(ctx context.Context, req schema.ReportHandleReq) (err error) {
-	var (
-		reported   *entity.Report
-		handleData = entity.Report{
-			FlaggedContent: req.FlaggedContent,
-			FlaggedType:    req.FlaggedType,
-			Status:         entity.ReportStatusCompleted,
-		}
-		exist bool
-	)
-
-	reported, exist, err = rs.reportRepo.GetByID(ctx, req.ID)
+// ReviewReport review report
+func (rs *ReportService) ReviewReport(ctx context.Context, req *schema.ReviewReportReq) (err error) {
+	report, exist, err := rs.reportRepo.GetByID(ctx, req.ReportID)
 	if err != nil {
-		err = errors.BadRequest(reason.ReportHandleFailed).WithError(err).WithStack()
-		return
+		return err
 	}
 	if !exist {
-		err = errors.NotFound(reason.ReportNotFound)
-		return
+		return errors.NotFound(reason.ReportNotFound)
 	}
-
 	// check if handle or not
-	if reported.Status != entity.ReportStatusPending {
+	if report.Status != entity.ReportStatusPending {
+		return nil
+	}
+
+	// ignore this report
+	if req.OperationType == constant.ReportOperationIgnoreReport {
+		return rs.reportRepo.UpdateStatus(ctx, report.ID, entity.ReportStatusIgnore)
+	}
+
+	if err = rs.reportHandle.UpdateReportedObject(ctx, report, req); err != nil {
 		return
 	}
 
-	if err = rs.reportHandle.HandleObject(ctx, reported, req); err != nil {
-		return
-	}
-
-	err = rs.reportRepo.UpdateByID(ctx, reported.ID, handleData)
-	return
+	return rs.reportRepo.UpdateStatus(ctx, report.ID, entity.ReportStatusCompleted)
 }
 
 func (rs *ReportService) decorateReportResp(ctx context.Context, resp *schema.GetReportListPageResp) {
diff --git a/internal/service/report_common/report_common.go b/internal/service/report_common/report_common.go
index e27ff162..4b504630 100644
--- a/internal/service/report_common/report_common.go
+++ b/internal/service/report_common/report_common.go
@@ -29,8 +29,9 @@ import (
 // ReportRepo report repository
 type ReportRepo interface {
 	AddReport(ctx context.Context, report *entity.Report) (err error)
-	GetReportListPage(ctx context.Context, query schema.GetReportListPageDTO) (reports []entity.Report, total int64, err error)
+	GetReportListPage(ctx context.Context, query *schema.GetReportListPageDTO) (
+		reports []*entity.Report, total int64, err error)
 	GetByID(ctx context.Context, id string) (report *entity.Report, exist bool, err error)
-	UpdateByID(ctx context.Context, id string, handleData entity.Report) (err error)
+	UpdateStatus(ctx context.Context, id string, status int) (err error)
 	GetReportCount(ctx context.Context) (count int64, err error)
 }
diff --git a/internal/service/report_handle/report_handle.go b/internal/service/report_handle/report_handle.go
index 8b51d7fa..df6cff68 100644
--- a/internal/service/report_handle/report_handle.go
+++ b/internal/service/report_handle/report_handle.go
@@ -22,94 +22,111 @@ package report_handle
 import (
 	"context"
 
-	"github.com/apache/incubator-answer/internal/service/config"
-	"github.com/apache/incubator-answer/internal/service/notice_queue"
-
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/comment"
-	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+	"github.com/apache/incubator-answer/internal/service/content"
+	"github.com/apache/incubator-answer/pkg/converter"
 	"github.com/apache/incubator-answer/pkg/obj"
 )
 
 type ReportHandle struct {
-	questionCommon           *questioncommon.QuestionCommon
-	commentRepo              comment.CommentRepo
-	configService            *config.ConfigService
-	notificationQueueService notice_queue.NotificationQueueService
+	questionService *content.QuestionService
+	answerService   *content.AnswerService
+	commentService  *comment.CommentService
 }
 
 func NewReportHandle(
-	questionCommon *questioncommon.QuestionCommon,
-	commentRepo comment.CommentRepo,
-	configService *config.ConfigService,
-	notificationQueueService notice_queue.NotificationQueueService,
+	questionService *content.QuestionService,
+	answerService *content.AnswerService,
+	commentService *comment.CommentService,
 ) *ReportHandle {
 	return &ReportHandle{
-		questionCommon:           questionCommon,
-		commentRepo:              commentRepo,
-		configService:            configService,
-		notificationQueueService: notificationQueueService,
+		questionService: questionService,
+		answerService:   answerService,
+		commentService:  commentService,
 	}
 }
 
-// HandleObject this handle object status
-func (rh *ReportHandle) HandleObject(ctx context.Context, reported *entity.Report, req schema.ReportHandleReq) (err error) {
-	reasonDeleteCfg, err := rh.configService.GetConfigByKey(ctx, "reason.needs_delete")
-	if err != nil {
-		return err
-	}
-	reasonCloseCfg, err := rh.configService.GetConfigByKey(ctx, "reason.needs_close")
-	if err != nil {
-		return err
-	}
-	var (
-		objectID       = reported.ObjectID
-		reportedUserID = reported.ReportedUserID
-		objectKey      string
-	)
-
-	objectKey, err = obj.GetObjectTypeStrByObjectID(objectID)
+// UpdateReportedObject this handle object status
+func (rh *ReportHandle) UpdateReportedObject(ctx context.Context,
+	report *entity.Report, req *schema.ReviewReportReq) (err error) {
+	objectKey, err := obj.GetObjectTypeStrByObjectID(report.ObjectID)
 	if err != nil {
 		return err
 	}
 	switch objectKey {
-	case "question":
-		switch req.FlaggedType {
-		case reasonDeleteCfg.ID:
-			err = rh.questionCommon.RemoveQuestion(ctx, &schema.RemoveQuestionReq{ID: objectID})
-		case reasonCloseCfg.ID:
-			err = rh.questionCommon.CloseQuestion(ctx, &schema.CloseQuestionReq{
-				ID:        objectID,
-				CloseType: req.FlaggedType,
-				CloseMsg:  req.FlaggedContent,
-			})
-		}
-	case "answer":
-		switch req.FlaggedType {
-		case reasonDeleteCfg.ID:
-			err = rh.questionCommon.RemoveAnswer(ctx, objectID)
-		}
-	case "comment":
-		switch req.FlaggedType {
-		case reasonCloseCfg.ID:
-			err = rh.commentRepo.RemoveComment(ctx, objectID)
-			rh.sendNotification(ctx, reportedUserID, objectID, constant.NotificationYourCommentWasDeleted)
-		}
+	case constant.QuestionObjectType:
+		err = rh.updateReportedQuestionReport(ctx, report, req)
+	case constant.AnswerObjectType:
+		err = rh.updateReportedAnswerReport(ctx, report, req)
+	case constant.CommentObjectType:
+		err = rh.updateReportedCommentReport(ctx, report, req)
 	}
 	return
 }
 
-// sendNotification send rank triggered notification
-func (rh *ReportHandle) sendNotification(ctx context.Context, reportedUserID, objectID, notificationAction string) {
-	msg := &schema.NotificationMsg{
-		TriggerUserID:      reportedUserID,
-		ReceiverUserID:     reportedUserID,
-		Type:               schema.NotificationTypeInbox,
-		ObjectID:           objectID,
-		ObjectType:         constant.ReportObjectType,
-		NotificationAction: notificationAction,
+func (rh *ReportHandle) updateReportedQuestionReport(ctx context.Context,
+	report *entity.Report, req *schema.ReviewReportReq) (err error) {
+	switch req.OperationType {
+	case constant.ReportOperationUnlistPost:
+		err = rh.questionService.OperationQuestion(ctx, &schema.OperationQuestionReq{
+			ID: report.ObjectID, Operation: schema.QuestionOperationHide, UserID: req.UserID})
+	case constant.ReportOperationDeletePost:
+		err = rh.questionService.RemoveQuestion(ctx, &schema.RemoveQuestionReq{
+			ID: report.ObjectID, UserID: req.UserID, IsAdmin: true})
+	case constant.ReportOperationClosePost:
+		err = rh.questionService.CloseQuestion(ctx, &schema.CloseQuestionReq{
+			ID:        report.ObjectID,
+			CloseType: req.CloseType,
+			CloseMsg:  req.CloseMsg,
+			UserID:    req.UserID,
+		})
+	case constant.ReportOperationEditPost:
+		_, err = rh.questionService.UpdateQuestion(ctx, &schema.QuestionUpdate{
+			ID:           report.ObjectID,
+			Title:        req.Title,
+			Content:      req.Content,
+			HTML:         converter.Markdown2HTML(req.Content),
+			Tags:         req.Tags,
+			UserID:       req.UserID,
+			NoNeedReview: true,
+		})
 	}
-	rh.notificationQueueService.Send(ctx, msg)
+	return
+}
+
+func (rh *ReportHandle) updateReportedAnswerReport(ctx context.Context, report *entity.Report, req *schema.ReviewReportReq) (err error) {
+	switch req.OperationType {
+	case constant.ReportOperationDeletePost:
+		err = rh.answerService.RemoveAnswer(ctx, &schema.RemoveAnswerReq{
+			ID: report.ObjectID, UserID: req.UserID})
+	case constant.ReportOperationEditPost:
+		_, err = rh.answerService.Update(ctx, &schema.AnswerUpdateReq{
+			ID:           report.ObjectID,
+			Title:        req.Title,
+			Content:      req.Content,
+			HTML:         converter.Markdown2HTML(req.Content),
+			UserID:       req.UserID,
+			NoNeedReview: true,
+		})
+	}
+	return nil
+}
+
+func (rh *ReportHandle) updateReportedCommentReport(ctx context.Context, report *entity.Report, req *schema.ReviewReportReq) (err error) {
+	switch req.OperationType {
+	case constant.ReportOperationDeletePost:
+		err = rh.commentService.RemoveComment(ctx, &schema.RemoveCommentReq{
+			CommentID: report.ObjectID, UserID: req.UserID})
+	case constant.ReportOperationEditPost:
+		_, err = rh.commentService.UpdateComment(ctx, &schema.UpdateCommentReq{
+			CommentID:    report.ObjectID,
+			OriginalText: req.Content,
+			ParsedText:   converter.Markdown2HTML(req.Content),
+			UserID:       req.UserID,
+		})
+	}
+	return nil
 }

From 2ae98a69494d5b66f13409f8f5d1ee03a6826b40 Mon Sep 17 00:00:00 2001
From: kumfo <kumfo@sifou.com>
Date: Wed, 6 Mar 2024 15:17:57 +0800
Subject: [PATCH 024/114] =?UTF-8?q?feat(queued):=20add=20status:pending(qu?=
 =?UTF-8?q?esiton/answer/comment)=EF=BC=8Cand=20change=20question=20status?=
 =?UTF-8?q?=20query?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/entity/answer_entity.go        | 1 +
 internal/entity/comment_entity.go       | 1 +
 internal/entity/question_entity.go      | 1 +
 internal/migrations/v13.go              | 5 +++--
 internal/repo/question/question_repo.go | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index e3520b8c..39a17ebf 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -28,6 +28,7 @@ const (
 
 	AnswerStatusAvailable = 1
 	AnswerStatusDeleted   = 10
+	AnswerStatusPending   = 11
 )
 
 var AdminAnswerSearchStatus = map[string]int{
diff --git a/internal/entity/comment_entity.go b/internal/entity/comment_entity.go
index 37f51198..8b79663a 100644
--- a/internal/entity/comment_entity.go
+++ b/internal/entity/comment_entity.go
@@ -30,6 +30,7 @@ import (
 const (
 	CommentStatusAvailable = 1
 	CommentStatusDeleted   = 10
+	CommentStatusPending   = 11
 )
 
 // Comment comment
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index 2dd4ec2e..0e589aeb 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -27,6 +27,7 @@ const (
 	QuestionStatusAvailable = 1
 	QuestionStatusClosed    = 2
 	QuestionStatusDeleted   = 10
+	QuestionStatusPending   = 11
 	QuestionUnPin           = 1
 	QuestionPin             = 2
 	QuestionShow            = 1
diff --git a/internal/migrations/v13.go b/internal/migrations/v13.go
index 2c2c80a6..4fcde381 100644
--- a/internal/migrations/v13.go
+++ b/internal/migrations/v13.go
@@ -24,6 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"time"
+	"xorm.io/builder"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/entity"
@@ -184,7 +185,7 @@ func updateTagCount(ctx context.Context, x *xorm.Engine) error {
 		questionsHideMap[item.ObjectID] = false
 	}
 	questionList := make([]QuestionV13, 0)
-	err = x.Context(ctx).In("id", questionIDs).In("question.status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed}).Find(&questionList, &QuestionV13{})
+	err = x.Context(ctx).In("id", questionIDs).And(builder.Lt{"question.status": entity.QuestionStatusDeleted}).Find(&questionList, &QuestionV13{})
 	if err != nil {
 		return fmt.Errorf("get questions failed: %w", err)
 	}
@@ -256,7 +257,7 @@ func updateTagCount(ctx context.Context, x *xorm.Engine) error {
 // updateUserQuestionCount update user question count
 func updateUserQuestionCount(ctx context.Context, x *xorm.Engine) error {
 	questionList := make([]QuestionV13, 0)
-	err := x.Context(ctx).In("status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed}).Find(&questionList, &QuestionV13{})
+	err := x.Context(ctx).Where(builder.Lt{"status": entity.QuestionStatusDeleted}).Find(&questionList, &QuestionV13{})
 	if err != nil {
 		return fmt.Errorf("get question  failed: %w", err)
 	}
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index 6c97620a..ee30929f 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -276,7 +276,7 @@ func (qr *questionRepo) GetQuestionList(ctx context.Context, question *entity.Qu
 
 func (qr *questionRepo) GetQuestionCount(ctx context.Context) (count int64, err error) {
 	session := qr.data.DB.Context(ctx)
-	session.In("status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed})
+	session.Where(builder.Lt{"status": entity.QuestionStatusDeleted})
 	count, err = session.Count(&entity.Question{Show: entity.QuestionShow})
 	if err != nil {
 		return 0, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
@@ -286,7 +286,7 @@ func (qr *questionRepo) GetQuestionCount(ctx context.Context) (count int64, err
 
 func (qr *questionRepo) GetUserQuestionCount(ctx context.Context, userID string) (count int64, err error) {
 	session := qr.data.DB.Context(ctx)
-	session.In("status", []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed})
+	session.Where(builder.Lt{"status": entity.QuestionStatusDeleted})
 	count, err = session.Count(&entity.Question{UserID: userID})
 	if err != nil {
 		return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()

From c6042d96edabb5e26f5ef7f69ac537a5de6acc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=8C=E7=AB=8B?= <cuihengqing@cai-inc.com>
Date: Tue, 5 Mar 2024 19:18:03 +0800
Subject: [PATCH 025/114] feat: filter the same question in similar questions

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

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index a4d5ffe6..8677123b 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -1235,7 +1235,17 @@ func (qs *QuestionService) SimilarQuestion(ctx context.Context, questionID strin
 		search.Tag = tagNames[0]
 	}
 	search.LoginUserID = loginUserID
-	return qs.GetQuestionPage(ctx, search)
+	similarQuestions, _ , err := qs.GetQuestionPage(ctx, search)
+	if err !=nil {
+		return nil, 0, err
+	}
+	var result []*schema.QuestionPageResp
+  for _, v := range similarQuestions {
+      if v.ID != questionID {
+          result = append(result, v)
+      }
+  }
+	return result, int64(len(result)), nil
 }
 
 // GetQuestionPage query questions page

From 51b96ec06f9664bc1c006fa1ce697a25058a533a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=8C=E7=AB=8B?= <cuihengqing@cai-inc.com>
Date: Wed, 6 Mar 2024 14:56:44 +0800
Subject: [PATCH 026/114] feat: format code

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

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index 8677123b..e01054b4 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -1235,16 +1235,16 @@ func (qs *QuestionService) SimilarQuestion(ctx context.Context, questionID strin
 		search.Tag = tagNames[0]
 	}
 	search.LoginUserID = loginUserID
-	similarQuestions, _ , err := qs.GetQuestionPage(ctx, search)
-	if err !=nil {
+	similarQuestions, _, err := qs.GetQuestionPage(ctx, search)
+	if err != nil {
 		return nil, 0, err
 	}
 	var result []*schema.QuestionPageResp
-  for _, v := range similarQuestions {
-      if v.ID != questionID {
-          result = append(result, v)
-      }
-  }
+	for _, v := range similarQuestions {
+		if v.ID != questionID {
+			result = append(result, v)
+		}
+	}
 	return result, int64(len(result)), nil
 }
 

From 5d777896e3c8f4d69cf6942424d53b630c5db3b9 Mon Sep 17 00:00:00 2001
From: foxzero-007 <chq2549603631@gmail.com>
Date: Wed, 6 Mar 2024 15:30:43 +0800
Subject: [PATCH 027/114] feat: use uid.DeshortID on v.ID

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

diff --git a/internal/service/question_service.go b/internal/service/question_service.go
index e01054b4..5e8477a4 100644
--- a/internal/service/question_service.go
+++ b/internal/service/question_service.go
@@ -1241,7 +1241,7 @@ func (qs *QuestionService) SimilarQuestion(ctx context.Context, questionID strin
 	}
 	var result []*schema.QuestionPageResp
 	for _, v := range similarQuestions {
-		if v.ID != questionID {
+		if uid.DeShortID(v.ID) != questionID {
 			result = append(result, v)
 		}
 	}

From fd9d432d10c885087f568a6eba463b9bb1f6fda0 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 6 Mar 2024 18:42:03 +0800
Subject: [PATCH 028/114] fix: optimize the configuration of
 setWebpackOptimizationSplitChunks #809 #787

---
 ui/config-overrides.js  | 38 ++++++++++++++++++++------------------
 ui/template/header.html |  4 +++-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 19698173..9d1a3a7a 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -44,27 +44,11 @@ module.exports = {
       minChunks: 2,
       cacheGroups: {
         automaticNamePrefix: 'chunk',
-        components: {
-          test: /[\\/]components[\\/]/,
-          name: 'components',
-          priority: 13,
-          minChunks: 2,
-          reuseExistingChunk: true,
-          enforce: true,
-        },
-        commons: {
-          test: /[\\/]common[\\/]/,
-          name: 'common',
-          priority: 12,
-          minChunks: 2,
-          reuseExistingChunk: true,
-          enforce: true,
-        },
         i18next: {
           name: 'i18next',
           test: /[\/]node_modules[\/](i18next)[\/]/,
           filename: 'static/js/[name].[contenthash:8].chunk.js',
-          priority: 11,
+          priority: 12,
           reuseExistingChunk: true,
           minChunks: 1,
           chunks: 'initial',
@@ -73,11 +57,20 @@ module.exports = {
           name: 'react-bootstrap',
           test: /[\/]node_modules[\/](react-bootstrap)[\/]/,
           filename: 'static/js/[name].[contenthash:8].chunk.js',
-          priority: 10,
+          priority: 11,
           minChunks: 1,
           chunks: 'initial',
           reuseExistingChunk: true,
         },
+        lodash: {
+          name: 'lodash',
+          test: /[\/]node_modules[\/](lodash)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 10,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
         codemirror: {
           name: 'codemirror',
           test: /[\/]node_modules[\/](codemirror)[\/]/,
@@ -103,6 +96,15 @@ module.exports = {
           minChunks: 1,
           chunks: 'initial',
         },
+        reactDom: {
+          name: 'react-dom',
+          test: /[\/]node_modules[\/](react-dom)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          chunks: 'all',
+          enforce: true,
+        },
         nodesAsync: {
           name: 'chunk-nodesAsync',
           test: /[\/]node_modules[\/]/,
diff --git a/ui/template/header.html b/ui/template/header.html
index 85425674..75c696f9 100644
--- a/ui/template/header.html
+++ b/ui/template/header.html
@@ -54,7 +54,9 @@
       href="{{.siteinfo.Branding.SquareIcon}}"
       data-rh="true"
     />
-    <script defer="defer" src="{{.scriptPath}}"></script>
+    {{range $path := .scriptPath}}
+    <script defer="defer" src="{{$path}}"></script>
+    {{end}}
     {{if $.siteinfo.JsonLD }}{{ .siteinfo.JsonLD | templateHTML}}{{end}}
   </head>
 

From 6c9868dcb31068a2021d2de80468898f8aa20471 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 6 Mar 2024 18:43:43 +0800
Subject: [PATCH 029/114] fix: template supports multiple script tags

---
 internal/controller/template_controller.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go
index 6b4c4bbe..b128b91a 100644
--- a/internal/controller/template_controller.go
+++ b/internal/controller/template_controller.go
@@ -22,7 +22,6 @@ package controller
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/incubator-answer/internal/entity"
 	"html/template"
 	"net/http"
 	"regexp"
@@ -32,6 +31,7 @@ import (
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	templaterender "github.com/apache/incubator-answer/internal/controller/template_render"
+	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/apache/incubator-answer/pkg/checker"
@@ -47,7 +47,7 @@ import (
 var SiteUrl = ""
 
 type TemplateController struct {
-	scriptPath               string
+	scriptPath               []string
 	cssPath                  string
 	templateRenderController *templaterender.TemplateRenderController
 	siteInfoService          siteinfo_common.SiteInfoCommonService
@@ -66,18 +66,21 @@ func NewTemplateController(
 		siteInfoService:          siteInfoService,
 	}
 }
-func GetStyle() (script, css string) {
+func GetStyle() (script []string, css string) {
 	file, err := ui.Build.ReadFile("build/index.html")
 	if err != nil {
 		return
 	}
-	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="(.*)"></script>`)
-	scriptData := scriptRegexp.FindStringSubmatch(string(file))
+	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="([^"]*)"></script>`)
+	scriptData := scriptRegexp.FindAllStringSubmatch(string(file), -1)
+	for _, s := range scriptData {
+		if len(s) == 2 {
+			script = append(script, s[1])
+		}
+	}
+
 	cssRegexp := regexp.MustCompile(`<link href="(.*)" rel="stylesheet">`)
 	cssListData := cssRegexp.FindStringSubmatch(string(file))
-	if len(scriptData) == 2 {
-		script = scriptData[1]
-	}
 	if len(cssListData) == 2 {
 		css = cssListData[1]
 	}

From af310a0f44764920b3053a914617951f151057d4 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 7 Mar 2024 10:07:22 +0800
Subject: [PATCH 030/114] fix: components split chunks

---
 ui/config-overrides.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 9d1a3a7a..0df95a9b 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -44,6 +44,14 @@ module.exports = {
       minChunks: 2,
       cacheGroups: {
         automaticNamePrefix: 'chunk',
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 14,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
         i18next: {
           name: 'i18next',
           test: /[\/]node_modules[\/](i18next)[\/]/,

From aa0cddb1bc9c096029af1dc974d07a7154f35e78 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 7 Mar 2024 10:15:48 +0800
Subject: [PATCH 031/114] fix: add analyze script

---
 ui/package.json   |  6 +++---
 ui/pnpm-lock.yaml | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 99543e12..63a1f85d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "homepage": "/",
   "scripts": {
-    "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
     "lint": "eslint . --cache --fix --ext .ts,.tsx",
@@ -13,7 +12,8 @@
     "prepare": "pnpm build:packages",
     "pre-commit": "lint-staged",
     "build:packages": "pnpm -r --filter=./src/plugins/* run build",
-    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules"
+    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules",
+    "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "dependencies": {
     "axios": "^0.27.2",
@@ -39,7 +39,6 @@
     "react-i18next": "^11.18.3",
     "react-router-dom": "^6.8.1",
     "semver": "^7.3.8",
-    "source-map-explorer": "^2.5.3",
     "swr": "^1.3.0",
     "zustand": "^4.1.1"
   },
@@ -84,6 +83,7 @@
     "react-app-rewired": "^2.2.1",
     "react-scripts": "5.0.1",
     "sass": "^1.54.4",
+    "source-map-explorer": "^2.5.3",
     "typescript": "^4.9.5",
     "yaml-loader": "^0.8.0"
   },
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index a46f8f75..83bdc9e2 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -77,9 +77,6 @@ importers:
       semver:
         specifier: ^7.3.8
         version: 7.3.8
-      source-map-explorer:
-        specifier: ^2.5.3
-        version: 2.5.3
       swr:
         specifier: ^1.3.0
         version: 1.3.0(react@18.2.0)
@@ -207,6 +204,9 @@ importers:
       sass:
         specifier: ^1.54.4
         version: 1.54.9
+      source-map-explorer:
+        specifier: ^2.5.3
+        version: 2.5.3
       typescript:
         specifier: ^4.9.5
         version: 4.9.5
@@ -4540,7 +4540,7 @@ packages:
     resolution: {integrity: sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==}
     engines: {node: '>= 0.4.0'}
     hasBin: true
-    dev: false
+    dev: true
 
   /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
@@ -9151,7 +9151,7 @@ packages:
     dependencies:
       is-docker: 2.2.1
       is-wsl: 2.2.0
-    dev: false
+    dev: true
 
   /open@8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
@@ -10797,7 +10797,7 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.3
-    dev: false
+    dev: true
 
   /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
@@ -11175,7 +11175,7 @@ packages:
       source-map: 0.7.4
       temp: 0.9.4
       yargs: 16.2.0
-    dev: false
+    dev: true
 
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
@@ -11625,7 +11625,7 @@ packages:
     dependencies:
       mkdirp: 0.5.6
       rimraf: 2.6.3
-    dev: false
+    dev: true
 
   /tempy@0.6.0:
     resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==}

From 6af56c63a034e730a5bda7c8ceb1ac5566267a79 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 11:01:18 +0800
Subject: [PATCH 032/114] feat(review): Add review API

---
 cmd/wire_gen.go                              |   9 +-
 internal/controller/controller.go            |   1 +
 internal/controller/review_controller.go     |  94 +++++++++++++
 internal/entity/review_entity.go             |  48 +++++++
 internal/repo/provider.go                    |   2 +
 internal/repo/review/review_repo.go          |  94 +++++++++++++
 internal/router/answer_api_router.go         |   7 +
 internal/schema/review_schema.go             |  37 +++++
 internal/schema/simple_obj_info_schema.go    |  12 +-
 internal/service/content/revision_service.go |  27 ++--
 internal/service/object_info/object_info.go  |  47 +++++--
 internal/service/provider.go                 |   2 +
 internal/service/review/review_service.go    | 141 +++++++++++++++++++
 13 files changed, 492 insertions(+), 29 deletions(-)
 create mode 100644 internal/controller/review_controller.go
 create mode 100644 internal/entity/review_entity.go
 create mode 100644 internal/repo/review/review_repo.go
 create mode 100644 internal/schema/review_schema.go
 create mode 100644 internal/service/review/review_service.go

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index de173cfb..c1eb434b 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -33,6 +33,7 @@ import (
 	"github.com/apache/incubator-answer/internal/repo/rank"
 	"github.com/apache/incubator-answer/internal/repo/reason"
 	"github.com/apache/incubator-answer/internal/repo/report"
+	"github.com/apache/incubator-answer/internal/repo/review"
 	"github.com/apache/incubator-answer/internal/repo/revision"
 	"github.com/apache/incubator-answer/internal/repo/role"
 	"github.com/apache/incubator-answer/internal/repo/search_common"
@@ -70,6 +71,7 @@ import (
 	reason2 "github.com/apache/incubator-answer/internal/service/reason"
 	report2 "github.com/apache/incubator-answer/internal/service/report"
 	"github.com/apache/incubator-answer/internal/service/report_handle"
+	review2 "github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	role2 "github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
@@ -191,7 +193,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)
 	searchService := content.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService, captchaService)
-	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo)
+	reviewRepo := review.NewReviewRepo(dataData)
+	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon)
+	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo, reviewService)
 	revisionController := controller.NewRevisionController(contentRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	userAdminRepo := user.NewUserAdminRepo(dataData, authRepo)
@@ -224,7 +228,8 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	pluginController := controller_admin.NewPluginController(pluginCommonService)
 	permissionController := controller.NewPermissionController(rankService)
 	userPluginController := controller.NewUserPluginController(pluginCommonService)
-	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, userAdminController, reasonController, themeController, siteInfoController, controllerSiteInfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController, userPluginController)
+	reviewController := controller.NewReviewController(reviewService, rankService, captchaService)
+	answerAPIRouter := router.NewAnswerAPIRouter(langController, userController, commentController, reportController, voteController, tagController, followController, collectionController, questionController, answerController, searchController, revisionController, rankController, userAdminController, reasonController, themeController, siteInfoController, controllerSiteInfoController, notificationController, dashboardController, uploadController, activityController, roleController, pluginController, permissionController, userPluginController, reviewController)
 	swaggerRouter := router.NewSwaggerRouter(swaggerConf)
 	uiRouter := router.NewUIRouter(controllerSiteInfoController, siteInfoCommonService)
 	authUserMiddleware := middleware.NewAuthUserMiddleware(authService, siteInfoCommonService)
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index 0dd8e3ef..42c2c1d3 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -47,4 +47,5 @@ var ProviderSetController = wire.NewSet(
 	NewUserCenterController,
 	NewPermissionController,
 	NewUserPluginController,
+	NewReviewController,
 )
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
new file mode 100644
index 00000000..a80b9860
--- /dev/null
+++ b/internal/controller/review_controller.go
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package controller
+
+import (
+	"github.com/apache/incubator-answer/internal/base/handler"
+	"github.com/apache/incubator-answer/internal/schema"
+	"github.com/apache/incubator-answer/internal/service/action"
+	"github.com/apache/incubator-answer/internal/service/rank"
+	"github.com/apache/incubator-answer/internal/service/review"
+	"github.com/gin-gonic/gin"
+)
+
+// ReviewController review controller
+type ReviewController struct {
+	reviewService *review.ReviewService
+	rankService   *rank.RankService
+	actionService *action.CaptchaService
+}
+
+// NewReviewController new controller
+func NewReviewController(
+	reviewService *review.ReviewService,
+	rankService *rank.RankService,
+	actionService *action.CaptchaService,
+) *ReviewController {
+	return &ReviewController{
+		reviewService: reviewService,
+		rankService:   rankService,
+		actionService: actionService,
+	}
+}
+
+// GetUnreviewedPostPage get unreviewed post page
+// @Summary get unreviewed post page
+// @Description get unreviewed post page
+// @Tags Review
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param page query int false "page"
+// @Success 200 {object} handler.RespBody{data=pager.PageModel{list=[]schema.GetUnreviewedPostPageResp}}
+// @Router /answer/api/v1/review/pending/post/page [get]
+func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
+	req := &schema.GetUnreviewedPostPageReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+
+	// TODO: check permission
+
+	resp, err := rc.reviewService.GetUnreviewedPostPage(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
+}
+
+// UpdateReview update review
+// @Summary update review
+// @Description update review
+// @Security ApiKeyAuth
+// @Tags Review
+// @Accept json
+// @Produce json
+// @Security ApiKeyAuth
+// @Param data body schema.UpdateReviewReq true "review"
+// @Success 200 {object} handler.RespBody
+// @Router /answer/api/v1/review/pending/post [put]
+func (rc *ReviewController) UpdateReview(ctx *gin.Context) {
+	req := &schema.UpdateReviewReq{}
+	if handler.BindAndCheck(ctx, req) {
+		return
+	}
+
+	// TODO: check permission
+
+	err := rc.reviewService.UpdateReview(ctx, req)
+	handler.HandleResponse(ctx, err, nil)
+}
diff --git a/internal/entity/review_entity.go b/internal/entity/review_entity.go
new file mode 100644
index 00000000..f1372d83
--- /dev/null
+++ b/internal/entity/review_entity.go
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package entity
+
+import "time"
+
+const (
+	ReviewStatusPending  = 1
+	ReviewStatusApproved = 2
+	ReviewStatusRejected = 3
+)
+
+// Review review
+type Review 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 BIGINT(20) user_id"`
+	ObjectID             string    `xorm:"not null BIGINT(20) object_id"`
+	ObjectType           int       `xorm:"not null default 0 INT(11) object_type"`
+	ReviewerUserID       string    `xorm:"not null default 0 BIGINT(20) reviewer_user_id"`
+	Submitter            string    `xorm:"not null default '' VARCHAR(100) submitter"`
+	SubmitterDisplayName string    `xorm:"not null default '' VARCHAR(100) submitter_display_name"`
+	Reason               string    `xorm:"not null default '' TEXT reason"`
+	Status               int       `xorm:"not null default 0 INT(11) status"`
+}
+
+// TableName review table name
+func (Review) TableName() string {
+	return "review"
+}
diff --git a/internal/repo/provider.go b/internal/repo/provider.go
index 931ccde1..041b6c87 100644
--- a/internal/repo/provider.go
+++ b/internal/repo/provider.go
@@ -38,6 +38,7 @@ import (
 	"github.com/apache/incubator-answer/internal/repo/rank"
 	"github.com/apache/incubator-answer/internal/repo/reason"
 	"github.com/apache/incubator-answer/internal/repo/report"
+	"github.com/apache/incubator-answer/internal/repo/review"
 	"github.com/apache/incubator-answer/internal/repo/revision"
 	"github.com/apache/incubator-answer/internal/repo/role"
 	"github.com/apache/incubator-answer/internal/repo/search_common"
@@ -97,4 +98,5 @@ var ProviderSetRepo = wire.NewSet(
 	user_notification_config.NewUserNotificationConfigRepo,
 	limit.NewRateLimitRepo,
 	plugin_config.NewPluginUserConfigRepo,
+	review.NewReviewRepo,
 )
diff --git a/internal/repo/review/review_repo.go b/internal/repo/review/review_repo.go
new file mode 100644
index 00000000..80a02071
--- /dev/null
+++ b/internal/repo/review/review_repo.go
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package review
+
+import (
+	"context"
+
+	"github.com/apache/incubator-answer/internal/base/data"
+	"github.com/apache/incubator-answer/internal/base/pager"
+	"github.com/apache/incubator-answer/internal/base/reason"
+	"github.com/apache/incubator-answer/internal/entity"
+	"github.com/apache/incubator-answer/internal/service/review"
+	"github.com/segmentfault/pacman/errors"
+)
+
+// reviewRepo review repository
+type reviewRepo struct {
+	data *data.Data
+}
+
+// NewReviewRepo new repository
+func NewReviewRepo(data *data.Data) review.ReviewRepo {
+	return &reviewRepo{
+		data: data,
+	}
+}
+
+// AddReview add review
+func (cr *reviewRepo) AddReview(ctx context.Context, review *entity.Review) (err error) {
+	_, err = cr.data.DB.Context(ctx).Insert(review)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
+// UpdateReviewStatus update review status
+func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error) {
+	_, err = cr.data.DB.Context(ctx).ID(reviewID).Update(&entity.Review{
+		ReviewerUserID: reviewerUserID, Status: status})
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
+// GetReview get review one
+func (cr *reviewRepo) GetReview(ctx context.Context, reviewID string) (
+	review *entity.Review, exist bool, err error) {
+	review = &entity.Review{}
+	exist, err = cr.data.DB.Context(ctx).ID(reviewID).Get(review)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
+// GetReviewCount get review count
+func (cr *reviewRepo) GetReviewCount(ctx context.Context, status int) (count int64, err error) {
+	count, err = cr.data.DB.Context(ctx).Count(&entity.Review{Status: status})
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
+// GetReviewPage get review page
+func (cr *reviewRepo) GetReviewPage(ctx context.Context, page, pageSize int, cond *entity.Review) (
+	reviewList []*entity.Review, total int64, err error) {
+	session := cr.data.DB.Context(ctx).Asc("created_at")
+	reviewList = make([]*entity.Review, 0)
+	total, err = pager.Help(page, pageSize, &reviewList, cond, session)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go
index b5786ba0..1ea2be89 100644
--- a/internal/router/answer_api_router.go
+++ b/internal/router/answer_api_router.go
@@ -53,6 +53,7 @@ type AnswerAPIRouter struct {
 	pluginController        *controller_admin.PluginController
 	permissionController    *controller.PermissionController
 	userPluginController    *controller.UserPluginController
+	reviewController        *controller.ReviewController
 }
 
 func NewAnswerAPIRouter(
@@ -82,6 +83,7 @@ func NewAnswerAPIRouter(
 	pluginController *controller_admin.PluginController,
 	permissionController *controller.PermissionController,
 	userPluginController *controller.UserPluginController,
+	reviewController *controller.ReviewController,
 ) *AnswerAPIRouter {
 	return &AnswerAPIRouter{
 		langController:          langController,
@@ -110,6 +112,7 @@ func NewAnswerAPIRouter(
 		pluginController:        pluginController,
 		permissionController:    permissionController,
 		userPluginController:    userPluginController,
+		reviewController:        reviewController,
 	}
 }
 
@@ -203,6 +206,10 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
 	r.GET("/report/unreviewed/post", a.reportController.GetUnreviewedReportPostPage)
 	r.PUT("/report/review", a.reportController.ReviewReport)
 
+	// review
+	r.GET("/review/pending/post/page", a.reviewController.GetUnreviewedPostPage)
+	r.PUT("/review/pending/post", a.reviewController.UpdateReview)
+
 	// vote
 	r.POST("/vote/up", a.voteController.VoteUp)
 	r.POST("/vote/down", a.voteController.VoteDown)
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
new file mode 100644
index 00000000..c3341ab7
--- /dev/null
+++ b/internal/schema/review_schema.go
@@ -0,0 +1,37 @@
+package schema
+
+// UpdateReviewReq update review request
+type UpdateReviewReq struct {
+	ReviewID string `validate:"required" json:"review_id"`
+	Status   string `validate:"required,oneof=approve reject" json:"status"`
+	UserID   string `json:"-"`
+}
+
+func (r *UpdateReviewReq) IsApprove() bool {
+	return r.Status == "approve"
+}
+
+func (r *UpdateReviewReq) IsReject() bool {
+	return r.Status == "reject"
+}
+
+// GetUnreviewedPostPageReq get review page request
+type GetUnreviewedPostPageReq struct {
+	Page   int    `json:"page" form:"page"`
+	UserID string `json:"-"`
+}
+
+// GetUnreviewedPostPageResp get review page response
+type GetUnreviewedPostPageResp struct {
+	ReviewID             string        `json:"review_id"`
+	CreatedAt            int64         `json:"created_at"`
+	ObjectID             string        `json:"object_id"`
+	ObjectType           string        `json:"object_type" enums:"question,answer,comment"`
+	Title                string        `json:"title"`
+	ParsedText           string        `json:"parsed_text"`
+	Tags                 []*TagResp    `json:"tags"`
+	AuthorUserID         string        `json:"author_user_id"`
+	UserInfo             UserBasicInfo `json:"user_info"`
+	SubmitAt             int64         `json:"submit_at"`
+	SubmitterDisplayName string        `json:"submitter_display_name"`
+}
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 7d2d4057..2c20d63b 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -34,9 +34,11 @@ type SimpleObjectInfo struct {
 }
 
 type UnreviewedRevisionInfoInfo struct {
-	ObjectID string     `json:"object_id"`
-	Title    string     `json:"title"`
-	Content  string     `json:"content"`
-	Html     string     `json:"html"`
-	Tags     []*TagResp `json:"tags"`
+	CreatedAt           int64      `json:"created_at"`
+	ObjectID            string     `json:"object_id"`
+	ObjectCreatorUserID string     `json:"object_creator_user_id"`
+	Title               string     `json:"title"`
+	Content             string     `json:"content"`
+	Html                string     `json:"html"`
+	Tags                []*TagResp `json:"tags"`
 }
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index da051965..3a3b8d5c 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -35,6 +35,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/object_info"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/report_common"
+	"github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/internal/service/revision"
 	"github.com/apache/incubator-answer/internal/service/tag_common"
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
@@ -60,6 +61,7 @@ type RevisionService struct {
 	notificationQueueService notice_queue.NotificationQueueService
 	activityQueueService     activity_queue.ActivityQueueService
 	reportRepo               report_common.ReportRepo
+	reviewService            *review.ReviewService
 }
 
 func NewRevisionService(
@@ -75,6 +77,7 @@ func NewRevisionService(
 	notificationQueueService notice_queue.NotificationQueueService,
 	activityQueueService activity_queue.ActivityQueueService,
 	reportRepo report_common.ReportRepo,
+	reviewService *review.ReviewService,
 ) *RevisionService {
 	return &RevisionService{
 		revisionRepo:             revisionRepo,
@@ -89,6 +92,7 @@ func NewRevisionService(
 		notificationQueueService: notificationQueueService,
 		activityQueueService:     activityQueueService,
 		reportRepo:               reportRepo,
+		reviewService:            reviewService,
 	}
 }
 
@@ -451,12 +455,19 @@ func (rs *RevisionService) CheckCanUpdateRevision(ctx context.Context, req *sche
 func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.GetReviewingTypeReq) (resp []*schema.GetReviewingTypeResp, err error) {
 	resp = make([]*schema.GetReviewingTypeResp, 0)
 
-	// TODO: get queue amount
-	resp = append(resp, &schema.GetReviewingTypeResp{
-		Name:       string(constant.QueuedPost),
-		Label:      "",
-		TodoAmount: 0,
-	})
+	// get queue amount
+	if req.IsAdmin {
+		reportCount, err := rs.reviewService.GetReviewPendingCount(ctx)
+		if err != nil {
+			log.Errorf("get report count failed: %v", err)
+		} else {
+			resp = append(resp, &schema.GetReviewingTypeResp{
+				Name:       string(constant.QueuedPost),
+				Label:      "Queued post",
+				TodoAmount: reportCount,
+			})
+		}
+	}
 
 	// get flag amount
 	if req.IsAdmin {
@@ -466,7 +477,7 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 		} else {
 			resp = append(resp, &schema.GetReviewingTypeResp{
 				Name:       string(constant.FlaggedPost),
-				Label:      "",
+				Label:      "Flagged post",
 				TodoAmount: reportCount,
 			})
 		}
@@ -479,7 +490,7 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 	} else {
 		resp = append(resp, &schema.GetReviewingTypeResp{
 			Name:       string(constant.SuggestedPostEdit),
-			Label:      "",
+			Label:      "Suggested edits",
 			TodoAmount: countUnreviewedRevision,
 		})
 	}
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 9ef5a892..43f87743 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -87,11 +87,13 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			return nil, err
 		}
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
-			ObjectID: questionInfo.ID,
-			Title:    questionInfo.Title,
-			Content:  questionInfo.OriginalText,
-			Html:     questionInfo.ParsedText,
-			Tags:     tags,
+			CreatedAt:           questionInfo.CreatedAt.Unix(),
+			ObjectID:            questionInfo.ID,
+			ObjectCreatorUserID: questionInfo.UserID,
+			Title:               questionInfo.Title,
+			Content:             questionInfo.OriginalText,
+			Html:                questionInfo.ParsedText,
+			Tags:                tags,
 		}
 	case constant.AnswerObjectType:
 		answerInfo, exist, err := os.answerRepo.GetAnswer(ctx, objectID)
@@ -113,12 +115,13 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			questionInfo.ID = uid.EnShortID(questionInfo.ID)
 		}
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
-			ObjectID: answerInfo.ID,
-			Title:    questionInfo.Title,
-			Content:  answerInfo.OriginalText,
-			Html:     answerInfo.ParsedText,
+			CreatedAt:           answerInfo.CreatedAt.Unix(),
+			ObjectID:            answerInfo.ID,
+			ObjectCreatorUserID: answerInfo.UserID,
+			Title:               questionInfo.Title,
+			Content:             answerInfo.OriginalText,
+			Html:                answerInfo.ParsedText,
 		}
-
 	case constant.TagObjectType:
 		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID, true)
 		if err != nil {
@@ -128,10 +131,26 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			break
 		}
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
-			ObjectID: tagInfo.ID,
-			Title:    tagInfo.SlugName,
-			Content:  tagInfo.OriginalText,
-			Html:     tagInfo.ParsedText,
+			CreatedAt: tagInfo.CreatedAt.Unix(),
+			ObjectID:  tagInfo.ID,
+			Title:     tagInfo.SlugName,
+			Content:   tagInfo.OriginalText,
+			Html:      tagInfo.ParsedText,
+		}
+	case constant.CommentObjectType:
+		commentInfo, exist, err := os.commentRepo.GetComment(ctx, objectID)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			break
+		}
+		objInfo = &schema.UnreviewedRevisionInfoInfo{
+			CreatedAt:           commentInfo.CreatedAt.Unix(),
+			ObjectID:            commentInfo.ID,
+			ObjectCreatorUserID: commentInfo.UserID,
+			Content:             commentInfo.OriginalText,
+			Html:                commentInfo.ParsedText,
 		}
 	}
 	if objInfo == nil {
diff --git a/internal/service/provider.go b/internal/service/provider.go
index 5e381bf6..2bdd42b6 100644
--- a/internal/service/provider.go
+++ b/internal/service/provider.go
@@ -46,6 +46,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/reason"
 	"github.com/apache/incubator-answer/internal/service/report"
 	"github.com/apache/incubator-answer/internal/service/report_handle"
+	"github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	"github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
@@ -113,4 +114,5 @@ var ProviderSetService = wire.NewSet(
 	user_notification_config.NewUserNotificationConfigService,
 	notification.NewExternalNotificationService,
 	notice_queue.NewNewQuestionNotificationQueueService,
+	review.NewReviewService,
 )
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
new file mode 100644
index 00000000..7a0f90ae
--- /dev/null
+++ b/internal/service/review/review_service.go
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package review
+
+import (
+	"context"
+
+	"github.com/apache/incubator-answer/internal/base/pager"
+	"github.com/apache/incubator-answer/internal/base/reason"
+	"github.com/apache/incubator-answer/internal/entity"
+	"github.com/apache/incubator-answer/internal/schema"
+	"github.com/apache/incubator-answer/internal/service/object_info"
+	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/jinzhu/copier"
+	"github.com/segmentfault/pacman/errors"
+	"github.com/segmentfault/pacman/log"
+)
+
+// ReviewRepo review repository
+type ReviewRepo interface {
+	AddReview(ctx context.Context, review *entity.Review) (err error)
+	UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error)
+	GetReview(ctx context.Context, reviewID string) (review *entity.Review, exist bool, err error)
+	GetReviewCount(ctx context.Context, status int) (count int64, err error)
+	GetReviewPage(ctx context.Context, page, pageSize int, cond *entity.Review) (reviewList []*entity.Review, total int64, err error)
+}
+
+// ReviewService user service
+type ReviewService struct {
+	reviewRepo        ReviewRepo
+	objectInfoService *object_info.ObjService
+	userCommon        *usercommon.UserCommon
+}
+
+// NewReviewService new review service
+func NewReviewService(
+	reviewRepo ReviewRepo,
+	objectInfoService *object_info.ObjService,
+	userCommon *usercommon.UserCommon,
+) *ReviewService {
+	return &ReviewService{
+		reviewRepo:        reviewRepo,
+		objectInfoService: objectInfoService,
+		userCommon:        userCommon,
+	}
+}
+
+// AddReview add review
+func (cs *ReviewService) AddReview(ctx context.Context, review *entity.Review) (err error) {
+	return cs.reviewRepo.AddReview(ctx, review)
+}
+
+// UpdateReview update review
+func (cs *ReviewService) UpdateReview(ctx context.Context, req *schema.UpdateReviewReq) (err error) {
+	review, exist, err := cs.reviewRepo.GetReview(ctx, req.ReviewID)
+	if err != nil {
+		return err
+	}
+	if !exist {
+		return errors.BadRequest(reason.ObjectNotFound)
+	}
+	if review.Status != entity.ReviewStatusPending {
+		return nil
+	}
+
+	if req.IsApprove() {
+		// TODO update object status
+	} else {
+		// TODO update object status
+	}
+
+	if req.IsApprove() {
+		err = cs.reviewRepo.UpdateReviewStatus(ctx, req.ReviewID, req.UserID, entity.ReviewStatusApproved)
+	} else {
+		err = cs.reviewRepo.UpdateReviewStatus(ctx, req.ReviewID, req.UserID, entity.ReviewStatusRejected)
+	}
+	return
+}
+
+// GetReviewPendingCount get review pending count
+func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64, err error) {
+	return cs.reviewRepo.GetReviewCount(ctx, entity.ReviewStatusPending)
+}
+
+// GetUnreviewedPostPage get review page
+func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
+	pageModel *pager.PageModel, err error) {
+	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{})
+	if err != nil {
+		return
+	}
+
+	resp := make([]*schema.GetUnreviewedPostPageResp, 0)
+	for _, review := range reviewList {
+		info, err := cs.objectInfoService.GetUnreviewedRevisionInfo(ctx, review.ObjectID)
+		if err != nil {
+			log.Errorf("GetUnreviewedRevisionInfo failed, err: %v", err)
+			continue
+		}
+
+		r := &schema.GetUnreviewedPostPageResp{
+			ReviewID:             review.ID,
+			CreatedAt:            info.CreatedAt,
+			ObjectID:             info.ObjectID,
+			ObjectType:           info.ObjectID,
+			Title:                info.Title,
+			ParsedText:           info.Html,
+			Tags:                 info.Tags,
+			AuthorUserID:         info.ObjectCreatorUserID,
+			SubmitAt:             review.CreatedAt.Unix(),
+			SubmitterDisplayName: review.SubmitterDisplayName,
+		}
+
+		// get user info
+		userInfo, exists, e := cs.userCommon.GetUserBasicInfoByID(ctx, info.ObjectCreatorUserID)
+		if e != nil {
+			log.Errorf("user not found by id: %s, err: %v", info.ObjectCreatorUserID, e)
+		}
+		if exists {
+			_ = copier.Copy(&r.UserInfo, userInfo)
+		}
+	}
+	return pager.NewPageModel(total, resp), nil
+}

From beeb898b9e52e04b407f2dd0b5cf20946ed1df93 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 11:01:54 +0800
Subject: [PATCH 033/114] docs(swagger): update swagger

---
 docs/docs.go      | 366 ++++++++++++++++++++++++++++++++++++++++------
 docs/swagger.json | 363 +++++++++++++++++++++++++++++++++++++++------
 docs/swagger.yaml | 238 +++++++++++++++++++++++++-----
 3 files changed, 835 insertions(+), 132 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 85abcbb8..9ee5856d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,4 +1,5 @@
-// Package docs Code generated by swaggo/swag. DO NOT EDIT
+// Code generated by swaggo/swag. DO NOT EDIT.
+
 package docs
 
 import "github.com/swaggo/swag"
@@ -4335,7 +4336,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/answer/api/v1/report/": {
+        "/answer/api/v1/report/review": {
             "put": {
                 "security": [
                     {
@@ -4345,7 +4346,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "handle flag",
+                "description": "review report",
                 "consumes": [
                     "application/json"
                 ],
@@ -4355,7 +4356,7 @@ const docTemplate = `{
                 "tags": [
                     "Report"
                 ],
-                "summary": "handle flag",
+                "summary": "review report",
                 "parameters": [
                     {
                         "description": "flag",
@@ -4363,7 +4364,7 @@ const docTemplate = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/schema.ReportHandleReq"
+                            "$ref": "#/definitions/schema.ReviewReportReq"
                         }
                     }
                 ],
@@ -4377,17 +4378,14 @@ const docTemplate = `{
                 }
             }
         },
-        "/answer/api/v1/reports/page": {
+        "/answer/api/v1/report/unreviewed/post": {
             "get": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "list report records",
+                "description": "get unreviewed report post page",
                 "consumes": [
                     "application/json"
                 ],
@@ -4397,43 +4395,82 @@ const docTemplate = `{
                 "tags": [
                     "Report"
                 ],
-                "summary": "list report page",
+                "summary": "get unreviewed report post page",
                 "parameters": [
-                    {
-                        "enum": [
-                            "pending",
-                            "completed"
-                        ],
-                        "type": "string",
-                        "description": "status",
-                        "name": "status",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "enum": [
-                            "all",
-                            "question",
-                            "answer",
-                            "comment"
-                        ],
-                        "type": "string",
-                        "description": "object_type",
-                        "name": "object_type",
-                        "in": "query",
-                        "required": true
-                    },
                     {
                         "type": "integer",
-                        "description": "page size",
+                        "description": "page",
                         "name": "page",
                         "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page_size",
-                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetReportListPageResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/review/pending/post": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "update review",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Review"
+                ],
+                "summary": "update review",
+                "parameters": [
+                    {
+                        "description": "review",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.UpdateReviewReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -4446,6 +4483,69 @@ const docTemplate = `{
                 }
             }
         },
+        "/answer/api/v1/review/pending/post/page": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "get unreviewed post page",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Review"
+                ],
+                "summary": "get unreviewed post page",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "page",
+                        "name": "page",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetUnreviewedPostPageResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/reviewing/type": {
             "get": {
                 "security": [
@@ -7717,6 +7817,59 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.GetReportListPageResp": {
+            "type": "object",
+            "properties": {
+                "_": {
+                    "type": "string"
+                },
+                "answer_id": {
+                    "type": "string"
+                },
+                "comment_id": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "excerpt": {
+                    "type": "string"
+                },
+                "flagged_content": {
+                    "type": "string"
+                },
+                "flagged_reason": {
+                    "$ref": "#/definitions/schema.ReasonItem"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "reason": {
+                    "$ref": "#/definitions/schema.ReasonItem"
+                },
+                "report_user": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "reported_user": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.GetReviewingTypeResp": {
             "type": "object",
             "properties": {
@@ -7967,6 +8120,52 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.GetUnreviewedPostPageResp": {
+            "type": "object",
+            "properties": {
+                "author_user_id": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string",
+                    "enum": [
+                        "question",
+                        "answer",
+                        "comment"
+                    ]
+                },
+                "parsed_text": {
+                    "type": "string"
+                },
+                "review_id": {
+                    "type": "string"
+                },
+                "submit_at": {
+                    "type": "integer"
+                },
+                "submitter_display_name": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
+                },
+                "title": {
+                    "type": "string"
+                },
+                "user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                }
+            }
+        },
         "schema.GetUnreviewedRevisionResp": {
             "type": "object",
             "properties": {
@@ -8531,6 +8730,26 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.ReasonItem": {
+            "type": "object",
+            "properties": {
+                "content_type": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "placeholder": {
+                    "type": "string"
+                },
+                "reason_type": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.RecoverAnswerReq": {
             "type": "object",
             "required": [
@@ -8628,21 +8847,47 @@ const docTemplate = `{
                 }
             }
         },
-        "schema.ReportHandleReq": {
+        "schema.ReviewReportReq": {
             "type": "object",
             "required": [
-                "flagged_type",
-                "id"
+                "operation_type",
+                "report_id"
             ],
             "properties": {
-                "flagged_content": {
+                "close_msg": {
                     "type": "string"
                 },
-                "flagged_type": {
+                "close_type": {
                     "type": "integer"
                 },
-                "id": {
+                "content": {
+                    "type": "string",
+                    "maxLength": 65535,
+                    "minLength": 6
+                },
+                "operation_type": {
+                    "type": "string",
+                    "enum": [
+                        "edit_post",
+                        "close_post",
+                        "delete_post",
+                        "unlist_post",
+                        "ignore_report"
+                    ]
+                },
+                "report_id": {
                     "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagItem"
+                    }
+                },
+                "title": {
+                    "type": "string",
+                    "maxLength": 150,
+                    "minLength": 6
                 }
             }
         },
@@ -9369,9 +9614,15 @@ const docTemplate = `{
                 "content": {
                     "type": "string"
                 },
+                "created_at": {
+                    "type": "integer"
+                },
                 "html": {
                     "type": "string"
                 },
+                "object_creator_user_id": {
+                    "type": "string"
+                },
                 "object_id": {
                     "type": "string"
                 },
@@ -9505,6 +9756,25 @@ const docTemplate = `{
                 }
             }
         },
+        "schema.UpdateReviewReq": {
+            "type": "object",
+            "required": [
+                "review_id",
+                "status"
+            ],
+            "properties": {
+                "review_id": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string",
+                    "enum": [
+                        "approve",
+                        "reject"
+                    ]
+                }
+            }
+        },
         "schema.UpdateSMTPConfigReq": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 41858d60..4429af0b 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4324,7 +4324,7 @@
                 }
             }
         },
-        "/answer/api/v1/report/": {
+        "/answer/api/v1/report/review": {
             "put": {
                 "security": [
                     {
@@ -4334,7 +4334,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "handle flag",
+                "description": "review report",
                 "consumes": [
                     "application/json"
                 ],
@@ -4344,7 +4344,7 @@
                 "tags": [
                     "Report"
                 ],
-                "summary": "handle flag",
+                "summary": "review report",
                 "parameters": [
                     {
                         "description": "flag",
@@ -4352,7 +4352,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/schema.ReportHandleReq"
+                            "$ref": "#/definitions/schema.ReviewReportReq"
                         }
                     }
                 ],
@@ -4366,17 +4366,14 @@
                 }
             }
         },
-        "/answer/api/v1/reports/page": {
+        "/answer/api/v1/report/unreviewed/post": {
             "get": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "list report records",
+                "description": "get unreviewed report post page",
                 "consumes": [
                     "application/json"
                 ],
@@ -4386,43 +4383,82 @@
                 "tags": [
                     "Report"
                 ],
-                "summary": "list report page",
+                "summary": "get unreviewed report post page",
                 "parameters": [
-                    {
-                        "enum": [
-                            "pending",
-                            "completed"
-                        ],
-                        "type": "string",
-                        "description": "status",
-                        "name": "status",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "enum": [
-                            "all",
-                            "question",
-                            "answer",
-                            "comment"
-                        ],
-                        "type": "string",
-                        "description": "object_type",
-                        "name": "object_type",
-                        "in": "query",
-                        "required": true
-                    },
                     {
                         "type": "integer",
-                        "description": "page size",
+                        "description": "page",
                         "name": "page",
                         "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "page size",
-                        "name": "page_size",
-                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetReportListPageResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/answer/api/v1/review/pending/post": {
+            "put": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "update review",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Review"
+                ],
+                "summary": "update review",
+                "parameters": [
+                    {
+                        "description": "review",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/schema.UpdateReviewReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -4435,6 +4471,69 @@
                 }
             }
         },
+        "/answer/api/v1/review/pending/post/page": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "get unreviewed post page",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Review"
+                ],
+                "summary": "get unreviewed post page",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "page",
+                        "name": "page",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/handler.RespBody"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/definitions/pager.PageModel"
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "list": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "$ref": "#/definitions/schema.GetUnreviewedPostPageResp"
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            ]
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/answer/api/v1/reviewing/type": {
             "get": {
                 "security": [
@@ -7706,6 +7805,59 @@
                 }
             }
         },
+        "schema.GetReportListPageResp": {
+            "type": "object",
+            "properties": {
+                "_": {
+                    "type": "string"
+                },
+                "answer_id": {
+                    "type": "string"
+                },
+                "comment_id": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "excerpt": {
+                    "type": "string"
+                },
+                "flagged_content": {
+                    "type": "string"
+                },
+                "flagged_reason": {
+                    "$ref": "#/definitions/schema.ReasonItem"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "reason": {
+                    "$ref": "#/definitions/schema.ReasonItem"
+                },
+                "report_user": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "reported_user": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.GetReviewingTypeResp": {
             "type": "object",
             "properties": {
@@ -7956,6 +8108,52 @@
                 }
             }
         },
+        "schema.GetUnreviewedPostPageResp": {
+            "type": "object",
+            "properties": {
+                "author_user_id": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "integer"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "object_type": {
+                    "type": "string",
+                    "enum": [
+                        "question",
+                        "answer",
+                        "comment"
+                    ]
+                },
+                "parsed_text": {
+                    "type": "string"
+                },
+                "review_id": {
+                    "type": "string"
+                },
+                "submit_at": {
+                    "type": "integer"
+                },
+                "submitter_display_name": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
+                },
+                "title": {
+                    "type": "string"
+                },
+                "user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                }
+            }
+        },
         "schema.GetUnreviewedRevisionResp": {
             "type": "object",
             "properties": {
@@ -8520,6 +8718,26 @@
                 }
             }
         },
+        "schema.ReasonItem": {
+            "type": "object",
+            "properties": {
+                "content_type": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "placeholder": {
+                    "type": "string"
+                },
+                "reason_type": {
+                    "type": "integer"
+                }
+            }
+        },
         "schema.RecoverAnswerReq": {
             "type": "object",
             "required": [
@@ -8617,21 +8835,47 @@
                 }
             }
         },
-        "schema.ReportHandleReq": {
+        "schema.ReviewReportReq": {
             "type": "object",
             "required": [
-                "flagged_type",
-                "id"
+                "operation_type",
+                "report_id"
             ],
             "properties": {
-                "flagged_content": {
+                "close_msg": {
                     "type": "string"
                 },
-                "flagged_type": {
+                "close_type": {
                     "type": "integer"
                 },
-                "id": {
+                "content": {
+                    "type": "string",
+                    "maxLength": 65535,
+                    "minLength": 6
+                },
+                "operation_type": {
+                    "type": "string",
+                    "enum": [
+                        "edit_post",
+                        "close_post",
+                        "delete_post",
+                        "unlist_post",
+                        "ignore_report"
+                    ]
+                },
+                "report_id": {
                     "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagItem"
+                    }
+                },
+                "title": {
+                    "type": "string",
+                    "maxLength": 150,
+                    "minLength": 6
                 }
             }
         },
@@ -9358,9 +9602,15 @@
                 "content": {
                     "type": "string"
                 },
+                "created_at": {
+                    "type": "integer"
+                },
                 "html": {
                     "type": "string"
                 },
+                "object_creator_user_id": {
+                    "type": "string"
+                },
                 "object_id": {
                     "type": "string"
                 },
@@ -9494,6 +9744,25 @@
                 }
             }
         },
+        "schema.UpdateReviewReq": {
+            "type": "object",
+            "required": [
+                "review_id",
+                "status"
+            ],
+            "properties": {
+                "review_id": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string",
+                    "enum": [
+                        "approve",
+                        "reject"
+                    ]
+                }
+            }
+        },
         "schema.UpdateSMTPConfigReq": {
             "type": "object",
             "properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 40331dcf..ae4ed789 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -819,6 +819,41 @@ definitions:
         description: url title
         type: string
     type: object
+  schema.GetReportListPageResp:
+    properties:
+      _:
+        type: string
+      answer_id:
+        type: string
+      comment_id:
+        type: string
+      content:
+        type: string
+      created_at:
+        type: integer
+      excerpt:
+        type: string
+      flagged_content:
+        type: string
+      flagged_reason:
+        $ref: '#/definitions/schema.ReasonItem'
+      id:
+        type: string
+      object_type:
+        type: string
+      question_id:
+        type: string
+      reason:
+        $ref: '#/definitions/schema.ReasonItem'
+      report_user:
+        $ref: '#/definitions/schema.UserBasicInfo'
+      reported_user:
+        $ref: '#/definitions/schema.UserBasicInfo'
+      title:
+        type: string
+      updated_at:
+        type: integer
+    type: object
   schema.GetReviewingTypeResp:
     properties:
       label:
@@ -991,6 +1026,37 @@ definitions:
           $ref: '#/definitions/schema.TagSynonym'
         type: array
     type: object
+  schema.GetUnreviewedPostPageResp:
+    properties:
+      author_user_id:
+        type: string
+      created_at:
+        type: integer
+      object_id:
+        type: string
+      object_type:
+        enum:
+        - question
+        - answer
+        - comment
+        type: string
+      parsed_text:
+        type: string
+      review_id:
+        type: string
+      submit_at:
+        type: integer
+      submitter_display_name:
+        type: string
+      tags:
+        items:
+          $ref: '#/definitions/schema.TagResp'
+        type: array
+      title:
+        type: string
+      user_info:
+        $ref: '#/definitions/schema.UserBasicInfo'
+    type: object
   schema.GetUnreviewedRevisionResp:
     properties:
       info:
@@ -1387,6 +1453,19 @@ definitions:
     required:
     - id
     type: object
+  schema.ReasonItem:
+    properties:
+      content_type:
+        type: string
+      description:
+        type: string
+      name:
+        type: string
+      placeholder:
+        type: string
+      reason_type:
+        type: integer
+    type: object
   schema.RecoverAnswerReq:
     properties:
       answer_id:
@@ -1451,17 +1530,37 @@ definitions:
       question_id:
         type: string
     type: object
-  schema.ReportHandleReq:
+  schema.ReviewReportReq:
     properties:
-      flagged_content:
+      close_msg:
         type: string
-      flagged_type:
+      close_type:
         type: integer
-      id:
+      content:
+        maxLength: 65535
+        minLength: 6
+        type: string
+      operation_type:
+        enum:
+        - edit_post
+        - close_post
+        - delete_post
+        - unlist_post
+        - ignore_report
+        type: string
+      report_id:
+        type: string
+      tags:
+        items:
+          $ref: '#/definitions/schema.TagItem'
+        type: array
+      title:
+        maxLength: 150
+        minLength: 6
         type: string
     required:
-    - flagged_type
-    - id
+    - operation_type
+    - report_id
     type: object
   schema.RevisionAuditReq:
     properties:
@@ -1956,8 +2055,12 @@ definitions:
     properties:
       content:
         type: string
+      created_at:
+        type: integer
       html:
         type: string
+      object_creator_user_id:
+        type: string
       object_id:
         type: string
       tags:
@@ -2048,6 +2151,19 @@ definitions:
     required:
     - level
     type: object
+  schema.UpdateReviewReq:
+    properties:
+      review_id:
+        type: string
+      status:
+        enum:
+        - approve
+        - reject
+        type: string
+    required:
+    - review_id
+    - status
+    type: object
   schema.UpdateSMTPConfigReq:
     properties:
       encryption:
@@ -5097,18 +5213,18 @@ paths:
       summary: add report
       tags:
       - Report
-  /answer/api/v1/report/:
+  /answer/api/v1/report/review:
     put:
       consumes:
       - application/json
-      description: handle flag
+      description: review report
       parameters:
       - description: flag
         in: body
         name: data
         required: true
         schema:
-          $ref: '#/definitions/schema.ReportHandleReq'
+          $ref: '#/definitions/schema.ReviewReportReq'
       produces:
       - application/json
       responses:
@@ -5119,41 +5235,55 @@ paths:
       security:
       - ApiKeyAuth: []
       - ApiKeyAuth: []
-      summary: handle flag
+      summary: review report
       tags:
       - Report
-  /answer/api/v1/reports/page:
+  /answer/api/v1/report/unreviewed/post:
     get:
       consumes:
       - application/json
-      description: list report records
+      description: get unreviewed report post page
       parameters:
-      - description: status
-        enum:
-        - pending
-        - completed
-        in: query
-        name: status
-        required: true
-        type: string
-      - description: object_type
-        enum:
-        - all
-        - question
-        - answer
-        - comment
-        in: query
-        name: object_type
-        required: true
-        type: string
-      - description: page size
+      - description: page
         in: query
         name: page
         type: integer
-      - description: page size
-        in: query
-        name: page_size
-        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  allOf:
+                  - $ref: '#/definitions/pager.PageModel'
+                  - properties:
+                      list:
+                        items:
+                          $ref: '#/definitions/schema.GetReportListPageResp'
+                        type: array
+                    type: object
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: get unreviewed report post page
+      tags:
+      - Report
+  /answer/api/v1/review/pending/post:
+    put:
+      consumes:
+      - application/json
+      description: update review
+      parameters:
+      - description: review
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/schema.UpdateReviewReq'
       produces:
       - application/json
       responses:
@@ -5164,9 +5294,43 @@ paths:
       security:
       - ApiKeyAuth: []
       - ApiKeyAuth: []
-      summary: list report page
+      summary: update review
       tags:
-      - Report
+      - Review
+  /answer/api/v1/review/pending/post/page:
+    get:
+      consumes:
+      - application/json
+      description: get unreviewed post page
+      parameters:
+      - description: page
+        in: query
+        name: page
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            allOf:
+            - $ref: '#/definitions/handler.RespBody'
+            - properties:
+                data:
+                  allOf:
+                  - $ref: '#/definitions/pager.PageModel'
+                  - properties:
+                      list:
+                        items:
+                          $ref: '#/definitions/schema.GetUnreviewedPostPageResp'
+                        type: array
+                    type: object
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: get unreviewed post page
+      tags:
+      - Review
   /answer/api/v1/reviewing/type:
     get:
       description: get reviewing type

From 51067793e3893d4b86bb703367fc8f0c0d2e16e3 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 11:15:54 +0800
Subject: [PATCH 034/114] feat(migration): add migrations

---
 internal/migrations/migrations.go |  1 +
 internal/migrations/v20.go        | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 internal/migrations/v20.go

diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go
index dbd3acdb..8a259684 100644
--- a/internal/migrations/migrations.go
+++ b/internal/migrations/migrations.go
@@ -95,6 +95,7 @@ var migrations = []Migration{
 	NewMigration("v1.2.0", "add recover answer permission", addRecoverPermission, true),
 	NewMigration("v1.2.1", "add password login control", addPasswordLoginControl, true),
 	NewMigration("v1.2.5", "add notification plugin and theme config", addNotificationPluginAndThemeConfig, true),
+	NewMigration("v1.3.0", "add review", addReview, false),
 }
 
 func GetMigrations() []Migration {
diff --git a/internal/migrations/v20.go b/internal/migrations/v20.go
new file mode 100644
index 00000000..84c9c045
--- /dev/null
+++ b/internal/migrations/v20.go
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package migrations
+
+import (
+	"context"
+
+	"github.com/apache/incubator-answer/internal/entity"
+	"xorm.io/xorm"
+)
+
+func addReview(ctx context.Context, x *xorm.Engine) error {
+	return x.Context(ctx).Sync(new(entity.Review))
+}

From c26d83c27a6ca49804eb4350396d45b495918b6f Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 12:24:02 +0800
Subject: [PATCH 035/114] feat(question): add question review

---
 cmd/wire_gen.go                              |   6 +-
 internal/controller/review_controller.go     |   8 ++
 internal/entity/review_entity.go             |  21 ++--
 internal/schema/review_schema.go             |   5 +-
 internal/service/content/question_service.go |   7 ++
 internal/service/review/review_service.go    | 116 +++++++++++++++++--
 plugin/plugin.go                             |   5 +
 plugin/reviewer.go                           |  39 +++++++
 8 files changed, 183 insertions(+), 24 deletions(-)
 create mode 100644 plugin/reviewer.go

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index c1eb434b..62fc8854 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -171,7 +171,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
-	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService)
+	reviewRepo := review.NewReviewRepo(dataData)
+	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService)
+	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
 	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService)
 	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
 	reportService := report2.NewReportService(reportRepo, objService, userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle, configService)
@@ -193,8 +195,6 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)
 	searchService := content.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService, captchaService)
-	reviewRepo := review.NewReviewRepo(dataData)
-	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon)
 	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo, reviewService)
 	revisionController := controller.NewRevisionController(contentRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
index a80b9860..0000a951 100644
--- a/internal/controller/review_controller.go
+++ b/internal/controller/review_controller.go
@@ -25,6 +25,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/action"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/review"
+	"github.com/apache/incubator-answer/plugin"
 	"github.com/gin-gonic/gin"
 )
 
@@ -66,6 +67,13 @@ func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
 
 	// TODO: check permission
 
+	req.ReviewerMapping = make(map[string]string)
+	_ = plugin.CallReviewer(func(base plugin.Reviewer) error {
+		info := base.Info()
+		req.ReviewerMapping[info.SlugName] = info.Name.Translate(ctx)
+		return nil
+	})
+
 	resp, err := rc.reviewService.GetUnreviewedPostPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
diff --git a/internal/entity/review_entity.go b/internal/entity/review_entity.go
index f1372d83..199e635d 100644
--- a/internal/entity/review_entity.go
+++ b/internal/entity/review_entity.go
@@ -29,17 +29,16 @@ const (
 
 // Review review
 type Review 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 BIGINT(20) user_id"`
-	ObjectID             string    `xorm:"not null BIGINT(20) object_id"`
-	ObjectType           int       `xorm:"not null default 0 INT(11) object_type"`
-	ReviewerUserID       string    `xorm:"not null default 0 BIGINT(20) reviewer_user_id"`
-	Submitter            string    `xorm:"not null default '' VARCHAR(100) submitter"`
-	SubmitterDisplayName string    `xorm:"not null default '' VARCHAR(100) submitter_display_name"`
-	Reason               string    `xorm:"not null default '' TEXT reason"`
-	Status               int       `xorm:"not null default 0 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 BIGINT(20) user_id"`
+	ObjectID       string    `xorm:"not null BIGINT(20) object_id"`
+	ObjectType     int       `xorm:"not null default 0 INT(11) object_type"`
+	ReviewerUserID string    `xorm:"not null default 0 BIGINT(20) reviewer_user_id"`
+	Submitter      string    `xorm:"not null default '' VARCHAR(100) submitter"`
+	Reason         string    `xorm:"not null default '' TEXT reason"`
+	Status         int       `xorm:"not null default 0 INT(11) status"`
 }
 
 // TableName review table name
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index c3341ab7..ee03c107 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -17,8 +17,9 @@ func (r *UpdateReviewReq) IsReject() bool {
 
 // GetUnreviewedPostPageReq get review page request
 type GetUnreviewedPostPageReq struct {
-	Page   int    `json:"page" form:"page"`
-	UserID string `json:"-"`
+	Page            int               `json:"page" form:"page"`
+	ReviewerMapping map[string]string `json:"-"`
+	UserID          string            `json:"-"`
 }
 
 // GetUnreviewedPostPageResp get review page response
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index c2bfe125..aa1eff3b 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -42,6 +42,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/notification"
 	"github.com/apache/incubator-answer/internal/service/permission"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+	"github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	"github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
@@ -77,6 +78,7 @@ type QuestionService struct {
 	activityQueueService             activity_queue.ActivityQueueService
 	siteInfoService                  siteinfo_common.SiteInfoCommonService
 	newQuestionNotificationService   *notification.ExternalNotificationService
+	reviewService                    *review.ReviewService
 }
 
 func NewQuestionService(
@@ -96,6 +98,7 @@ func NewQuestionService(
 	activityQueueService activity_queue.ActivityQueueService,
 	siteInfoService siteinfo_common.SiteInfoCommonService,
 	newQuestionNotificationService *notification.ExternalNotificationService,
+	reviewService *review.ReviewService,
 ) *QuestionService {
 	return &QuestionService{
 		questionRepo:                     questionRepo,
@@ -114,6 +117,7 @@ func NewQuestionService(
 		activityQueueService:             activityQueueService,
 		siteInfoService:                  siteInfoService,
 		newQuestionNotificationService:   newQuestionNotificationService,
+		reviewService:                    reviewService,
 	}
 }
 
@@ -306,6 +310,9 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	question.Pin = entity.QuestionUnPin
 	question.Show = entity.QuestionShow
 	//question.UpdatedAt = nil
+	if qs.reviewService.AddQuestionReview(ctx, question, req.Tags) {
+		question.Status = entity.QuestionStatusPending
+	}
 	err = qs.questionRepo.AddQuestion(ctx, question)
 	if err != nil {
 		return
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 7a0f90ae..b47097b6 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -22,12 +22,17 @@ package review
 import (
 	"context"
 
+	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/pager"
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
+	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
 	"github.com/apache/incubator-answer/internal/service/object_info"
+	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+	"github.com/apache/incubator-answer/internal/service/role"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/plugin"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
@@ -47,6 +52,9 @@ type ReviewService struct {
 	reviewRepo        ReviewRepo
 	objectInfoService *object_info.ObjService
 	userCommon        *usercommon.UserCommon
+	questionRepo      questioncommon.QuestionRepo
+	answerRepo        answercommon.AnswerRepo
+	userRoleService   *role.UserRoleRelService
 }
 
 // NewReviewService new review service
@@ -54,17 +62,74 @@ func NewReviewService(
 	reviewRepo ReviewRepo,
 	objectInfoService *object_info.ObjService,
 	userCommon *usercommon.UserCommon,
+	questionRepo questioncommon.QuestionRepo,
+	answerRepo answercommon.AnswerRepo,
+	userRoleService *role.UserRoleRelService,
 ) *ReviewService {
 	return &ReviewService{
 		reviewRepo:        reviewRepo,
 		objectInfoService: objectInfoService,
 		userCommon:        userCommon,
+		questionRepo:      questionRepo,
+		answerRepo:        answerRepo,
+		userRoleService:   userRoleService,
 	}
 }
 
-// AddReview add review
-func (cs *ReviewService) AddReview(ctx context.Context, review *entity.Review) (err error) {
-	return cs.reviewRepo.AddReview(ctx, review)
+// AddQuestionReview add review for question if needed
+func (cs *ReviewService) AddQuestionReview(ctx context.Context,
+	question *entity.Question, tags []*schema.TagItem) (needReview bool) {
+	reviewContent := &plugin.ReviewContent{
+		Title:   question.Title,
+		Content: question.ParsedText,
+	}
+	for _, tag := range tags {
+		reviewContent.Tags = append(reviewContent.Tags, tag.SlugName)
+	}
+	reviewContent.Author = cs.getReviewContentAuthorInfo(ctx, question.UserID)
+
+	needReview = true
+	r := &entity.Review{
+		UserID:     question.UserID,
+		ObjectID:   question.ID,
+		ObjectType: constant.ObjectTypeStrMapping[constant.QuestionObjectType],
+		Status:     entity.ReviewStatusPending,
+	}
+	_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
+		result := reviewer.Review(reviewContent)
+		if result.Approved {
+			needReview = false
+		} else {
+			r.Reason = result.Reason
+			r.Submitter = reviewer.Info().SlugName
+		}
+		return nil
+	})
+
+	if needReview {
+		if err := cs.reviewRepo.AddReview(ctx, r); err != nil {
+			log.Errorf("add review failed, err: %v", err)
+		}
+	}
+	return needReview
+}
+
+// get review content author info
+func (cs *ReviewService) getReviewContentAuthorInfo(ctx context.Context, userID string) (author plugin.ReviewContentAuthor) {
+	user, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, userID)
+	if err != nil {
+		log.Errorf("get user info failed, err: %v", err)
+		return
+	}
+	if !exist {
+		log.Errorf("user not found by id: %s", userID)
+		return
+	}
+	author.Rank = user.Rank
+	author.ApprovedQuestionAmount, _ = cs.questionRepo.GetUserQuestionCount(ctx, userID)
+	author.ApprovedAnswerAmount, _ = cs.answerRepo.GetCountByUserID(ctx, userID)
+	author.Role, _ = cs.userRoleService.GetUserRole(ctx, userID)
+	return
 }
 
 // UpdateReview update review
@@ -80,10 +145,8 @@ func (cs *ReviewService) UpdateReview(ctx context.Context, req *schema.UpdateRev
 		return nil
 	}
 
-	if req.IsApprove() {
-		// TODO update object status
-	} else {
-		// TODO update object status
+	if err = cs.updateObjectStatus(ctx, review, req.IsApprove()); err != nil {
+		return err
 	}
 
 	if req.IsApprove() {
@@ -94,6 +157,43 @@ func (cs *ReviewService) UpdateReview(ctx context.Context, req *schema.UpdateRev
 	return
 }
 
+// update object status
+func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.Review, isApprove bool) (err error) {
+	objectType := constant.ObjectTypeNumberMapping[review.ObjectType]
+	switch objectType {
+	case constant.QuestionObjectType:
+		question, exist, err := cs.questionRepo.GetQuestion(ctx, review.ObjectID)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.BadRequest(reason.ObjectNotFound)
+		}
+		if isApprove {
+			question.Status = entity.QuestionStatusAvailable
+		} else {
+			question.Status = entity.QuestionStatusDeleted
+		}
+		return cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status)
+	case constant.AnswerObjectType:
+		answer, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.BadRequest(reason.ObjectNotFound)
+		}
+		if isApprove {
+			answer.Status = entity.AnswerStatusAvailable
+		} else {
+			answer.Status = entity.AnswerStatusDeleted
+		}
+		return cs.answerRepo.UpdateAnswerStatus(ctx, answer.ID, answer.Status)
+	}
+	return
+
+}
+
 // GetReviewPendingCount get review pending count
 func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64, err error) {
 	return cs.reviewRepo.GetReviewCount(ctx, entity.ReviewStatusPending)
@@ -125,7 +225,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 			Tags:                 info.Tags,
 			AuthorUserID:         info.ObjectCreatorUserID,
 			SubmitAt:             review.CreatedAt.Unix(),
-			SubmitterDisplayName: review.SubmitterDisplayName,
+			SubmitterDisplayName: req.ReviewerMapping[review.Submitter],
 		}
 
 		// get user info
diff --git a/plugin/plugin.go b/plugin/plugin.go
index 79e43f68..e492fdc4 100644
--- a/plugin/plugin.go
+++ b/plugin/plugin.go
@@ -21,6 +21,7 @@ package plugin
 
 import (
 	"encoding/json"
+
 	"github.com/segmentfault/pacman/i18n"
 
 	"github.com/apache/incubator-answer/internal/base/handler"
@@ -88,6 +89,10 @@ func Register(p Base) {
 	if _, ok := p.(Notification); ok {
 		registerNotification(p.(Notification))
 	}
+
+	if _, ok := p.(Reviewer); ok {
+		registerReviewer(p.(Reviewer))
+	}
 }
 
 type Stack[T Base] struct {
diff --git a/plugin/reviewer.go b/plugin/reviewer.go
new file mode 100644
index 00000000..dc307ded
--- /dev/null
+++ b/plugin/reviewer.go
@@ -0,0 +1,39 @@
+package plugin
+
+type Reviewer interface {
+	Base
+	Review(content *ReviewContent) (result *ReviewResult)
+}
+
+// ReviewContent is a struct that contains the content of a review
+type ReviewContent struct {
+	Title   string
+	Content string
+	Tags    []string
+	// The author of the content
+	Author ReviewContentAuthor
+}
+
+type ReviewContentAuthor struct {
+	// The user's reputation
+	Rank int
+	// The amount of questions and answers that the user has approved
+	ApprovedQuestionAmount int64
+	ApprovedAnswerAmount   int64
+	// 1:User 2:Admin 3:Moderator
+	Role int
+}
+
+// ReviewResult is a struct that contains the result of a review
+type ReviewResult struct {
+	// If the review is approved
+	Approved bool
+	// The reason for the result
+	Reason string
+}
+
+var (
+	// CallReviewer is a function that calls all registered parsers
+	CallReviewer,
+	registerReviewer = MakePlugin[Reviewer](false)
+)

From d4aea5f34f05d5b46e2bf38fdb6bd0a063b3fe88 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 14:10:30 +0800
Subject: [PATCH 036/114] feat(answer): add answer review

---
 cmd/wire_gen.go                            |  2 +-
 internal/service/content/answer_service.go |  9 ++-
 internal/service/review/review_service.go  | 67 ++++++++++++++--------
 plugin/reviewer.go                         |  8 ++-
 4 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 62fc8854..47123b97 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -174,7 +174,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	reviewRepo := review.NewReviewRepo(dataData)
 	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService)
 	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
-	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService)
+	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService, reviewService)
 	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
 	reportService := report2.NewReportService(reportRepo, objService, userCommon, answerRepo, questionRepo, commentCommonRepo, reportHandle, configService)
 	reportController := controller.NewReportController(reportService, rankService, captchaService)
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.go
index 9cbcb255..a916c016 100644
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -37,6 +37,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/notice_queue"
 	"github.com/apache/incubator-answer/internal/service/permission"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
+	"github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/internal/service/revision_common"
 	"github.com/apache/incubator-answer/internal/service/role"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
@@ -64,6 +65,7 @@ type AnswerService struct {
 	notificationQueueService         notice_queue.NotificationQueueService
 	externalNotificationQueueService notice_queue.ExternalNotificationQueueService
 	activityQueueService             activity_queue.ActivityQueueService
+	reviewService                    *review.ReviewService
 }
 
 func NewAnswerService(
@@ -82,6 +84,7 @@ func NewAnswerService(
 	notificationQueueService notice_queue.NotificationQueueService,
 	externalNotificationQueueService notice_queue.ExternalNotificationQueueService,
 	activityQueueService activity_queue.ActivityQueueService,
+	reviewService *review.ReviewService,
 ) *AnswerService {
 	return &AnswerService{
 		answerRepo:                       answerRepo,
@@ -99,6 +102,7 @@ func NewAnswerService(
 		notificationQueueService:         notificationQueueService,
 		externalNotificationQueueService: externalNotificationQueueService,
 		activityQueueService:             activityQueueService,
+		reviewService:                    reviewService,
 	}
 }
 
@@ -223,7 +227,7 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 		err = errors.BadRequest(reason.AnswerCannotAddByClosedQuestion)
 		return "", err
 	}
-	insertData := new(entity.Answer)
+	insertData := &entity.Answer{}
 	insertData.UserID = req.UserID
 	insertData.OriginalText = req.Content
 	insertData.ParsedText = req.HTML
@@ -233,6 +237,9 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	insertData.LastEditUserID = "0"
 	insertData.Status = entity.AnswerStatusAvailable
 	//insertData.UpdatedAt = now
+	if as.reviewService.AddAnswerReview(ctx, insertData) {
+		insertData.Status = entity.AnswerStatusPending
+	}
 	if err = as.answerRepo.AddAnswer(ctx, insertData); err != nil {
 		return "", err
 	}
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index b47097b6..bead8ee4 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -87,31 +87,18 @@ func (cs *ReviewService) AddQuestionReview(ctx context.Context,
 		reviewContent.Tags = append(reviewContent.Tags, tag.SlugName)
 	}
 	reviewContent.Author = cs.getReviewContentAuthorInfo(ctx, question.UserID)
+	return cs.callPluginToReview(ctx, question.UserID, question.ID, reviewContent)
+}
 
-	needReview = true
-	r := &entity.Review{
-		UserID:     question.UserID,
-		ObjectID:   question.ID,
-		ObjectType: constant.ObjectTypeStrMapping[constant.QuestionObjectType],
-		Status:     entity.ReviewStatusPending,
+// AddAnswerReview add review for answer if needed
+func (cs *ReviewService) AddAnswerReview(ctx context.Context,
+	answer *entity.Answer) (needReview bool) {
+	reviewContent := &plugin.ReviewContent{
+		ObjectType: constant.AnswerObjectType,
+		Content:    answer.ParsedText,
 	}
-	_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
-		result := reviewer.Review(reviewContent)
-		if result.Approved {
-			needReview = false
-		} else {
-			r.Reason = result.Reason
-			r.Submitter = reviewer.Info().SlugName
-		}
-		return nil
-	})
-
-	if needReview {
-		if err := cs.reviewRepo.AddReview(ctx, r); err != nil {
-			log.Errorf("add review failed, err: %v", err)
-		}
-	}
-	return needReview
+	reviewContent.Author = cs.getReviewContentAuthorInfo(ctx, answer.UserID)
+	return cs.callPluginToReview(ctx, answer.UserID, answer.ID, reviewContent)
 }
 
 // get review content author info
@@ -132,6 +119,40 @@ func (cs *ReviewService) getReviewContentAuthorInfo(ctx context.Context, userID
 	return
 }
 
+// call plugin to review
+func (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectID string,
+	reviewContent *plugin.ReviewContent) (approved bool) {
+	// As default, no need review
+	approved = true
+
+	r := &entity.Review{
+		UserID:     userID,
+		ObjectID:   objectID,
+		ObjectType: constant.ObjectTypeStrMapping[reviewContent.ObjectType],
+		Status:     entity.ReviewStatusPending,
+	}
+
+	_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
+		// If one of the reviewer plugin return false, then the review is not approved
+		if !approved {
+			return nil
+		}
+		if result := reviewer.Review(reviewContent); !result.Approved {
+			approved = false
+			r.Reason = result.Reason
+			r.Submitter = reviewer.Info().SlugName
+		}
+		return nil
+	})
+
+	if !approved {
+		if err := cs.reviewRepo.AddReview(ctx, r); err != nil {
+			log.Errorf("add review failed, err: %v", err)
+		}
+	}
+	return approved
+}
+
 // UpdateReview update review
 func (cs *ReviewService) UpdateReview(ctx context.Context, req *schema.UpdateReviewReq) (err error) {
 	review, exist, err := cs.reviewRepo.GetReview(ctx, req.ReviewID)
diff --git a/plugin/reviewer.go b/plugin/reviewer.go
index dc307ded..b3dc8abb 100644
--- a/plugin/reviewer.go
+++ b/plugin/reviewer.go
@@ -7,9 +7,11 @@ type Reviewer interface {
 
 // ReviewContent is a struct that contains the content of a review
 type ReviewContent struct {
-	Title   string
-	Content string
-	Tags    []string
+	// The type of the content, e.g. question, answer
+	ObjectType string
+	Title      string
+	Content    string
+	Tags       []string
 	// The author of the content
 	Author ReviewContentAuthor
 }

From 6dd862496c1f08ef426c33e6915b9c15395ab1ab Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 15:31:25 +0800
Subject: [PATCH 037/114] fix(review): fix review

---
 docs/docs.go                                 |  4 ++--
 docs/swagger.json                            |  4 ++--
 docs/swagger.yaml                            |  4 ++--
 internal/controller/review_controller.go     |  2 ++
 internal/entity/review_entity.go             |  4 ++--
 internal/repo/review/review_repo.go          |  4 ++--
 internal/schema/review_schema.go             |  4 ++--
 internal/service/content/answer_service.go   | 10 +++++----
 internal/service/content/question_service.go | 10 +++++----
 internal/service/review/review_service.go    | 23 ++++++++++++--------
 10 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 9ee5856d..6c02e33c 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -8144,7 +8144,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "review_id": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "submit_at": {
                     "type": "integer"
@@ -9764,7 +9764,7 @@ const docTemplate = `{
             ],
             "properties": {
                 "review_id": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "status": {
                     "type": "string",
diff --git a/docs/swagger.json b/docs/swagger.json
index 4429af0b..d275df8d 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -8132,7 +8132,7 @@
                     "type": "string"
                 },
                 "review_id": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "submit_at": {
                     "type": "integer"
@@ -9752,7 +9752,7 @@
             ],
             "properties": {
                 "review_id": {
-                    "type": "string"
+                    "type": "integer"
                 },
                 "status": {
                     "type": "string",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ae4ed789..291069ed 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1043,7 +1043,7 @@ definitions:
       parsed_text:
         type: string
       review_id:
-        type: string
+        type: integer
       submit_at:
         type: integer
       submitter_display_name:
@@ -2154,7 +2154,7 @@ definitions:
   schema.UpdateReviewReq:
     properties:
       review_id:
-        type: string
+        type: integer
       status:
         enum:
         - approve
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
index 0000a951..5331cc52 100644
--- a/internal/controller/review_controller.go
+++ b/internal/controller/review_controller.go
@@ -21,6 +21,7 @@ package controller
 
 import (
 	"github.com/apache/incubator-answer/internal/base/handler"
+	"github.com/apache/incubator-answer/internal/base/middleware"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/action"
 	"github.com/apache/incubator-answer/internal/service/rank"
@@ -96,6 +97,7 @@ func (rc *ReviewController) UpdateReview(ctx *gin.Context) {
 	}
 
 	// TODO: check permission
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	err := rc.reviewService.UpdateReview(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
diff --git a/internal/entity/review_entity.go b/internal/entity/review_entity.go
index 199e635d..c88de007 100644
--- a/internal/entity/review_entity.go
+++ b/internal/entity/review_entity.go
@@ -29,7 +29,7 @@ const (
 
 // Review review
 type Review struct {
-	ID             string    `xorm:"not null pk autoincr BIGINT(20) id"`
+	ID             int       `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 BIGINT(20) user_id"`
@@ -37,7 +37,7 @@ type Review struct {
 	ObjectType     int       `xorm:"not null default 0 INT(11) object_type"`
 	ReviewerUserID string    `xorm:"not null default 0 BIGINT(20) reviewer_user_id"`
 	Submitter      string    `xorm:"not null default '' VARCHAR(100) submitter"`
-	Reason         string    `xorm:"not null default '' TEXT reason"`
+	Reason         string    `xorm:"not null TEXT reason"`
 	Status         int       `xorm:"not null default 0 INT(11) status"`
 }
 
diff --git a/internal/repo/review/review_repo.go b/internal/repo/review/review_repo.go
index 80a02071..91bc046c 100644
--- a/internal/repo/review/review_repo.go
+++ b/internal/repo/review/review_repo.go
@@ -52,7 +52,7 @@ func (cr *reviewRepo) AddReview(ctx context.Context, review *entity.Review) (err
 }
 
 // UpdateReviewStatus update review status
-func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error) {
+func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID int, reviewerUserID string, status int) (err error) {
 	_, err = cr.data.DB.Context(ctx).ID(reviewID).Update(&entity.Review{
 		ReviewerUserID: reviewerUserID, Status: status})
 	if err != nil {
@@ -62,7 +62,7 @@ func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID, reviewer
 }
 
 // GetReview get review one
-func (cr *reviewRepo) GetReview(ctx context.Context, reviewID string) (
+func (cr *reviewRepo) GetReview(ctx context.Context, reviewID int) (
 	review *entity.Review, exist bool, err error) {
 	review = &entity.Review{}
 	exist, err = cr.data.DB.Context(ctx).ID(reviewID).Get(review)
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index ee03c107..a86b4da1 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -2,7 +2,7 @@ package schema
 
 // UpdateReviewReq update review request
 type UpdateReviewReq struct {
-	ReviewID string `validate:"required" json:"review_id"`
+	ReviewID int    `validate:"required" json:"review_id"`
 	Status   string `validate:"required,oneof=approve reject" json:"status"`
 	UserID   string `json:"-"`
 }
@@ -24,7 +24,7 @@ type GetUnreviewedPostPageReq struct {
 
 // GetUnreviewedPostPageResp get review page response
 type GetUnreviewedPostPageResp struct {
-	ReviewID             string        `json:"review_id"`
+	ReviewID             int           `json:"review_id"`
 	CreatedAt            int64         `json:"created_at"`
 	ObjectID             string        `json:"object_id"`
 	ObjectType           string        `json:"object_type" enums:"question,answer,comment"`
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.go
index a916c016..e832c31c 100644
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -235,14 +235,16 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	insertData.QuestionID = req.QuestionID
 	insertData.RevisionID = "0"
 	insertData.LastEditUserID = "0"
-	insertData.Status = entity.AnswerStatusAvailable
+	insertData.Status = entity.AnswerStatusPending
 	//insertData.UpdatedAt = now
-	if as.reviewService.AddAnswerReview(ctx, insertData) {
-		insertData.Status = entity.AnswerStatusPending
-	}
 	if err = as.answerRepo.AddAnswer(ctx, insertData); err != nil {
 		return "", err
 	}
+	if as.reviewService.AddAnswerReview(ctx, insertData) {
+		if err := as.answerRepo.UpdateAnswerStatus(ctx, insertData.ID, entity.AnswerStatusAvailable); err != nil {
+			return "", err
+		}
+	}
 	err = as.questionCommon.UpdateAnswerCount(ctx, req.QuestionID)
 	if err != nil {
 		log.Error("IncreaseAnswerCount error", err.Error())
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index aa1eff3b..1d0851b9 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -303,20 +303,22 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 	question.LastAnswerID = "0"
 	question.LastEditUserID = "0"
 	//question.PostUpdateTime = nil
-	question.Status = entity.QuestionStatusAvailable
+	question.Status = entity.QuestionStatusPending
 	question.RevisionID = "0"
 	question.CreatedAt = now
 	question.PostUpdateTime = now
 	question.Pin = entity.QuestionUnPin
 	question.Show = entity.QuestionShow
 	//question.UpdatedAt = nil
-	if qs.reviewService.AddQuestionReview(ctx, question, req.Tags) {
-		question.Status = entity.QuestionStatusPending
-	}
 	err = qs.questionRepo.AddQuestion(ctx, question)
 	if err != nil {
 		return
 	}
+	if qs.reviewService.AddQuestionReview(ctx, question, req.Tags) {
+		if err := qs.questionRepo.UpdateQuestionStatus(ctx, question.ID, entity.QuestionStatusAvailable); err != nil {
+			return nil, err
+		}
+	}
 	objectTagData := schema.TagChange{}
 	objectTagData.ObjectID = question.ID
 	objectTagData.Tags = req.Tags
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index bead8ee4..56a692bb 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -32,6 +32,7 @@ import (
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/role"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/apache/incubator-answer/plugin"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
@@ -41,8 +42,8 @@ import (
 // ReviewRepo review repository
 type ReviewRepo interface {
 	AddReview(ctx context.Context, review *entity.Review) (err error)
-	UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error)
-	GetReview(ctx context.Context, reviewID string) (review *entity.Review, exist bool, err error)
+	UpdateReviewStatus(ctx context.Context, reviewID int, reviewerUserID string, status int) (err error)
+	GetReview(ctx context.Context, reviewID int) (review *entity.Review, exist bool, err error)
 	GetReviewCount(ctx context.Context, status int) (count int64, err error)
 	GetReviewPage(ctx context.Context, page, pageSize int, cond *entity.Review) (reviewList []*entity.Review, total int64, err error)
 }
@@ -80,8 +81,9 @@ func NewReviewService(
 func (cs *ReviewService) AddQuestionReview(ctx context.Context,
 	question *entity.Question, tags []*schema.TagItem) (needReview bool) {
 	reviewContent := &plugin.ReviewContent{
-		Title:   question.Title,
-		Content: question.ParsedText,
+		ObjectType: constant.QuestionObjectType,
+		Title:      question.Title,
+		Content:    question.ParsedText,
 	}
 	for _, tag := range tags {
 		reviewContent.Tags = append(reviewContent.Tags, tag.SlugName)
@@ -124,12 +126,14 @@ func (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectI
 	reviewContent *plugin.ReviewContent) (approved bool) {
 	// As default, no need review
 	approved = true
+	objectID = uid.DeShortID(objectID)
 
 	r := &entity.Review{
-		UserID:     userID,
-		ObjectID:   objectID,
-		ObjectType: constant.ObjectTypeStrMapping[reviewContent.ObjectType],
-		Status:     entity.ReviewStatusPending,
+		UserID:         userID,
+		ObjectID:       objectID,
+		ObjectType:     constant.ObjectTypeStrMapping[reviewContent.ObjectType],
+		ReviewerUserID: "0",
+		Status:         entity.ReviewStatusPending,
 	}
 
 	_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
@@ -223,7 +227,7 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
 // GetUnreviewedPostPage get review page
 func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
 	pageModel *pager.PageModel, err error) {
-	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{})
+	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{Status: entity.ReviewStatusPending})
 	if err != nil {
 		return
 	}
@@ -257,6 +261,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 		if exists {
 			_ = copier.Copy(&r.UserInfo, userInfo)
 		}
+		resp = append(resp, r)
 	}
 	return pager.NewPageModel(total, resp), nil
 }

From 7546aabca97a048d686ea4c350e905d2cc2ebf0b Mon Sep 17 00:00:00 2001
From: kumfo <kumfo@sifou.com>
Date: Thu, 7 Mar 2024 17:03:09 +0800
Subject: [PATCH 038/114] feat(admin/contents): feat pending list

---
 docs/docs.go                               | 13 +++++++------
 docs/swagger.json                          | 10 ++++++----
 docs/swagger.yaml                          |  6 ++++--
 internal/controller/question_controller.go |  8 ++++----
 internal/entity/answer_entity.go           |  1 +
 internal/entity/question_entity.go         |  2 ++
 internal/schema/question_schema.go         |  4 ++--
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 6c02e33c..74f2b9df 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"
@@ -39,7 +38,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,deleted]",
+                "description": "Status:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -66,7 +65,8 @@ const docTemplate = `{
                     {
                         "enum": [
                             "available",
-                            "deleted"
+                            "deleted",
+                            "pending"
                         ],
                         "type": "string",
                         "description": "user status",
@@ -369,7 +369,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,closed,deleted]",
+                "description": "Status:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -397,7 +397,8 @@ const docTemplate = `{
                         "enum": [
                             "available",
                             "closed",
-                            "deleted"
+                            "deleted",
+                            "pending"
                         ],
                         "type": "string",
                         "description": "user status",
diff --git a/docs/swagger.json b/docs/swagger.json
index d275df8d..c133e0c9 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -27,7 +27,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,deleted]",
+                "description": "Status:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -54,7 +54,8 @@
                     {
                         "enum": [
                             "available",
-                            "deleted"
+                            "deleted",
+                            "pending"
                         ],
                         "type": "string",
                         "description": "user status",
@@ -357,7 +358,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,closed,deleted]",
+                "description": "Status:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -385,7 +386,8 @@
                         "enum": [
                             "available",
                             "closed",
-                            "deleted"
+                            "deleted",
+                            "pending"
                         ],
                         "type": "string",
                         "description": "user status",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 291069ed..8d5e305a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2611,7 +2611,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: Status:[available,deleted]
+      description: Status:[available,deleted,pending]
       parameters:
       - description: page size
         in: query
@@ -2625,6 +2625,7 @@ paths:
         enum:
         - available
         - deleted
+        - pending
         in: query
         name: status
         type: string
@@ -2812,7 +2813,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: Status:[available,closed,deleted]
+      description: Status:[available,closed,deleted,pending]
       parameters:
       - description: page size
         in: query
@@ -2827,6 +2828,7 @@ paths:
         - available
         - closed
         - deleted
+        - pending
         in: query
         name: status
         type: string
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 3e21c87b..3f5f936c 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -870,14 +870,14 @@ func (qc *QuestionController) PersonalCollectionPage(ctx *gin.Context) {
 
 // AdminQuestionPage admin question page
 // @Summary AdminQuestionPage admin question page
-// @Description Status:[available,closed,deleted]
+// @Description Status:[available,closed,deleted,pending]
 // @Tags admin
 // @Accept json
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query int false "page size"
 // @Param page_size query int false "page size"
-// @Param status query string false "user status" Enums(available, closed, deleted)
+// @Param status query string false "user status" Enums(available, closed, deleted, pending)
 // @Param query query string false "question id or title"
 // @Success 200 {object} handler.RespBody
 // @Router /answer/admin/api/question/page [get]
@@ -894,14 +894,14 @@ func (qc *QuestionController) AdminQuestionPage(ctx *gin.Context) {
 
 // AdminAnswerPage admin answer page
 // @Summary AdminAnswerPage admin answer page
-// @Description Status:[available,deleted]
+// @Description Status:[available,deleted,pending]
 // @Tags admin
 // @Accept json
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query int false "page size"
 // @Param page_size query int false "page size"
-// @Param status query string false "user status" Enums(available,deleted)
+// @Param status query string false "user status" Enums(available,deleted,pending)
 // @Param query query string false "answer id or question title"
 // @Param question_id query string false "question id"
 // @Success 200 {object} handler.RespBody
diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index 39a17ebf..ee5bbc2c 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -34,6 +34,7 @@ const (
 var AdminAnswerSearchStatus = map[string]int{
 	"available": AnswerStatusAvailable,
 	"deleted":   AnswerStatusDeleted,
+	"pending":   AnswerStatusPending,
 }
 
 // Answer answer
diff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.go
index 0e589aeb..280cc670 100644
--- a/internal/entity/question_entity.go
+++ b/internal/entity/question_entity.go
@@ -38,12 +38,14 @@ var AdminQuestionSearchStatus = map[string]int{
 	"available": QuestionStatusAvailable,
 	"closed":    QuestionStatusClosed,
 	"deleted":   QuestionStatusDeleted,
+	"pending":   QuestionStatusPending,
 }
 
 var AdminQuestionSearchStatusIntToString = map[int]string{
 	QuestionStatusAvailable: "available",
 	QuestionStatusClosed:    "closed",
 	QuestionStatusDeleted:   "deleted",
+	QuestionStatusPending:   "pending",
 }
 
 // Question question
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index a7c305dd..5944203b 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -405,7 +405,7 @@ type QuestionPageRespOperator struct {
 type AdminQuestionPageReq struct {
 	Page        int    `validate:"omitempty,min=1" form:"page"`
 	PageSize    int    `validate:"omitempty,min=1" form:"page_size"`
-	StatusCond  string `validate:"omitempty,oneof=normal closed deleted" form:"status"`
+	StatusCond  string `validate:"omitempty,oneof=normal closed deleted pending" form:"status"`
 	Query       string `validate:"omitempty,gt=0,lte=100" json:"query" form:"query" `
 	Status      int    `json:"-"`
 	LoginUserID string `json:"-"`
@@ -426,7 +426,7 @@ func (req *AdminQuestionPageReq) Check() (errField []*validator.FormErrorField,
 type AdminAnswerPageReq struct {
 	Page          int    `validate:"omitempty,min=1" form:"page"`
 	PageSize      int    `validate:"omitempty,min=1" form:"page_size"`
-	StatusCond    string `validate:"omitempty,oneof=normal deleted" form:"status"`
+	StatusCond    string `validate:"omitempty,oneof=normal deleted pending" form:"status"`
 	Query         string `validate:"omitempty,gt=0,lte=100" form:"query"`
 	QuestionID    string `validate:"omitempty,gt=0,lte=24" form:"question_id"`
 	QuestionTitle string `json:"-"`

From c72237844ffea573cbd1a34fcbf423a73539d3b3 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 7 Mar 2024 18:40:09 +0800
Subject: [PATCH 039/114] feat(review): add object id query condition for
 review

---
 internal/schema/review_schema.go             | 16 +++++++++++++++-
 internal/service/content/revision_service.go |  4 ++--
 internal/service/review/review_service.go    |  5 ++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index a86b4da1..f76253c5 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -1,5 +1,10 @@
 package schema
 
+import (
+	"github.com/apache/incubator-answer/internal/base/validator"
+	"github.com/apache/incubator-answer/pkg/uid"
+)
+
 // UpdateReviewReq update review request
 type UpdateReviewReq struct {
 	ReviewID int    `validate:"required" json:"review_id"`
@@ -17,11 +22,20 @@ func (r *UpdateReviewReq) IsReject() bool {
 
 // GetUnreviewedPostPageReq get review page request
 type GetUnreviewedPostPageReq struct {
-	Page            int               `json:"page" form:"page"`
+	ObjectID        string            `validate:"omitempty" form:"object_id"`
+	Page            int               `validate:"omitempty" form:"page"`
 	ReviewerMapping map[string]string `json:"-"`
 	UserID          string            `json:"-"`
 }
 
+func (r *GetUnreviewedPostPageReq) Check() (errField []*validator.FormErrorField, err error) {
+	if len(r.ObjectID) > 0 {
+		r.Page = 1
+		r.ObjectID = uid.DeShortID(r.ObjectID)
+	}
+	return
+}
+
 // GetUnreviewedPostPageResp get review page response
 type GetUnreviewedPostPageResp struct {
 	ReviewID             int           `json:"review_id"`
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index 3a3b8d5c..6b708833 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -457,14 +457,14 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 
 	// get queue amount
 	if req.IsAdmin {
-		reportCount, err := rs.reviewService.GetReviewPendingCount(ctx)
+		reviewCount, err := rs.reviewService.GetReviewPendingCount(ctx)
 		if err != nil {
 			log.Errorf("get report count failed: %v", err)
 		} else {
 			resp = append(resp, &schema.GetReviewingTypeResp{
 				Name:       string(constant.QueuedPost),
 				Label:      "Queued post",
-				TodoAmount: reportCount,
+				TodoAmount: reviewCount,
 			})
 		}
 	}
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 56a692bb..e0a713fe 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -227,7 +227,10 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
 // GetUnreviewedPostPage get review page
 func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
 	pageModel *pager.PageModel, err error) {
-	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{Status: entity.ReviewStatusPending})
+	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{
+		ObjectID: req.ObjectID,
+		Status:   entity.ReviewStatusPending,
+	})
 	if err != nil {
 		return
 	}

From 557172d0d58fb9f914a165efb35408cc18d480b9 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 8 Mar 2024 15:10:46 +0800
Subject: [PATCH 040/114] feat(review): update flag api response

---
 docs/docs.go                                |  96 ++++++++++++-----
 docs/swagger.json                           |  93 ++++++++++++-----
 docs/swagger.yaml                           |  72 +++++++++----
 internal/schema/report_schema.go            |  61 +++--------
 internal/schema/review_schema.go            |  11 +-
 internal/schema/search_schema.go            |   5 +-
 internal/schema/simple_obj_info_schema.go   |   6 ++
 internal/service/object_info/object_info.go |  39 ++++++-
 internal/service/report/report_service.go   | 109 +++++++++-----------
 internal/service/review/review_service.go   |  13 ++-
 10 files changed, 313 insertions(+), 192 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 74f2b9df..9db1f742 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,4 +1,5 @@
-// Package docs Code generated by swaggo/swag. DO NOT EDIT
+// Code generated by swaggo/swag. DO NOT EDIT.
+
 package docs
 
 import "github.com/swaggo/swag"
@@ -38,7 +39,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,deleted,pending]",
+                "description": "ObjectStatus:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -369,7 +370,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,closed,deleted,pending]",
+                "description": "ObjectStatus:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -7821,34 +7822,39 @@ const docTemplate = `{
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
-                "_": {
-                    "type": "string"
-                },
                 "answer_id": {
                     "type": "string"
                 },
-                "comment_id": {
-                    "type": "string"
+                "author_user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
                 },
-                "content": {
+                "comment_id": {
                     "type": "string"
                 },
                 "created_at": {
                     "type": "integer"
                 },
-                "excerpt": {
+                "flag_id": {
                     "type": "string"
                 },
-                "flagged_content": {
+                "object_id": {
                     "type": "string"
                 },
-                "flagged_reason": {
-                    "$ref": "#/definitions/schema.ReasonItem"
+                "object_show_status": {
+                    "type": "integer"
                 },
-                "id": {
-                    "type": "string"
+                "object_status": {
+                    "type": "integer"
                 },
                 "object_type": {
+                    "type": "string",
+                    "enum": [
+                        "question",
+                        "answer",
+                        "comment"
+                    ]
+                },
+                "original_text": {
                     "type": "string"
                 },
                 "question_id": {
@@ -7857,17 +7863,20 @@ const docTemplate = `{
                 "reason": {
                     "$ref": "#/definitions/schema.ReasonItem"
                 },
-                "report_user": {
+                "submit_at": {
+                    "type": "integer"
+                },
+                "submitter_user": {
                     "$ref": "#/definitions/schema.UserBasicInfo"
                 },
-                "reported_user": {
-                    "$ref": "#/definitions/schema.UserBasicInfo"
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
                 },
                 "title": {
                     "type": "string"
-                },
-                "updated_at": {
-                    "type": "integer"
                 }
             }
         },
@@ -8124,7 +8133,13 @@ const docTemplate = `{
         "schema.GetUnreviewedPostPageResp": {
             "type": "object",
             "properties": {
-                "author_user_id": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "author_user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "comment_id": {
                     "type": "string"
                 },
                 "created_at": {
@@ -8133,6 +8148,12 @@ const docTemplate = `{
                 "object_id": {
                     "type": "string"
                 },
+                "object_show_status": {
+                    "type": "integer"
+                },
+                "object_status": {
+                    "type": "integer"
+                },
                 "object_type": {
                     "type": "string",
                     "enum": [
@@ -8141,7 +8162,13 @@ const docTemplate = `{
                         "comment"
                     ]
                 },
-                "parsed_text": {
+                "original_text": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "reason": {
                     "type": "string"
                 },
                 "review_id": {
@@ -8161,9 +8188,6 @@ const docTemplate = `{
                 },
                 "title": {
                     "type": "string"
-                },
-                "user_info": {
-                    "$ref": "#/definitions/schema.UserBasicInfo"
                 }
             }
         },
@@ -8931,7 +8955,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "status": {
-                    "description": "Status",
+                    "description": "ObjectStatus",
                     "type": "string"
                 },
                 "tags": {
@@ -9612,6 +9636,12 @@ const docTemplate = `{
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "comment_id": {
+                    "type": "string"
+                },
                 "content": {
                     "type": "string"
                 },
@@ -9627,6 +9657,18 @@ const docTemplate = `{
                 "object_id": {
                     "type": "string"
                 },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "show_status": {
+                    "type": "integer"
+                },
+                "status": {
+                    "type": "integer"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
diff --git a/docs/swagger.json b/docs/swagger.json
index c133e0c9..d7bf136c 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -27,7 +27,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,deleted,pending]",
+                "description": "ObjectStatus:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -358,7 +358,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "Status:[available,closed,deleted,pending]",
+                "description": "ObjectStatus:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -7810,34 +7810,39 @@
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
-                "_": {
-                    "type": "string"
-                },
                 "answer_id": {
                     "type": "string"
                 },
-                "comment_id": {
-                    "type": "string"
+                "author_user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
                 },
-                "content": {
+                "comment_id": {
                     "type": "string"
                 },
                 "created_at": {
                     "type": "integer"
                 },
-                "excerpt": {
+                "flag_id": {
                     "type": "string"
                 },
-                "flagged_content": {
+                "object_id": {
                     "type": "string"
                 },
-                "flagged_reason": {
-                    "$ref": "#/definitions/schema.ReasonItem"
+                "object_show_status": {
+                    "type": "integer"
                 },
-                "id": {
-                    "type": "string"
+                "object_status": {
+                    "type": "integer"
                 },
                 "object_type": {
+                    "type": "string",
+                    "enum": [
+                        "question",
+                        "answer",
+                        "comment"
+                    ]
+                },
+                "original_text": {
                     "type": "string"
                 },
                 "question_id": {
@@ -7846,17 +7851,20 @@
                 "reason": {
                     "$ref": "#/definitions/schema.ReasonItem"
                 },
-                "report_user": {
+                "submit_at": {
+                    "type": "integer"
+                },
+                "submitter_user": {
                     "$ref": "#/definitions/schema.UserBasicInfo"
                 },
-                "reported_user": {
-                    "$ref": "#/definitions/schema.UserBasicInfo"
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/schema.TagResp"
+                    }
                 },
                 "title": {
                     "type": "string"
-                },
-                "updated_at": {
-                    "type": "integer"
                 }
             }
         },
@@ -8113,7 +8121,13 @@
         "schema.GetUnreviewedPostPageResp": {
             "type": "object",
             "properties": {
-                "author_user_id": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "author_user_info": {
+                    "$ref": "#/definitions/schema.UserBasicInfo"
+                },
+                "comment_id": {
                     "type": "string"
                 },
                 "created_at": {
@@ -8122,6 +8136,12 @@
                 "object_id": {
                     "type": "string"
                 },
+                "object_show_status": {
+                    "type": "integer"
+                },
+                "object_status": {
+                    "type": "integer"
+                },
                 "object_type": {
                     "type": "string",
                     "enum": [
@@ -8130,7 +8150,13 @@
                         "comment"
                     ]
                 },
-                "parsed_text": {
+                "original_text": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "reason": {
                     "type": "string"
                 },
                 "review_id": {
@@ -8150,9 +8176,6 @@
                 },
                 "title": {
                     "type": "string"
-                },
-                "user_info": {
-                    "$ref": "#/definitions/schema.UserBasicInfo"
                 }
             }
         },
@@ -8920,7 +8943,7 @@
                     "type": "string"
                 },
                 "status": {
-                    "description": "Status",
+                    "description": "ObjectStatus",
                     "type": "string"
                 },
                 "tags": {
@@ -9601,6 +9624,12 @@
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_id": {
+                    "type": "string"
+                },
+                "comment_id": {
+                    "type": "string"
+                },
                 "content": {
                     "type": "string"
                 },
@@ -9616,6 +9645,18 @@
                 "object_id": {
                     "type": "string"
                 },
+                "object_type": {
+                    "type": "string"
+                },
+                "question_id": {
+                    "type": "string"
+                },
+                "show_status": {
+                    "type": "integer"
+                },
+                "status": {
+                    "type": "integer"
+                },
                 "tags": {
                     "type": "array",
                     "items": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 8d5e305a..937cd78e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -821,38 +821,44 @@ definitions:
     type: object
   schema.GetReportListPageResp:
     properties:
-      _:
-        type: string
       answer_id:
         type: string
+      author_user_info:
+        $ref: '#/definitions/schema.UserBasicInfo'
       comment_id:
         type: string
-      content:
-        type: string
       created_at:
         type: integer
-      excerpt:
+      flag_id:
         type: string
-      flagged_content:
-        type: string
-      flagged_reason:
-        $ref: '#/definitions/schema.ReasonItem'
-      id:
+      object_id:
         type: string
+      object_show_status:
+        type: integer
+      object_status:
+        type: integer
       object_type:
+        enum:
+        - question
+        - answer
+        - comment
+        type: string
+      original_text:
         type: string
       question_id:
         type: string
       reason:
         $ref: '#/definitions/schema.ReasonItem'
-      report_user:
-        $ref: '#/definitions/schema.UserBasicInfo'
-      reported_user:
+      submit_at:
+        type: integer
+      submitter_user:
         $ref: '#/definitions/schema.UserBasicInfo'
+      tags:
+        items:
+          $ref: '#/definitions/schema.TagResp'
+        type: array
       title:
         type: string
-      updated_at:
-        type: integer
     type: object
   schema.GetReviewingTypeResp:
     properties:
@@ -1028,19 +1034,31 @@ definitions:
     type: object
   schema.GetUnreviewedPostPageResp:
     properties:
-      author_user_id:
+      answer_id:
+        type: string
+      author_user_info:
+        $ref: '#/definitions/schema.UserBasicInfo'
+      comment_id:
         type: string
       created_at:
         type: integer
       object_id:
         type: string
+      object_show_status:
+        type: integer
+      object_status:
+        type: integer
       object_type:
         enum:
         - question
         - answer
         - comment
         type: string
-      parsed_text:
+      original_text:
+        type: string
+      question_id:
+        type: string
+      reason:
         type: string
       review_id:
         type: integer
@@ -1054,8 +1072,6 @@ definitions:
         type: array
       title:
         type: string
-      user_info:
-        $ref: '#/definitions/schema.UserBasicInfo'
     type: object
   schema.GetUnreviewedRevisionResp:
     properties:
@@ -1589,7 +1605,7 @@ definitions:
       question_id:
         type: string
       status:
-        description: Status
+        description: ObjectStatus
         type: string
       tags:
         description: tags
@@ -2053,6 +2069,10 @@ definitions:
     type: object
   schema.UnreviewedRevisionInfoInfo:
     properties:
+      answer_id:
+        type: string
+      comment_id:
+        type: string
       content:
         type: string
       created_at:
@@ -2063,6 +2083,14 @@ definitions:
         type: string
       object_id:
         type: string
+      object_type:
+        type: string
+      question_id:
+        type: string
+      show_status:
+        type: integer
+      status:
+        type: integer
       tags:
         items:
           $ref: '#/definitions/schema.TagResp'
@@ -2611,7 +2639,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: Status:[available,deleted,pending]
+      description: ObjectStatus:[available,deleted,pending]
       parameters:
       - description: page size
         in: query
@@ -2813,7 +2841,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: Status:[available,closed,deleted,pending]
+      description: ObjectStatus:[available,closed,deleted,pending]
       parameters:
       - description: page size
         in: query
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index 45becee4..6b15a1e0 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -19,12 +19,6 @@
 
 package schema
 
-import (
-	"time"
-
-	"github.com/apache/incubator-answer/internal/base/constant"
-)
-
 // AddReportReq add report request
 type AddReportReq struct {
 	// object id
@@ -77,45 +71,22 @@ type GetReportListPageDTO struct {
 
 // GetReportListPageResp get report list
 type GetReportListPageResp struct {
-	ID           string         `json:"id"`
-	ReportedUser *UserBasicInfo `json:"reported_user"`
-	ReportUser   *UserBasicInfo `json:"report_user"`
-
-	Content        string `json:"content"`
-	FlaggedContent string `json:"flagged_content"`
-	OType          string `json:"object_type"`
-
-	ObjectID   string `json:"-"`
-	QuestionID string `json:"question_id"`
-	AnswerID   string `json:"answer_id"`
-	CommentID  string `json:"comment_id"`
-
-	Title   string `json:"title"`
-	Excerpt string `json:"excerpt"`
-
-	// create time
-	CreatedAt       time.Time `json:"-"`
-	CreatedAtParsed int64     `json:"created_at"`
-
-	UpdatedAt       time.Time `json:"_"`
-	UpdatedAtParsed int64     `json:"updated_at"`
-
-	Reason        *ReasonItem `json:"reason"`
-	FlaggedReason *ReasonItem `json:"flagged_reason"`
-
-	UserID         string `json:"-"`
-	ReportedUserID string `json:"-"`
-	ObjectType     int    `json:"-"`
-	ReportType     int    `json:"-"`
-	FlaggedType    int    `json:"-"`
-}
-
-// Format format result
-func (r *GetReportListPageResp) Format() {
-	r.OType = constant.ObjectTypeNumberMapping[r.ObjectType]
-
-	r.CreatedAtParsed = r.CreatedAt.Unix()
-	r.UpdatedAtParsed = r.UpdatedAt.Unix()
+	FlagID           string        `json:"flag_id"`
+	CreatedAt        int64         `json:"created_at"`
+	ObjectID         string        `json:"object_id"`
+	QuestionID       string        `json:"question_id"`
+	AnswerID         string        `json:"answer_id"`
+	CommentID        string        `json:"comment_id"`
+	ObjectType       string        `json:"object_type" enums:"question,answer,comment"`
+	Title            string        `json:"title"`
+	OriginalText     string        `json:"original_text"`
+	Tags             []*TagResp    `json:"tags"`
+	ObjectStatus     int           `json:"object_status"`
+	ObjectShowStatus int           `json:"object_show_status"`
+	AuthorUserInfo   UserBasicInfo `json:"author_user_info"`
+	SubmitAt         int64         `json:"submit_at"`
+	SubmitterUser    UserBasicInfo `json:"submitter_user"`
+	Reason           *ReasonItem   `json:"reason"`
 }
 
 // GetUnreviewedReportPostPageReq get unreviewed report post page request
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index f76253c5..bda52204 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -41,12 +41,17 @@ type GetUnreviewedPostPageResp struct {
 	ReviewID             int           `json:"review_id"`
 	CreatedAt            int64         `json:"created_at"`
 	ObjectID             string        `json:"object_id"`
+	QuestionID           string        `json:"question_id"`
+	AnswerID             string        `json:"answer_id"`
+	CommentID            string        `json:"comment_id"`
 	ObjectType           string        `json:"object_type" enums:"question,answer,comment"`
 	Title                string        `json:"title"`
-	ParsedText           string        `json:"parsed_text"`
+	OriginalText         string        `json:"original_text"`
 	Tags                 []*TagResp    `json:"tags"`
-	AuthorUserID         string        `json:"author_user_id"`
-	UserInfo             UserBasicInfo `json:"user_info"`
+	ObjectStatus         int           `json:"object_status"`
+	ObjectShowStatus     int           `json:"object_show_status"`
+	AuthorUserInfo       UserBasicInfo `json:"author_user_info"`
 	SubmitAt             int64         `json:"submit_at"`
 	SubmitterDisplayName string        `json:"submitter_display_name"`
+	Reason               string        `json:"reason"`
 }
diff --git a/internal/schema/search_schema.go b/internal/schema/search_schema.go
index 90b08ceb..c64e9c76 100644
--- a/internal/schema/search_schema.go
+++ b/internal/schema/search_schema.go
@@ -20,11 +20,12 @@
 package schema
 
 import (
+	"regexp"
+	"strings"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/validator"
 	"github.com/apache/incubator-answer/plugin"
-	"regexp"
-	"strings"
 )
 
 type SearchDTO struct {
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 2c20d63b..56eb5549 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -36,9 +36,15 @@ type SimpleObjectInfo struct {
 type UnreviewedRevisionInfoInfo struct {
 	CreatedAt           int64      `json:"created_at"`
 	ObjectID            string     `json:"object_id"`
+	QuestionID          string     `json:"question_id"`
+	AnswerID            string     `json:"answer_id"`
+	CommentID           string     `json:"comment_id"`
+	ObjectType          string     `json:"object_type"`
 	ObjectCreatorUserID string     `json:"object_creator_user_id"`
 	Title               string     `json:"title"`
 	Content             string     `json:"content"`
 	Html                string     `json:"html"`
 	Tags                []*TagResp `json:"tags"`
+	Status              int        `json:"status"`
+	ShowStatus          int        `json:"show_status"`
 }
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 43f87743..719335de 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -89,11 +89,15 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
 			CreatedAt:           questionInfo.CreatedAt.Unix(),
 			ObjectID:            questionInfo.ID,
+			QuestionID:          questionInfo.ID,
+			ObjectType:          objectType,
 			ObjectCreatorUserID: questionInfo.UserID,
 			Title:               questionInfo.Title,
 			Content:             questionInfo.OriginalText,
 			Html:                questionInfo.ParsedText,
 			Tags:                tags,
+			Status:              questionInfo.Status,
+			ShowStatus:          questionInfo.Show,
 		}
 	case constant.AnswerObjectType:
 		answerInfo, exist, err := os.answerRepo.GetAnswer(ctx, objectID)
@@ -117,10 +121,14 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
 			CreatedAt:           answerInfo.CreatedAt.Unix(),
 			ObjectID:            answerInfo.ID,
+			QuestionID:          answerInfo.QuestionID,
+			AnswerID:            answerInfo.ID,
+			ObjectType:          objectType,
 			ObjectCreatorUserID: answerInfo.UserID,
 			Title:               questionInfo.Title,
 			Content:             answerInfo.OriginalText,
 			Html:                answerInfo.ParsedText,
+			Status:              answerInfo.Status,
 		}
 	case constant.TagObjectType:
 		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID, true)
@@ -131,11 +139,13 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			break
 		}
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
-			CreatedAt: tagInfo.CreatedAt.Unix(),
-			ObjectID:  tagInfo.ID,
-			Title:     tagInfo.SlugName,
-			Content:   tagInfo.OriginalText,
-			Html:      tagInfo.ParsedText,
+			CreatedAt:  tagInfo.CreatedAt.Unix(),
+			ObjectID:   tagInfo.ID,
+			ObjectType: objectType,
+			Title:      tagInfo.SlugName,
+			Content:    tagInfo.OriginalText,
+			Html:       tagInfo.ParsedText,
+			Status:     tagInfo.Status,
 		}
 	case constant.CommentObjectType:
 		commentInfo, exist, err := os.commentRepo.GetComment(ctx, objectID)
@@ -148,9 +158,28 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
 			CreatedAt:           commentInfo.CreatedAt.Unix(),
 			ObjectID:            commentInfo.ID,
+			CommentID:           commentInfo.ID,
+			ObjectType:          objectType,
 			ObjectCreatorUserID: commentInfo.UserID,
 			Content:             commentInfo.OriginalText,
 			Html:                commentInfo.ParsedText,
+			Status:              commentInfo.Status,
+		}
+		if len(commentInfo.QuestionID) > 0 {
+			questionInfo, exist, err := os.questionRepo.GetQuestion(ctx, commentInfo.QuestionID)
+			if err != nil {
+				return nil, err
+			}
+			if exist {
+				objInfo.QuestionID = questionInfo.ID
+			}
+			answerInfo, exist, err := os.answerRepo.GetAnswer(ctx, commentInfo.ObjectID)
+			if err != nil {
+				return nil, err
+			}
+			if exist {
+				objInfo.AnswerID = answerInfo.ID
+			}
 		}
 	}
 	if objInfo == nil {
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 72ea83bf..b5af3211 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -36,7 +36,6 @@ import (
 	"github.com/apache/incubator-answer/internal/service/report_common"
 	"github.com/apache/incubator-answer/internal/service/report_handle"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
-	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/obj"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
@@ -107,6 +106,7 @@ func (rs *ReportService) AddReport(ctx context.Context, req *schema.AddReportReq
 // GetUnreviewedReportPostPage get unreviewed report post page
 func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *schema.GetUnreviewedReportPostPageReq) (
 	pageModel *pager.PageModel, err error) {
+	lang := handler.GetLangByCtx(ctx)
 	reports, total, err := rs.reportRepo.GetReportListPage(ctx, &schema.GetReportListPageDTO{
 		Page:     req.Page,
 		PageSize: 1,
@@ -117,29 +117,58 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 	}
 
 	resp := make([]*schema.GetReportListPageResp, 0)
-	_ = copier.Copy(&resp, reports)
-	var flaggedUserIds, userIds []string
-	for _, r := range resp {
-		flaggedUserIds = append(flaggedUserIds, r.ReportedUserID)
-		userIds = append(userIds, r.UserID)
-		r.Format()
-	}
+	for _, report := range reports {
+		info, err := rs.objectInfoService.GetUnreviewedRevisionInfo(ctx, report.ObjectID)
+		if err != nil {
+			log.Errorf("GetUnreviewedRevisionInfo failed, err: %v", err)
+			continue
+		}
 
-	// flagged users
-	flaggedUsers, err := rs.commonUser.BatchUserBasicInfoByID(ctx, flaggedUserIds)
-	if err != nil {
-		return nil, err
-	}
+		r := &schema.GetReportListPageResp{
+			FlagID:           report.ID,
+			CreatedAt:        info.CreatedAt,
+			ObjectID:         info.ObjectID,
+			ObjectType:       info.ObjectType,
+			QuestionID:       info.QuestionID,
+			AnswerID:         info.AnswerID,
+			CommentID:        info.CommentID,
+			Title:            info.Title,
+			OriginalText:     info.Content,
+			Tags:             info.Tags,
+			SubmitAt:         report.CreatedAt.Unix(),
+			ObjectStatus:     info.Status,
+			ObjectShowStatus: info.ShowStatus,
+		}
 
-	// flag users
-	users, err := rs.commonUser.BatchUserBasicInfoByID(ctx, userIds)
-	if err != nil {
-		return nil, err
-	}
-	for _, r := range resp {
-		r.ReportedUser = flaggedUsers[r.ReportedUserID]
-		r.ReportUser = users[r.UserID]
-		rs.decorateReportResp(ctx, r)
+		// get user info
+		userInfo, exists, e := rs.commonUser.GetUserBasicInfoByID(ctx, info.ObjectCreatorUserID)
+		if e != nil {
+			log.Errorf("user not found by id: %s, err: %v", info.ObjectCreatorUserID, e)
+		}
+		if exists {
+			_ = copier.Copy(&r.AuthorUserInfo, userInfo)
+		}
+
+		// get submitter info
+		submitter, exists, e := rs.commonUser.GetUserBasicInfoByID(ctx, report.ReportedUserID)
+		if e != nil {
+			log.Errorf("user not found by id: %s, err: %v", info.ObjectCreatorUserID, e)
+		}
+		if exists {
+			_ = copier.Copy(&r.SubmitterUser, submitter)
+		}
+
+		if report.ReportType > 0 {
+			r.Reason = &schema.ReasonItem{ReasonType: report.ReportType}
+			cf, err := rs.configService.GetConfigByID(ctx, report.ReportType)
+			if err != nil {
+				log.Error(err)
+			} else {
+				_ = json.Unmarshal([]byte(cf.Value), r.Reason)
+				r.Reason.Translate(cf.Key, lang)
+			}
+		}
+		resp = append(resp, r)
 	}
 	return pager.NewPageModel(total, resp), nil
 }
@@ -169,39 +198,3 @@ func (rs *ReportService) ReviewReport(ctx context.Context, req *schema.ReviewRep
 
 	return rs.reportRepo.UpdateStatus(ctx, report.ID, entity.ReportStatusCompleted)
 }
-
-func (rs *ReportService) decorateReportResp(ctx context.Context, resp *schema.GetReportListPageResp) {
-	lang := handler.GetLangByCtx(ctx)
-	objectInfo, err := rs.objectInfoService.GetInfo(ctx, resp.ObjectID)
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	resp.QuestionID = objectInfo.QuestionID
-	resp.AnswerID = objectInfo.AnswerID
-	resp.CommentID = objectInfo.CommentID
-	resp.Title = objectInfo.Title
-	resp.Excerpt = htmltext.FetchExcerpt(objectInfo.Content, "...", 240)
-
-	if resp.ReportType > 0 {
-		resp.Reason = &schema.ReasonItem{ReasonType: resp.ReportType}
-		cf, err := rs.configService.GetConfigByID(ctx, resp.ReportType)
-		if err != nil {
-			log.Error(err)
-		} else {
-			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
-			resp.Reason.Translate(cf.Key, lang)
-		}
-	}
-	if resp.FlaggedType > 0 {
-		resp.FlaggedReason = &schema.ReasonItem{ReasonType: resp.FlaggedType}
-		cf, err := rs.configService.GetConfigByID(ctx, resp.FlaggedType)
-		if err != nil {
-			log.Error(err)
-		} else {
-			_ = json.Unmarshal([]byte(cf.Value), resp.Reason)
-			resp.Reason.Translate(cf.Key, lang)
-		}
-	}
-}
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index e0a713fe..354eb972 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -247,13 +247,18 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 			ReviewID:             review.ID,
 			CreatedAt:            info.CreatedAt,
 			ObjectID:             info.ObjectID,
-			ObjectType:           info.ObjectID,
+			QuestionID:           info.QuestionID,
+			AnswerID:             info.AnswerID,
+			CommentID:            info.CommentID,
+			ObjectType:           info.ObjectType,
 			Title:                info.Title,
-			ParsedText:           info.Html,
+			OriginalText:         info.Content,
 			Tags:                 info.Tags,
-			AuthorUserID:         info.ObjectCreatorUserID,
+			ObjectStatus:         info.Status,
+			ObjectShowStatus:     info.ShowStatus,
 			SubmitAt:             review.CreatedAt.Unix(),
 			SubmitterDisplayName: req.ReviewerMapping[review.Submitter],
+			Reason:               review.Reason,
 		}
 
 		// get user info
@@ -262,7 +267,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 			log.Errorf("user not found by id: %s, err: %v", info.ObjectCreatorUserID, e)
 		}
 		if exists {
-			_ = copier.Copy(&r.UserInfo, userInfo)
+			_ = copier.Copy(&r.AuthorUserInfo, userInfo)
 		}
 		resp = append(resp, r)
 	}

From 371eaf118ea9d5d543f94a389e28d72738feee3d Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 8 Mar 2024 20:13:40 +0800
Subject: [PATCH 041/114] feat(review): update flag api add answer count

---
 docs/docs.go                                | 12 +++++++++---
 docs/swagger.json                           | 12 +++++++++---
 docs/swagger.yaml                           | 10 +++++++---
 internal/schema/report_schema.go            |  1 +
 internal/schema/simple_obj_info_schema.go   |  1 +
 internal/service/object_info/object_info.go |  1 +
 internal/service/report/report_service.go   |  1 +
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 9db1f742..6f19753b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -39,7 +39,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "ObjectStatus:[available,deleted,pending]",
+                "description": "Status:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -370,7 +370,7 @@ const docTemplate = `{
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "ObjectStatus:[available,closed,deleted,pending]",
+                "description": "Status:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -7822,6 +7822,9 @@ const docTemplate = `{
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
+                "answer_count": {
+                    "type": "integer"
+                },
                 "answer_id": {
                     "type": "string"
                 },
@@ -8955,7 +8958,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "status": {
-                    "description": "ObjectStatus",
+                    "description": "Status",
                     "type": "string"
                 },
                 "tags": {
@@ -9636,6 +9639,9 @@ const docTemplate = `{
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_count": {
+                    "type": "integer"
+                },
                 "answer_id": {
                     "type": "string"
                 },
diff --git a/docs/swagger.json b/docs/swagger.json
index d7bf136c..dab51960 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -27,7 +27,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "ObjectStatus:[available,deleted,pending]",
+                "description": "Status:[available,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -358,7 +358,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
-                "description": "ObjectStatus:[available,closed,deleted,pending]",
+                "description": "Status:[available,closed,deleted,pending]",
                 "consumes": [
                     "application/json"
                 ],
@@ -7810,6 +7810,9 @@
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
+                "answer_count": {
+                    "type": "integer"
+                },
                 "answer_id": {
                     "type": "string"
                 },
@@ -8943,7 +8946,7 @@
                     "type": "string"
                 },
                 "status": {
-                    "description": "ObjectStatus",
+                    "description": "Status",
                     "type": "string"
                 },
                 "tags": {
@@ -9624,6 +9627,9 @@
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_count": {
+                    "type": "integer"
+                },
                 "answer_id": {
                     "type": "string"
                 },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 937cd78e..5a8de316 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -821,6 +821,8 @@ definitions:
     type: object
   schema.GetReportListPageResp:
     properties:
+      answer_count:
+        type: integer
       answer_id:
         type: string
       author_user_info:
@@ -1605,7 +1607,7 @@ definitions:
       question_id:
         type: string
       status:
-        description: ObjectStatus
+        description: Status
         type: string
       tags:
         description: tags
@@ -2069,6 +2071,8 @@ definitions:
     type: object
   schema.UnreviewedRevisionInfoInfo:
     properties:
+      answer_count:
+        type: integer
       answer_id:
         type: string
       comment_id:
@@ -2639,7 +2643,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: ObjectStatus:[available,deleted,pending]
+      description: Status:[available,deleted,pending]
       parameters:
       - description: page size
         in: query
@@ -2841,7 +2845,7 @@ paths:
     get:
       consumes:
       - application/json
-      description: ObjectStatus:[available,closed,deleted,pending]
+      description: Status:[available,closed,deleted,pending]
       parameters:
       - description: page size
         in: query
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index 6b15a1e0..eadcde84 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -80,6 +80,7 @@ type GetReportListPageResp struct {
 	ObjectType       string        `json:"object_type" enums:"question,answer,comment"`
 	Title            string        `json:"title"`
 	OriginalText     string        `json:"original_text"`
+	AnswerCount      int           `json:"answer_count"`
 	Tags             []*TagResp    `json:"tags"`
 	ObjectStatus     int           `json:"object_status"`
 	ObjectShowStatus int           `json:"object_show_status"`
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 56eb5549..ffd5b97b 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -44,6 +44,7 @@ type UnreviewedRevisionInfoInfo struct {
 	Title               string     `json:"title"`
 	Content             string     `json:"content"`
 	Html                string     `json:"html"`
+	AnswerCount         int        `json:"answer_count"`
 	Tags                []*TagResp `json:"tags"`
 	Status              int        `json:"status"`
 	ShowStatus          int        `json:"show_status"`
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 719335de..9369c425 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -95,6 +95,7 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			Title:               questionInfo.Title,
 			Content:             questionInfo.OriginalText,
 			Html:                questionInfo.ParsedText,
+			AnswerCount:         questionInfo.AnswerCount,
 			Tags:                tags,
 			Status:              questionInfo.Status,
 			ShowStatus:          questionInfo.Show,
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index b5af3211..0d82aa77 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -134,6 +134,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 			CommentID:        info.CommentID,
 			Title:            info.Title,
 			OriginalText:     info.Content,
+			AnswerCount:      info.AnswerCount,
 			Tags:             info.Tags,
 			SubmitAt:         report.CreatedAt.Unix(),
 			ObjectStatus:     info.Status,

From 2a828c93c103ffeb72a50bde1664506af294da1d Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Fri, 8 Mar 2024 09:44:57 +0800
Subject: [PATCH 042/114] feat: support setting config for check latest answer
 version

---
 i18n/en_US.yaml                                    |  3 +++
 i18n/zh_CN.yaml                                    |  3 +++
 internal/schema/siteinfo_schema.go                 |  1 +
 internal/service/dashboard/dashboard_service.go    | 12 ++++++++++--
 .../service/siteinfo_common/siteinfo_service.go    |  2 +-
 ui/src/common/interface.ts                         |  2 ++
 .../Dashboard/components/HealthStatus/index.tsx    |  4 +++-
 ui/src/pages/Admin/General/index.tsx               | 14 ++++++++++++++
 ui/src/stores/siteInfo.ts                          |  1 +
 9 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 484d62d1..18312e5e 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1595,6 +1595,9 @@ ui:
         msg: Contact email cannot be empty.
         validate: Contact email is not valid.
         text: Email address of key contact responsible for this site.
+      check_update:
+        label: Software updates
+        text: Automatically check for updates
     interface:
       page_title: Interface
       language:
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index f204860a..01bc07b9 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1550,6 +1550,9 @@ ui:
         msg: 联系人邮箱不能为空。
         validate: 联系人邮箱无效。
         text: 本网站的主要联系邮箱地址。
+      check_update:
+        label: 软件更新
+        text: 自动检查软件更新
     interface:
       page_title: 界面
       language:
diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go
index 2953b944..ea19d046 100644
--- a/internal/schema/siteinfo_schema.go
+++ b/internal/schema/siteinfo_schema.go
@@ -40,6 +40,7 @@ type SiteGeneralReq struct {
 	Description      string `validate:"omitempty,sanitizer,gt=3,lte=2000" form:"description" json:"description"`
 	SiteUrl          string `validate:"required,sanitizer,gt=1,lte=512,url" form:"site_url" json:"site_url"`
 	ContactEmail     string `validate:"required,sanitizer,gt=1,lte=512,email" form:"contact_email" json:"contact_email"`
+	CheckUpdate      bool   `validate:"omitempty,sanitizer" form:"check_update" json:"check_update"`
 }
 
 func (r *SiteGeneralReq) FormatSiteUrl() {
diff --git a/internal/service/dashboard/dashboard_service.go b/internal/service/dashboard/dashboard_service.go
index c9b6efe1..0d36cd6a 100644
--- a/internal/service/dashboard/dashboard_service.go
+++ b/internal/service/dashboard/dashboard_service.go
@@ -23,11 +23,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/apache/incubator-answer/pkg/converter"
 	"io"
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/apache/incubator-answer/pkg/converter"
 	"xorm.io/xorm/schemas"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
@@ -101,7 +102,14 @@ func (ds *dashboardService) Statistical(ctx context.Context) (*schema.DashboardI
 		dashboardInfo.ReportCount = ds.reportCount(ctx)
 		dashboardInfo.VoteCount = ds.voteCount(ctx)
 		dashboardInfo.OccupyingStorageSpace = ds.calculateStorage()
-		dashboardInfo.VersionInfo.RemoteVersion = ds.remoteVersion(ctx)
+		general, err := ds.siteInfoService.GetSiteGeneral(ctx)
+		if err != nil {
+			log.Errorf("get general site info failed: %s", err)
+			return dashboardInfo, nil
+		}
+		if general.CheckUpdate {
+			dashboardInfo.VersionInfo.RemoteVersion = ds.remoteVersion(ctx)
+		}
 		dashboardInfo.DatabaseVersion = ds.getDatabaseInfo()
 		dashboardInfo.DatabaseSize = ds.GetDatabaseSize()
 	}
diff --git a/internal/service/siteinfo_common/siteinfo_service.go b/internal/service/siteinfo_common/siteinfo_service.go
index e37fb7b1..2036ec6e 100644
--- a/internal/service/siteinfo_common/siteinfo_service.go
+++ b/internal/service/siteinfo_common/siteinfo_service.go
@@ -66,7 +66,7 @@ func NewSiteInfoCommonService(siteInfoRepo SiteInfoRepo) SiteInfoCommonService {
 
 // GetSiteGeneral get site info general
 func (s *siteInfoCommonService) GetSiteGeneral(ctx context.Context) (resp *schema.SiteGeneralResp, err error) {
-	resp = &schema.SiteGeneralResp{}
+	resp = &schema.SiteGeneralResp{CheckUpdate: true}
 	if err = s.GetSiteInfoByType(ctx, constant.SiteTypeGeneral, resp); err != nil {
 		return nil, err
 	}
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 71b14080..65117ae1 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -347,6 +347,8 @@ export interface AdminSettingsGeneral {
   description: string;
   site_url: string;
   contact_email: string;
+  check_update: boolean;
+  permalink?: number;
 }
 
 export interface HelmetBase {
diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
index c77f0bb1..64122669 100644
--- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
@@ -23,6 +23,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
 import type * as Type from '@/common/interface';
+import { siteInfoStore } from '@/stores';
 
 const { gt, gte } = require('semver');
 
@@ -33,6 +34,7 @@ interface IProps {
 const HealthStatus: FC<IProps> = ({ data }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'admin.dashboard' });
   const { version, remote_version } = data.version_info || {};
+  const { siteInfo } = siteInfoStore();
   let isLatest = false;
   let hasNewerVersion = false;
   if (version && remote_version) {
@@ -65,7 +67,7 @@ const HealthStatus: FC<IProps> = ({ data }) => {
                 {t('update_to')} {remote_version}
               </a>
             )}
-            {!isLatest && !remote_version && (
+            {!isLatest && !remote_version && siteInfo.check_update && (
               <a
                 className="ms-1 badge rounded-pill text-bg-danger"
                 target="_blank"
diff --git a/ui/src/pages/Admin/General/index.tsx b/ui/src/pages/Admin/General/index.tsx
index 158236a5..3b4d4ef3 100644
--- a/ui/src/pages/Admin/General/index.tsx
+++ b/ui/src/pages/Admin/General/index.tsx
@@ -69,6 +69,10 @@ const General: FC = () => {
         title: t('contact_email.label'),
         description: t('contact_email.text'),
       },
+      check_update: {
+        type: 'boolean',
+        title: t('check_update.label'),
+      },
     },
   };
   const uiSchema: UISchema = {
@@ -107,6 +111,12 @@ const General: FC = () => {
         },
       },
     },
+    check_update: {
+      'ui:widget': 'switch',
+      'ui:options': {
+        label: t('check_update.text'),
+      },
+    },
   };
   const [formData, setFormData] = useState<Type.FormDataType>(
     initFormData(schema),
@@ -121,6 +131,7 @@ const General: FC = () => {
       short_description: formData.short_description.value,
       site_url: formData.site_url.value,
       contact_email: formData.contact_email.value,
+      check_update: formData.check_update.value,
     };
 
     updateGeneralSetting(reqParams)
@@ -135,6 +146,7 @@ const General: FC = () => {
           formData.short_description.value = res.short_description;
           formData.site_url.value = res.site_url;
           formData.contact_email.value = res.contact_email;
+          formData.check_update.value = res.check_update;
         }
 
         setFormData({ ...formData });
@@ -156,10 +168,12 @@ const General: FC = () => {
     Object.keys(formData).forEach((k) => {
       formMeta[k] = { ...formData[k], value: setting[k] };
     });
+    console.log(formMeta);
     setFormData({ ...formData, ...formMeta });
   }, [setting]);
 
   const handleOnChange = (data) => {
+    console.table(data);
     setFormData(data);
   };
 
diff --git a/ui/src/stores/siteInfo.ts b/ui/src/stores/siteInfo.ts
index 69469d2a..b7f31406 100644
--- a/ui/src/stores/siteInfo.ts
+++ b/ui/src/stores/siteInfo.ts
@@ -50,6 +50,7 @@ const siteInfo = create<SiteInfoType>((set) => ({
     short_description: '',
     site_url: '',
     contact_email: '',
+    check_update: true,
     permalink: 1,
   },
   users: defaultUsersConf,

From ea8ed68296134c17257e4acd60a811d16d8fecc6 Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Fri, 8 Mar 2024 09:52:54 +0800
Subject: [PATCH 043/114] remove console log

---
 ui/src/pages/Admin/General/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ui/src/pages/Admin/General/index.tsx b/ui/src/pages/Admin/General/index.tsx
index 3b4d4ef3..1a049bd8 100644
--- a/ui/src/pages/Admin/General/index.tsx
+++ b/ui/src/pages/Admin/General/index.tsx
@@ -168,12 +168,10 @@ const General: FC = () => {
     Object.keys(formData).forEach((k) => {
       formMeta[k] = { ...formData[k], value: setting[k] };
     });
-    console.log(formMeta);
     setFormData({ ...formData, ...formMeta });
   }, [setting]);
 
   const handleOnChange = (data) => {
-    console.table(data);
     setFormData(data);
   };
 

From c364e9684d54d40a37c4bceaa70568dcfae979e1 Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Fri, 8 Mar 2024 17:16:08 +0800
Subject: [PATCH 044/114] add default to true in frontend

---
 ui/src/pages/Admin/General/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/pages/Admin/General/index.tsx b/ui/src/pages/Admin/General/index.tsx
index 1a049bd8..3c6ff51a 100644
--- a/ui/src/pages/Admin/General/index.tsx
+++ b/ui/src/pages/Admin/General/index.tsx
@@ -72,6 +72,7 @@ const General: FC = () => {
       check_update: {
         type: 'boolean',
         title: t('check_update.label'),
+        default: true,
       },
     },
   };

From ea22497d9d96419fa42cddea1df5eaa7396c117e Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 11 Mar 2024 15:09:05 +0800
Subject: [PATCH 045/114] feat(question): query revision tags for deleted
 question

---
 cmd/wire_gen.go                               |   2 +-
 internal/controller/question_controller.go    |   4 +-
 .../controller/template_render/question.go    |   2 +-
 internal/schema/answer_schema.go              |  32 ++--
 internal/schema/question_schema.go            |   2 +-
 internal/service/content/answer_service.go    |   2 +-
 internal/service/content/question_service.go  |   8 +-
 internal/service/content/revision_service.go  |   4 +-
 internal/service/question_common/question.go  | 151 ++++++++++--------
 internal/service/tag_common/tag_common.go     |   2 +-
 10 files changed, 109 insertions(+), 100 deletions(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 47123b97..7cab7d18 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -167,7 +167,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerCommon := answercommon.NewAnswerCommon(answerRepo)
 	metaRepo := meta.NewMetaRepo(dataData)
 	metaService := meta2.NewMetaService(metaRepo)
-	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, dataData)
+	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, revisionRepo, dataData)
 	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index 3f5f936c..db35c83f 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -543,7 +543,7 @@ func (qc *QuestionController) AddQuestionByAnswer(ctx *gin.Context) {
 		return
 	}
 	//add the question id to the answer
-	questionInfo, ok := resp.(*schema.QuestionInfo)
+	questionInfo, ok := resp.(*schema.QuestionInfoResp)
 	if ok {
 		answerReq := &schema.AnswerAddReq{}
 		answerReq.QuestionID = uid.DeShortID(questionInfo.ID)
@@ -657,7 +657,7 @@ func (qc *QuestionController) UpdateQuestion(ctx *gin.Context) {
 		handler.HandleResponse(ctx, err, resp)
 		return
 	}
-	respInfo, ok := resp.(*schema.QuestionInfo)
+	respInfo, ok := resp.(*schema.QuestionInfoResp)
 	if !ok {
 		handler.HandleResponse(ctx, err, resp)
 		return
diff --git a/internal/controller/template_render/question.go b/internal/controller/template_render/question.go
index a2779e23..a65c3083 100644
--- a/internal/controller/template_render/question.go
+++ b/internal/controller/template_render/question.go
@@ -34,7 +34,7 @@ func (t *TemplateRenderController) Index(ctx *gin.Context, req *schema.QuestionP
 	return t.questionService.GetQuestionPage(ctx, req)
 }
 
-func (t *TemplateRenderController) QuestionDetail(ctx *gin.Context, id string) (resp *schema.QuestionInfo, err error) {
+func (t *TemplateRenderController) QuestionDetail(ctx *gin.Context, id string) (resp *schema.QuestionInfoResp, err error) {
 	return t.questionService.GetQuestion(ctx, id, "", schema.QuestionPermission{})
 }
 
diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go
index 2cd45947..d0c208e6 100644
--- a/internal/schema/answer_schema.go
+++ b/internal/schema/answer_schema.go
@@ -98,22 +98,22 @@ type AnswerListReq struct {
 }
 
 type AnswerInfo struct {
-	ID             string         `json:"id"`
-	QuestionID     string         `json:"question_id"`
-	Content        string         `json:"content"`
-	HTML           string         `json:"html"`
-	CreateTime     int64          `json:"create_time"`
-	UpdateTime     int64          `json:"update_time"`
-	Accepted       int            `json:"accepted"`
-	UserID         string         `json:"-"`
-	UpdateUserID   string         `json:"-"`
-	UserInfo       *UserBasicInfo `json:"user_info,omitempty"`
-	UpdateUserInfo *UserBasicInfo `json:"update_user_info,omitempty"`
-	Collected      bool           `json:"collected"`
-	VoteStatus     string         `json:"vote_status"`
-	VoteCount      int            `json:"vote_count"`
-	QuestionInfo   *QuestionInfo  `json:"question_info,omitempty"`
-	Status         int            `json:"status"`
+	ID             string            `json:"id"`
+	QuestionID     string            `json:"question_id"`
+	Content        string            `json:"content"`
+	HTML           string            `json:"html"`
+	CreateTime     int64             `json:"create_time"`
+	UpdateTime     int64             `json:"update_time"`
+	Accepted       int               `json:"accepted"`
+	UserID         string            `json:"-"`
+	UpdateUserID   string            `json:"-"`
+	UserInfo       *UserBasicInfo    `json:"user_info,omitempty"`
+	UpdateUserInfo *UserBasicInfo    `json:"update_user_info,omitempty"`
+	Collected      bool              `json:"collected"`
+	VoteStatus     string            `json:"vote_status"`
+	VoteCount      int               `json:"vote_count"`
+	QuestionInfo   *QuestionInfoResp `json:"question_info,omitempty"`
+	Status         int               `json:"status"`
 
 	// MemberActions
 	MemberActions []*PermissionMemberAction `json:"member_actions"`
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 5944203b..44ff1303 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -214,7 +214,7 @@ type QuestionBaseInfo struct {
 	AcceptedAnswer  bool   `json:"accepted_answer"`
 }
 
-type QuestionInfo struct {
+type QuestionInfoResp struct {
 	ID                   string         `json:"id" `
 	Title                string         `json:"title"`
 	UrlTitle             string         `json:"url_title"`
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.go
index e832c31c..88fa5e3a 100644
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -458,7 +458,7 @@ func (as *AnswerService) updateAnswerRank(ctx context.Context, userID string,
 	}
 }
 
-func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string) (*schema.AnswerInfo, *schema.QuestionInfo, bool, error) {
+func (as *AnswerService) Get(ctx context.Context, answerID, loginUserID string) (*schema.AnswerInfo, *schema.QuestionInfoResp, bool, error) {
 	answerInfo, has, err := as.answerRepo.GetByID(ctx, answerID)
 	if err != nil {
 		return nil, nil, has, err
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index 1d0851b9..9a068640 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -764,7 +764,7 @@ func (qs *QuestionService) notificationInviteUser(
 // UpdateQuestion update question
 func (qs *QuestionService) UpdateQuestion(ctx context.Context, req *schema.QuestionUpdate) (questionInfo any, err error) {
 	var canUpdate bool
-	questionInfo = &schema.QuestionInfo{}
+	questionInfo = &schema.QuestionInfoResp{}
 
 	_, existUnreviewed, err := qs.revisionService.ExistUnreviewedByObjectID(ctx, req.ID)
 	if err != nil {
@@ -927,7 +927,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.QuestionInfoResp, err error) {
 	question, err := qs.questioncommon.Info(ctx, questionID, userID)
 	if err != nil {
 		return
@@ -976,7 +976,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) (
-	resp *schema.QuestionInfo, err error) {
+	resp *schema.QuestionInfoResp, err error) {
 	err = qs.questioncommon.UpdatePv(ctx, questionID)
 	if err != nil {
 		log.Error(err)
@@ -1090,7 +1090,7 @@ func (qs *QuestionService) PersonalAnswerPage(ctx context.Context, req *schema.P
 // PersonalCollectionPage get collection list by user
 func (qs *QuestionService) PersonalCollectionPage(ctx context.Context, req *schema.PersonalCollectionPageReq) (
 	pageModel *pager.PageModel, err error) {
-	list := make([]*schema.QuestionInfo, 0)
+	list := make([]*schema.QuestionInfoResp, 0)
 	collectionSearch := &entity.CollectionSearch{}
 	collectionSearch.UserID = req.UserID
 	collectionSearch.Page = req.Page
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index 6b708833..e004ad07 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -151,7 +151,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.(*schema.QuestionInfo)
+	questioninfo, ok := revisionitem.ContentParsed.(*schema.QuestionInfoResp)
 	if ok {
 		var PostUpdateTime time.Time
 		dbquestion, exist, dberr := rs.questionRepo.GetQuestion(ctx, questioninfo.ID)
@@ -388,7 +388,7 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 	var (
 		err          error
 		question     entity.QuestionWithTagsRevision
-		questionInfo *schema.QuestionInfo
+		questionInfo *schema.QuestionInfoResp
 		answer       entity.Answer
 		answerInfo   *schema.AnswerInfo
 		tag          entity.Tag
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 9fbda693..29b2a0c6 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -33,6 +33,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
 	"github.com/apache/incubator-answer/internal/service/config"
 	"github.com/apache/incubator-answer/internal/service/meta"
+	"github.com/apache/incubator-answer/internal/service/revision"
 	"github.com/apache/incubator-answer/pkg/checker"
 	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/uid"
@@ -88,6 +89,7 @@ type QuestionCommon struct {
 	metaService          *meta.MetaService
 	configService        *config.ConfigService
 	activityQueueService activity_queue.ActivityQueueService
+	revisionRepo         revision.RevisionRepo
 	data                 *data.Data
 }
 
@@ -102,6 +104,7 @@ func NewQuestionCommon(questionRepo QuestionRepo,
 	metaService *meta.MetaService,
 	configService *config.ConfigService,
 	activityQueueService activity_queue.ActivityQueueService,
+	revisionRepo revision.RevisionRepo,
 	data *data.Data,
 ) *QuestionCommon {
 	return &QuestionCommon{
@@ -116,6 +119,7 @@ func NewQuestionCommon(questionRepo QuestionRepo,
 		metaService:          metaService,
 		configService:        configService,
 		activityQueueService: activityQueueService,
+		revisionRepo:         revisionRepo,
 		data:                 data,
 	}
 }
@@ -168,8 +172,8 @@ func (qs *QuestionCommon) UpdatePostSetTime(ctx context.Context, questionID stri
 	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)
+func (qs *QuestionCommon) FindInfoByID(ctx context.Context, questionIDs []string, loginUserID string) (map[string]*schema.QuestionInfoResp, error) {
+	list := make(map[string]*schema.QuestionInfoResp)
 	questionList, err := qs.questionRepo.FindByID(ctx, questionIDs)
 	if err != nil {
 		return list, err
@@ -212,30 +216,27 @@ func (qs *QuestionCommon) InviteUserInfo(ctx context.Context, questionID string)
 	return InviteUserInfo, nil
 }
 
-func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUserID string) (showinfo *schema.QuestionInfo, err error) {
-	dbinfo, has, err := qs.questionRepo.GetQuestion(ctx, questionID)
+func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUserID string) (resp *schema.QuestionInfoResp, err error) {
+	questionInfo, has, err := qs.questionRepo.GetQuestion(ctx, questionID)
 	if err != nil {
-		return showinfo, err
+		return resp, err
 	}
-	dbinfo.ID = uid.DeShortID(dbinfo.ID)
+	questionInfo.ID = uid.DeShortID(questionInfo.ID)
 	if !has {
-		return showinfo, errors.NotFound(reason.QuestionNotFound)
+		return resp, errors.NotFound(reason.QuestionNotFound)
 	}
-	showinfo = qs.ShowFormat(ctx, dbinfo)
-
-	if showinfo.Status == 2 {
-		var metainfo *entity.Meta
-		metainfo, err = qs.metaService.GetMetaByObjectIdAndKey(ctx, dbinfo.ID, entity.QuestionCloseReasonKey)
+	resp = qs.ShowFormat(ctx, questionInfo)
+	if resp.Status == entity.QuestionStatusClosed {
+		metaInfo, err := qs.metaService.GetMetaByObjectIdAndKey(ctx, questionInfo.ID, entity.QuestionCloseReasonKey)
 		if err != nil {
 			log.Error(err)
 		} else {
-			// metainfo.Value
-			closemsg := &schema.CloseQuestionMeta{}
-			err = json.Unmarshal([]byte(metainfo.Value), closemsg)
+			closeMsg := &schema.CloseQuestionMeta{}
+			err = json.Unmarshal([]byte(metaInfo.Value), closeMsg)
 			if err != nil {
 				log.Error("json.Unmarshal CloseQuestionMeta error", err.Error())
 			} else {
-				cfg, err := qs.configService.GetConfigByID(ctx, closemsg.CloseType)
+				cfg, err := qs.configService.GetConfigByID(ctx, closeMsg.CloseType)
 				if err != nil {
 					log.Error("json.Unmarshal QuestionCloseJson error", err.Error())
 				} else {
@@ -245,76 +246,84 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUser
 					operation := &schema.Operation{}
 					operation.Type = reasonItem.Name
 					operation.Description = reasonItem.Description
-					operation.Msg = closemsg.CloseMsg
-					operation.Time = metainfo.CreatedAt.Unix()
+					operation.Msg = closeMsg.CloseMsg
+					operation.Time = metaInfo.CreatedAt.Unix()
 					operation.Level = schema.OperationLevelInfo
-					showinfo.Operation = operation
+					resp.Operation = operation
 				}
 			}
 		}
 	}
 
-	tagmap, err := qs.tagCommon.GetObjectTag(ctx, questionID)
-	if err != nil {
-		return showinfo, err
+	if resp.Status != entity.QuestionStatusDeleted {
+		if resp.Tags, err = qs.tagCommon.GetObjectTag(ctx, questionID); err != nil {
+			return resp, err
+		}
+	} else {
+		revisionInfo, exist, err := qs.revisionRepo.GetLastRevisionByObjectID(ctx, questionID)
+		if err != nil {
+			log.Errorf("get revision error %s", err)
+		}
+		if exist {
+			questionWithTagsRevision := &entity.QuestionWithTagsRevision{}
+			if err = json.Unmarshal([]byte(revisionInfo.Content), questionWithTagsRevision); err != nil {
+				log.Errorf("revision parsing error %s", err)
+				return resp, nil
+			}
+			for _, tag := range questionWithTagsRevision.Tags {
+				resp.Tags = append(resp.Tags, &schema.TagResp{
+					ID:              tag.ID,
+					SlugName:        tag.SlugName,
+					DisplayName:     tag.DisplayName,
+					MainTagSlugName: tag.MainTagSlugName,
+					Recommend:       tag.Recommend,
+					Reserved:        tag.Reserved,
+				})
+			}
+		}
 	}
-	showinfo.Tags = tagmap
 
 	userIds := make([]string, 0)
-	if checker.IsNotZeroString(dbinfo.UserID) {
-		userIds = append(userIds, dbinfo.UserID)
+	if checker.IsNotZeroString(questionInfo.UserID) {
+		userIds = append(userIds, questionInfo.UserID)
 	}
-	if checker.IsNotZeroString(dbinfo.LastEditUserID) {
-		userIds = append(userIds, dbinfo.LastEditUserID)
+	if checker.IsNotZeroString(questionInfo.LastEditUserID) {
+		userIds = append(userIds, questionInfo.LastEditUserID)
 	}
-	if checker.IsNotZeroString(showinfo.LastAnsweredUserID) {
-		userIds = append(userIds, showinfo.LastAnsweredUserID)
+	if checker.IsNotZeroString(resp.LastAnsweredUserID) {
+		userIds = append(userIds, resp.LastAnsweredUserID)
 	}
 	userInfoMap, err := qs.userCommon.BatchUserBasicInfoByID(ctx, userIds)
 	if err != nil {
-		return showinfo, err
+		return resp, err
+	}
+	resp.UserInfo = userInfoMap[questionInfo.UserID]
+	resp.UpdateUserInfo = userInfoMap[questionInfo.LastEditUserID]
+	resp.LastAnsweredUserInfo = userInfoMap[resp.LastAnsweredUserID]
+	if len(loginUserID) == 0 {
+		return resp, nil
 	}
 
-	_, 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]
-	}
+	resp.VoteStatus = qs.voteRepo.GetVoteStatus(ctx, questionID, loginUserID)
+	resp.IsFollowed, _ = qs.followCommon.IsFollowed(ctx, loginUserID, questionID)
 
-	if loginUserID == "" {
-		return showinfo, nil
-	}
-
-	showinfo.VoteStatus = qs.voteRepo.GetVoteStatus(ctx, questionID, loginUserID)
-
-	// // check is followed
-	isFollowed, _ := qs.followCommon.IsFollowed(ctx, loginUserID, questionID)
-	showinfo.IsFollowed = isFollowed
-
-	ids, err := qs.AnswerCommon.SearchAnswerIDs(ctx, loginUserID, dbinfo.ID)
+	ids, err := qs.AnswerCommon.SearchAnswerIDs(ctx, loginUserID, questionInfo.ID)
 	if err != nil {
 		log.Error("AnswerFunc.SearchAnswerIDs", err)
 	}
-	showinfo.Answered = len(ids) > 0
-	if showinfo.Answered {
-		showinfo.FirstAnswerId = ids[0]
+	resp.Answered = len(ids) > 0
+	if resp.Answered {
+		resp.FirstAnswerId = ids[0]
 	}
 
-	collectedMap, err := qs.collectionCommon.SearchObjectCollected(ctx, loginUserID, []string{dbinfo.ID})
+	collectedMap, err := qs.collectionCommon.SearchObjectCollected(ctx, loginUserID, []string{questionInfo.ID})
 	if err != nil {
 		return nil, err
 	}
 	if len(collectedMap) > 0 {
-		showinfo.Collected = true
+		resp.Collected = true
 	}
-	return showinfo, nil
+	return resp, nil
 }
 
 func (qs *QuestionCommon) FormatQuestionsPage(
@@ -419,8 +428,8 @@ func (qs *QuestionCommon) FormatQuestionsPage(
 	return formattedQuestions, nil
 }
 
-func (qs *QuestionCommon) FormatQuestions(ctx context.Context, questionList []*entity.Question, loginUserID string) ([]*schema.QuestionInfo, error) {
-	list := make([]*schema.QuestionInfo, 0)
+func (qs *QuestionCommon) FormatQuestions(ctx context.Context, questionList []*entity.Question, loginUserID string) ([]*schema.QuestionInfoResp, error) {
+	list := make([]*schema.QuestionInfoResp, 0)
 	objectIds := make([]string, 0)
 	userIds := make([]string, 0)
 
@@ -526,8 +535,8 @@ func (qs *QuestionCommon) CloseQuestion(ctx context.Context, req *schema.CloseQu
 }
 
 // RemoveAnswer delete answer
-func (as *QuestionCommon) RemoveAnswer(ctx context.Context, id string) (err error) {
-	answerinfo, has, err := as.answerRepo.GetByID(ctx, id)
+func (qs *QuestionCommon) RemoveAnswer(ctx context.Context, id string) (err error) {
+	answerinfo, has, err := qs.answerRepo.GetByID(ctx, id)
 	if err != nil {
 		return err
 	}
@@ -537,20 +546,20 @@ func (as *QuestionCommon) RemoveAnswer(ctx context.Context, id string) (err erro
 
 	// user add question count
 
-	err = as.UpdateAnswerCount(ctx, answerinfo.QuestionID)
+	err = qs.UpdateAnswerCount(ctx, answerinfo.QuestionID)
 	if err != nil {
 		log.Error("UpdateAnswerCount error", err.Error())
 	}
-	userAnswerCount, err := as.answerRepo.GetCountByUserID(ctx, answerinfo.UserID)
+	userAnswerCount, err := qs.answerRepo.GetCountByUserID(ctx, answerinfo.UserID)
 	if err != nil {
 		log.Error("GetCountByUserID error", err.Error())
 	}
-	err = as.userCommon.UpdateAnswerCount(ctx, answerinfo.UserID, int(userAnswerCount))
+	err = qs.userCommon.UpdateAnswerCount(ctx, answerinfo.UserID, int(userAnswerCount))
 	if err != nil {
 		log.Error("user UpdateAnswerCount error", err.Error())
 	}
 
-	return as.answerRepo.RemoveAnswer(ctx, id)
+	return qs.answerRepo.RemoveAnswer(ctx, id)
 }
 
 func (qs *QuestionCommon) SitemapCron(ctx context.Context) {
@@ -590,12 +599,12 @@ func (qs *QuestionCommon) SetCache(ctx context.Context, cachekey string, info in
 	return nil
 }
 
-func (qs *QuestionCommon) ShowListFormat(ctx context.Context, data *entity.Question) *schema.QuestionInfo {
+func (qs *QuestionCommon) ShowListFormat(ctx context.Context, data *entity.Question) *schema.QuestionInfoResp {
 	return qs.ShowFormat(ctx, data)
 }
 
-func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question) *schema.QuestionInfo {
-	info := schema.QuestionInfo{}
+func (qs *QuestionCommon) ShowFormat(ctx context.Context, data *entity.Question) *schema.QuestionInfoResp {
+	info := schema.QuestionInfoResp{}
 	info.ID = data.ID
 	if handler.GetEnableShortID(ctx) {
 		info.ID = uid.EnShortID(data.ID)
@@ -641,7 +650,7 @@ 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 {
+func (qs *QuestionCommon) ShowFormatWithTag(ctx context.Context, data *entity.QuestionWithTagsRevision) *schema.QuestionInfoResp {
 	info := qs.ShowFormat(ctx, &data.Question)
 	Tags := make([]*schema.TagResp, 0)
 	for _, tag := range data.Tags {
diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go
index fe8b3b53..953b96f0 100644
--- a/internal/service/tag_common/tag_common.go
+++ b/internal/service/tag_common/tag_common.go
@@ -403,11 +403,11 @@ func (ts *TagCommonService) GetTagPage(ctx context.Context, page, pageSize int,
 }
 
 func (ts *TagCommonService) GetObjectEntityTag(ctx context.Context, objectId string) (objTags []*entity.Tag, err error) {
-	tagIDList := make([]string, 0)
 	tagList, err := ts.tagRelRepo.GetObjectTagRelList(ctx, objectId)
 	if err != nil {
 		return nil, err
 	}
+	tagIDList := make([]string, 0)
 	for _, tag := range tagList {
 		tagIDList = append(tagIDList, tag.TagID)
 	}

From 6736a711cb44818f8061ce91171ccc72a337c000 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 11 Mar 2024 19:27:30 +0800
Subject: [PATCH 046/114] feat(review): update review report request flag id

---
 docs/docs.go                                | 16 +++++++++++-----
 docs/swagger.json                           | 16 +++++++++++-----
 docs/swagger.yaml                           | 10 +++++++---
 internal/schema/report_schema.go            |  3 ++-
 internal/schema/simple_obj_info_schema.go   |  1 +
 internal/service/object_info/object_info.go |  3 +++
 internal/service/report/report_service.go   |  3 ++-
 plugin/reviewer.go                          | 14 +++++++++-----
 8 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 6f19753b..6f690389 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7822,6 +7822,9 @@ const docTemplate = `{
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
+                "answer_accepted": {
+                    "type": "boolean"
+                },
                 "answer_count": {
                     "type": "integer"
                 },
@@ -8878,8 +8881,8 @@ const docTemplate = `{
         "schema.ReviewReportReq": {
             "type": "object",
             "required": [
-                "operation_type",
-                "report_id"
+                "flag_id",
+                "operation_type"
             ],
             "properties": {
                 "close_msg": {
@@ -8893,6 +8896,9 @@ const docTemplate = `{
                     "maxLength": 65535,
                     "minLength": 6
                 },
+                "flag_id": {
+                    "type": "string"
+                },
                 "operation_type": {
                     "type": "string",
                     "enum": [
@@ -8903,9 +8909,6 @@ const docTemplate = `{
                         "ignore_report"
                     ]
                 },
-                "report_id": {
-                    "type": "string"
-                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -9639,6 +9642,9 @@ const docTemplate = `{
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_accepted": {
+                    "type": "boolean"
+                },
                 "answer_count": {
                     "type": "integer"
                 },
diff --git a/docs/swagger.json b/docs/swagger.json
index dab51960..d227bfef 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7810,6 +7810,9 @@
         "schema.GetReportListPageResp": {
             "type": "object",
             "properties": {
+                "answer_accepted": {
+                    "type": "boolean"
+                },
                 "answer_count": {
                     "type": "integer"
                 },
@@ -8866,8 +8869,8 @@
         "schema.ReviewReportReq": {
             "type": "object",
             "required": [
-                "operation_type",
-                "report_id"
+                "flag_id",
+                "operation_type"
             ],
             "properties": {
                 "close_msg": {
@@ -8881,6 +8884,9 @@
                     "maxLength": 65535,
                     "minLength": 6
                 },
+                "flag_id": {
+                    "type": "string"
+                },
                 "operation_type": {
                     "type": "string",
                     "enum": [
@@ -8891,9 +8897,6 @@
                         "ignore_report"
                     ]
                 },
-                "report_id": {
-                    "type": "string"
-                },
                 "tags": {
                     "type": "array",
                     "items": {
@@ -9627,6 +9630,9 @@
         "schema.UnreviewedRevisionInfoInfo": {
             "type": "object",
             "properties": {
+                "answer_accepted": {
+                    "type": "boolean"
+                },
                 "answer_count": {
                     "type": "integer"
                 },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5a8de316..d2e2c041 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -821,6 +821,8 @@ definitions:
     type: object
   schema.GetReportListPageResp:
     properties:
+      answer_accepted:
+        type: boolean
       answer_count:
         type: integer
       answer_id:
@@ -1558,6 +1560,8 @@ definitions:
         maxLength: 65535
         minLength: 6
         type: string
+      flag_id:
+        type: string
       operation_type:
         enum:
         - edit_post
@@ -1566,8 +1570,6 @@ definitions:
         - unlist_post
         - ignore_report
         type: string
-      report_id:
-        type: string
       tags:
         items:
           $ref: '#/definitions/schema.TagItem'
@@ -1577,8 +1579,8 @@ definitions:
         minLength: 6
         type: string
     required:
+    - flag_id
     - operation_type
-    - report_id
     type: object
   schema.RevisionAuditReq:
     properties:
@@ -2071,6 +2073,8 @@ definitions:
     type: object
   schema.UnreviewedRevisionInfoInfo:
     properties:
+      answer_accepted:
+        type: boolean
       answer_count:
         type: integer
       answer_id:
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index eadcde84..908e0451 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -81,6 +81,7 @@ type GetReportListPageResp struct {
 	Title            string        `json:"title"`
 	OriginalText     string        `json:"original_text"`
 	AnswerCount      int           `json:"answer_count"`
+	AnswerAccepted   bool          `json:"answer_accepted"`
 	Tags             []*TagResp    `json:"tags"`
 	ObjectStatus     int           `json:"object_status"`
 	ObjectShowStatus int           `json:"object_show_status"`
@@ -97,7 +98,7 @@ type GetUnreviewedReportPostPageReq struct {
 
 // ReviewReportReq review report request
 type ReviewReportReq struct {
-	ReportID      string     `validate:"required" json:"report_id"`
+	FlagID        string     `validate:"required" json:"flag_id"`
 	OperationType string     `validate:"required,oneof=edit_post close_post delete_post unlist_post ignore_report" json:"operation_type"`
 	CloseType     int        `validate:"omitempty" json:"close_type"`
 	CloseMsg      string     `validate:"omitempty" json:"close_msg"`
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index ffd5b97b..9dbf0d79 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -45,6 +45,7 @@ type UnreviewedRevisionInfoInfo struct {
 	Content             string     `json:"content"`
 	Html                string     `json:"html"`
 	AnswerCount         int        `json:"answer_count"`
+	AnswerAccepted      bool       `json:"answer_accepted"`
 	Tags                []*TagResp `json:"tags"`
 	Status              int        `json:"status"`
 	ShowStatus          int        `json:"show_status"`
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 9369c425..e20d24b7 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -30,6 +30,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/comment_common"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
+	"github.com/apache/incubator-answer/pkg/checker"
 	"github.com/apache/incubator-answer/pkg/obj"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/segmentfault/pacman/errors"
@@ -96,6 +97,7 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			Content:             questionInfo.OriginalText,
 			Html:                questionInfo.ParsedText,
 			AnswerCount:         questionInfo.AnswerCount,
+			AnswerAccepted:      !checker.IsNotZeroString(questionInfo.AcceptedAnswerID),
 			Tags:                tags,
 			Status:              questionInfo.Status,
 			ShowStatus:          questionInfo.Show,
@@ -130,6 +132,7 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			Content:             answerInfo.OriginalText,
 			Html:                answerInfo.ParsedText,
 			Status:              answerInfo.Status,
+			AnswerAccepted:      questionInfo.AcceptedAnswerID == answerInfo.ID,
 		}
 	case constant.TagObjectType:
 		tagInfo, exist, err := os.tagRepo.GetTagByID(ctx, objectID, true)
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 0d82aa77..b59e762f 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -135,6 +135,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 			Title:            info.Title,
 			OriginalText:     info.Content,
 			AnswerCount:      info.AnswerCount,
+			AnswerAccepted:   info.AnswerAccepted,
 			Tags:             info.Tags,
 			SubmitAt:         report.CreatedAt.Unix(),
 			ObjectStatus:     info.Status,
@@ -176,7 +177,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 
 // ReviewReport review report
 func (rs *ReportService) ReviewReport(ctx context.Context, req *schema.ReviewReportReq) (err error) {
-	report, exist, err := rs.reportRepo.GetByID(ctx, req.ReportID)
+	report, exist, err := rs.reportRepo.GetByID(ctx, req.FlagID)
 	if err != nil {
 		return err
 	}
diff --git a/plugin/reviewer.go b/plugin/reviewer.go
index b3dc8abb..f109b146 100644
--- a/plugin/reviewer.go
+++ b/plugin/reviewer.go
@@ -9,9 +9,12 @@ type Reviewer interface {
 type ReviewContent struct {
 	// The type of the content, e.g. question, answer
 	ObjectType string
-	Title      string
-	Content    string
-	Tags       []string
+	// The title of the content, only available for the question
+	Title string
+	// The content of the review, always available
+	Content string
+	// The tags of the content, only available for the question
+	Tags []string
 	// The author of the content
 	Author ReviewContentAuthor
 }
@@ -19,9 +22,10 @@ type ReviewContent struct {
 type ReviewContentAuthor struct {
 	// The user's reputation
 	Rank int
-	// The amount of questions and answers that the user has approved
+	// The amount of questions that has approved
 	ApprovedQuestionAmount int64
-	ApprovedAnswerAmount   int64
+	// The amount of answers that has approved
+	ApprovedAnswerAmount int64
 	// 1:User 2:Admin 3:Moderator
 	Role int
 }

From b2e8ce765bd5b8e38b268dc8d4825ec0a08ae2e8 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 12 Mar 2024 14:43:31 +0800
Subject: [PATCH 047/114] feat: add flag review content

---
 i18n/en_US.yaml                               |  21 +-
 i18n/zh_CN.yaml                               |   4 +-
 ui/src/common/constants.ts                    |   4 +-
 ui/src/common/interface.ts                    |  64 ++-
 ui/src/hooks/useReportModal/index.tsx         |  24 +-
 ui/src/pages/Admin/Answers/index.tsx          |  12 +-
 ui/src/pages/Admin/Questions/index.tsx        |   4 +-
 .../Ask/components/SearchQuestion/index.tsx   |   6 +-
 .../components/ApproveDropdown/index.tsx      | 177 ++++++-
 .../Review/components/EditPostModal/index.tsx | 434 +++++++++++++-----
 .../pages/Review/components/Filter/index.tsx  |  39 +-
 .../Review/components/FlagContent/index.tsx   | 286 +++++++++---
 .../components/SuggestEditContent/index.tsx   | 246 ++++++++++
 ui/src/pages/Review/components/index.ts       |   9 +-
 ui/src/pages/Review/index.tsx                 | 254 ++--------
 ui/src/router/pathFactory.ts                  |   2 +-
 ui/src/services/client/index.ts               |   1 +
 ui/src/services/client/review.ts              |  40 ++
 ui/src/services/client/revision.ts            |   6 -
 19 files changed, 1144 insertions(+), 489 deletions(-)
 create mode 100644 ui/src/pages/Review/components/SuggestEditContent/index.tsx
 create mode 100644 ui/src/services/client/review.ts

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 85e0b99e..e640b642 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1173,6 +1173,7 @@ ui:
     post_lowercase: post
     filter: Filter
     ignore: Ignore
+    submit: Submit
   search:
     title: Search Results
     keywords: Keywords
@@ -1678,8 +1679,8 @@ ui:
       page_title: Write
       restrict_answer:
         title: Restrict answer
-        label: Each user can only write one answer for each question
-        text: "They can use the edit link to refine and improve their existing answer, instead."
+        label: Each user can only write one answer for the same question
+        text: "Turn off to allow users to write multiple answers to the same question, which may cause answers to be unfocused."
       recommend_tags:
         label: Recommend tags
         text: "Please input tag slug above, one tag per line."
@@ -1814,16 +1815,16 @@ ui:
     edit_tag: Edit tag
     empty: No review tasks left.
     approve_this_type: Do you approve this {{ type }}?
-    suggest_type_edit: Suggest {{ type }} edit
-    flag_type: Flag {{ type }}
+    suggest_edits: Suggested edits
+    flag_post: Flag post
+    flag_user: Flag user
     filter_label: Type
-    queued_post: Queued post
-    queued_user: Queued user
-    flagged_post: Flagged post
-    flagged_user: Flagged user
-    suggested_post_edit: Suggested post edit
-    suggested_tag_edit: Suggested tag edit
     reputation: reputation
+    flag_post_type: Flagged this post as {{ type }}
+    flag_user_type: Flagged this user as {{ type }}
+    edit_post: Edit post
+    list_post: List post
+    unlist_post: Unlist post
   timeline:
     undeleted: undeleted
     deleted: deleted
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index f204860a..1151de96 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1628,8 +1628,8 @@ ui:
       page_title: 编辑
       restrict_answer:
         title: 限制一个回答
-        label: 每个用户对于每个问题只能有一个回答
-        text: "用户可以使用编辑按钮优化已有的回答"
+        label: 每个用户只能为同一问题写一个回答
+        text: "关闭以允许用户对同一问题编写多个回答，这可能会导致回答不集中。"
       recommend_tags:
         label: 推荐标签
         text: "请在上方输入标签固定链接，每行一个标签。"
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 8868c9a0..d11dc7f8 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -66,9 +66,9 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
-  unlisted: {
+  unlist: {
     variant: 'text-bg-secondary',
-    name: 'unlisted',
+    name: 'unlist',
   },
 };
 
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 9c0b777d..847c4fb7 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -562,7 +562,7 @@ export interface TimelineRes {
   timeline: TimelineItem[];
 }
 
-export interface ReviewItem {
+export interface SuggestReviewItem {
   type: 'question' | 'answer' | 'tag';
   info: {
     url_title?: string;
@@ -584,9 +584,43 @@ export interface ReviewItem {
     content: Tag | QuestionDetailRes | AnswerItem;
   };
 }
-export interface ReviewResp {
+export interface SuggestReviewResp {
   count: number;
-  list: ReviewItem[];
+  list: SuggestReviewItem[];
+}
+
+export interface ReasonItem {
+  content_type: string;
+  description: string;
+  name: string;
+  placeholder: string;
+  reason_type: number;
+}
+
+export interface FlagReviewItem {
+  object_type: 'question' | 'answer' | 'comment' | 'user';
+  object_id: string;
+  object_show_status: number;
+  object_status: number;
+  tags: Tag[];
+  title: string;
+  original_text: string;
+  reason: ReasonItem;
+  author_user_info: UserInfoBase;
+  submitter_user: UserInfoBase;
+  created_at: number;
+  submit_at: number;
+  comment_id: string;
+  question_id: string;
+  answer_id: string;
+  answer_count: number;
+  answer_accepted?: boolean;
+  flag_id: string;
+}
+
+export interface FlagReviewResp {
+  count: number;
+  list: FlagReviewItem[];
 }
 
 export interface UserRoleItem {
@@ -638,3 +672,27 @@ export interface UserPluginsConfigRes {
   name: string;
   slug_name: string;
 }
+
+export interface ReviewTypeItem {
+  label: string;
+  name: string;
+  todo_amount: number;
+}
+
+export interface PutFlagReviewParams {
+  operation_type:
+    | 'edit_post'
+    | 'close_post'
+    | 'delete_post'
+    | 'unlist_post'
+    | 'ignore_report';
+  flag_id: string;
+  close_msg?: string;
+  close_type?: number;
+  title?: string;
+  content?: string;
+  tags?: Tag[];
+  // mention_username_list?: any;
+  captcha_code?: any;
+  captcha_id?: any;
+}
diff --git a/ui/src/hooks/useReportModal/index.tsx b/ui/src/hooks/useReportModal/index.tsx
index 9ad66513..24d26b02 100644
--- a/ui/src/hooks/useReportModal/index.tsx
+++ b/ui/src/hooks/useReportModal/index.tsx
@@ -25,14 +25,20 @@ import ReactDOM from 'react-dom/client';
 
 import { useToast, useCaptchaModal } from '@/hooks';
 import type * as Type from '@/common/interface';
-import { reportList, postReport, closeQuestion, putReport } from '@/services';
+import {
+  reportList,
+  postReport,
+  closeQuestion,
+  putReport,
+  putFlagReviewAction,
+} from '@/services';
 
 interface Params {
   isBackend?: boolean;
   type: Type.ReportType;
   id: string;
   title?: string;
-  action: Type.ReportAction;
+  action: Type.ReportAction | 'flag_review_close';
 }
 
 const useReportModal = (callback?: () => void) => {
@@ -63,6 +69,7 @@ const useReportModal = (callback?: () => void) => {
     rootRef.current.root = ReactDOM.createRoot(div);
   }, []);
   const getList = ({ type, action, isBackend }: Params) => {
+    // @ts-ignore
     reportList({ type, action, isBackend }).then((res) => {
       setList(res);
       setShow(true);
@@ -123,6 +130,19 @@ const useReportModal = (callback?: () => void) => {
       });
       return;
     }
+
+    if (params.type === 'question' && params.action === 'flag_review_close') {
+      putFlagReviewAction({
+        flag_id: params.id,
+        operation_type: 'close_post',
+        close_type: reportType.type,
+        close_msg: content.value,
+      }).then(() => {
+        onClose();
+        asyncCallback();
+      });
+      return;
+    }
     if (!params.isBackend && params.action === 'flag') {
       rCaptcha.check(() => {
         const flagReq = {
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index 869bec9a..febc8e81 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -118,13 +118,13 @@ const Answers: FC = () => {
                         className="text-break text-wrap"
                         rel="noreferrer">
                         {li.question_info.title}
+                        {li.accepted === 2 && (
+                          <Icon
+                            name="check-circle-fill"
+                            className="ms-2 text-success"
+                          />
+                        )}
                       </a>
-                      {li.accepted === 2 && (
-                        <Icon
-                          name="check-circle-fill"
-                          className="ms-2 text-success"
-                        />
-                      )}
                     </Stack>
                     <div
                       className="text-truncate-2 small"
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 27565fa6..7a7b7be9 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -153,9 +153,9 @@ const Questions: FC = () => {
                     <span
                       className={classNames(
                         'badge',
-                        ADMIN_LIST_STATUS.unlisted.variant,
+                        ADMIN_LIST_STATUS.unlist.variant,
                       )}>
-                      {t(ADMIN_LIST_STATUS.unlisted.name)}
+                      {t(ADMIN_LIST_STATUS.unlist.name)}
                     </span>
                   )}
                 </td>
diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
index bda9112a..2f79305b 100644
--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
@@ -46,7 +46,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                 <ListGroup.Item
                   action
                   as="a"
-                  className="link-dark text-wrap text-break"
+                  className="link-dark text-wrap text-break grid gap-0 row-gap-3"
                   key={item.id}
                   href={pathFactory.questionLanding(item.id, item.url_title)}
                   target="_blank">
@@ -56,7 +56,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     : null}
 
                   {item.accepted_answer ? (
-                    <span className="small ms-3 text-success">
+                    <span className="small ms-3 text-success d-inline-block">
                       <Icon type="bi" name="check-circle-fill" />
                       <span className="ms-1">
                         {t('x_answers', {
@@ -67,7 +67,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     </span>
                   ) : (
                     item.answer_count > 0 && (
-                      <span className="small ms-3 text-secondary">
+                      <span className="small ms-3 text-secondary d-inline-block">
                         <Icon type="bi" name="chat-square-text-fill" />
                         <span className="ms-1">
                           {t('x_answers', {
diff --git a/ui/src/pages/Review/components/ApproveDropdown/index.tsx b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
index 7f0e6bd7..d26b10f6 100644
--- a/ui/src/pages/Review/components/ApproveDropdown/index.tsx
+++ b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
@@ -1,34 +1,199 @@
-import { useState } from 'react';
+import { FC, useState } from 'react';
 import { Dropdown, Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
 
+import { Modal } from '@/components';
+import { putFlagReviewAction } from '@/services';
+import { useCaptchaModal, useReportModal, useToast } from '@/hooks';
+import type * as Type from '@/common/interface';
 import EditPostModal from '../EditPostModal';
 
-const Index = () => {
+interface IProps {
+  itemData: Type.FlagReviewItem | null;
+  curFilter: string;
+  objectType: Type.FlagReviewItem['object_type'] | '';
+  approveCallback: () => void;
+}
+
+const Index: FC<IProps> = ({
+  itemData,
+  objectType,
+  curFilter,
+  approveCallback,
+}) => {
+  console.log(objectType);
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+
+  const [isLoading, setIsLoading] = useState(false);
   const [showEditPostModal, setShowEditPostModal] = useState(false);
+  const closeModal = useReportModal(approveCallback);
+  const toast = useToast();
+  const dCaptcha = useCaptchaModal('delete');
 
   const handleEditPostModalState = () => {
     setShowEditPostModal(!showEditPostModal);
   };
 
+  const handleDelete = () => {
+    let content = '';
+
+    setIsLoading(true);
+
+    if (objectType === 'question') {
+      content =
+        Number(itemData?.answer_count) > 0
+          ? t('question', { keyPrefix: 'delete' })
+          : t('other', { keyPrefix: 'delete' });
+    }
+    if (objectType === 'answer') {
+      content = itemData?.answer_accepted
+        ? t('answer_accepted', { keyPrefix: 'delete' })
+        : t('other', { keyPrefix: 'delete' });
+    }
+    if (objectType === 'comment') {
+      content = t('other', { keyPrefix: 'delete' });
+    }
+    Modal.confirm({
+      title: t('title', { keyPrefix: 'delete' }),
+      content,
+      cancelBtnVariant: 'link',
+      confirmBtnVariant: 'danger',
+      confirmText: t('delete', { keyPrefix: 'btns' }),
+      onConfirm: () => {
+        dCaptcha.check(() => {
+          const req: Type.PutFlagReviewParams = {
+            operation_type: 'delete_post',
+            flag_id: String(itemData?.flag_id),
+            captcha_code: undefined,
+            captcha_id: undefined,
+          };
+          dCaptcha.resolveCaptchaReq(req);
+
+          delete req.captcha_code;
+          delete req.captcha_id;
+
+          putFlagReviewAction(req)
+            .then(async () => {
+              await dCaptcha.close();
+              let msg = '';
+              if (objectType === 'question') {
+                msg = t('post_deleted', { keyPrefix: 'messages' });
+              }
+              if (objectType === 'answer') {
+                msg = t('tip_answer_deleted');
+              }
+              if (objectType === 'answer' || objectType === 'question') {
+                toast.onShow({
+                  msg,
+                  variant: 'success',
+                });
+              }
+              approveCallback();
+            })
+            .catch((ex) => {
+              if (ex.isError) {
+                dCaptcha.handleCaptchaError(ex.list);
+              }
+            })
+            .finally(() => {
+              setIsLoading(false);
+            });
+        });
+      },
+    });
+  };
+
+  const handleAction = (type) => {
+    if (type === 'delete') {
+      handleDelete();
+    }
+
+    if (type === 'close') {
+      closeModal.onShow({
+        type: 'question',
+        id: itemData?.flag_id || '',
+        action: 'flag_review_close',
+      });
+    }
+
+    if (type === 'unlist') {
+      const keyPrefix = 'question_detail.unlist';
+      Modal.confirm({
+        title: t('title', { keyPrefix }),
+        content: t('content', { keyPrefix }),
+        cancelBtnVariant: 'link',
+        confirmText: t('confirm_btn', { keyPrefix }),
+        onConfirm: () => {
+          putFlagReviewAction({
+            operation_type: 'unlist_post',
+            flag_id: itemData?.flag_id || '',
+          }).then(() => {
+            toast.onShow({
+              msg: t(`post_${type}`, { keyPrefix: 'messages' }),
+              variant: 'success',
+            });
+            approveCallback();
+          });
+        },
+      });
+    }
+  };
+
+  const handleActionEdit = () => {
+    handleEditPostModalState();
+  };
+
   return (
     <div>
       <Dropdown>
         <Dropdown.Toggle
           as={Button}
+          disabled={isLoading}
           variant="outline-primary"
           id="dropdown-basic">
-          Approve
+          {t('approve', { keyPrefix: 'btns' })}
         </Dropdown.Toggle>
 
         <Dropdown.Menu>
-          <Dropdown.Item href="#/action-1">Deactivate user</Dropdown.Item>
-          <Dropdown.Item href="#/action-2">Suspend user</Dropdown.Item>
-          <Dropdown.Item href="#/action-3">Delete user</Dropdown.Item>
+          <Dropdown.Item onClick={() => handleActionEdit()}>
+            {t('edit_post')}
+          </Dropdown.Item>
+          {curFilter === 'normal' && objectType === 'question' && (
+            <Dropdown.Item onClick={() => handleAction('close')}>
+              {t('close', { keyPrefix: 'btns' })}
+            </Dropdown.Item>
+          )}
+          {curFilter !== 'deleted' && (
+            <Dropdown.Item onClick={() => handleAction('delete')}>
+              {t('delete', { keyPrefix: 'btns' })}
+            </Dropdown.Item>
+          )}
+          {objectType === 'question' && (
+            <>
+              <Dropdown.Divider />
+              {itemData?.object_show_status !== 2 && (
+                <Dropdown.Item onClick={() => handleAction('unlist')}>
+                  {t('unlist_post')}
+                </Dropdown.Item>
+              )}
+            </>
+          )}
         </Dropdown.Menu>
       </Dropdown>
       <EditPostModal
         visible={showEditPostModal}
         handleClose={handleEditPostModalState}
+        objectType={objectType}
+        originalData={{
+          flag_id: itemData?.flag_id || '',
+          id: itemData?.object_id || '',
+          title: itemData?.title || '',
+          content: itemData?.original_text || '',
+          tags: itemData?.tags || [],
+          question_id: itemData?.question_id || '',
+          answer_id: itemData?.answer_id || '',
+        }}
+        callback={approveCallback}
       />
     </div>
   );
diff --git a/ui/src/pages/Review/components/EditPostModal/index.tsx b/ui/src/pages/Review/components/EditPostModal/index.tsx
index a07a70cf..e35a82ca 100644
--- a/ui/src/pages/Review/components/EditPostModal/index.tsx
+++ b/ui/src/pages/Review/components/EditPostModal/index.tsx
@@ -1,20 +1,36 @@
-import { FC, useState } from 'react';
+import { FC, useState, useEffect } from 'react';
 import { Modal, Button, Form } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import classNames from 'classnames';
 
-import { modifyQuestion } from '@/services';
-import { useCaptchaModal } from '@/hooks';
-import { Editor, TagSelector } from '@/components';
-import { handleFormError } from '@/utils';
+import { putFlagReviewAction } from '@/services';
+import { useCaptchaModal, usePageUsers } from '@/hooks';
+import { Editor, TagSelector, Mentions, TextArea } from '@/components';
+import {
+  // matchedUsers,
+  parseUserInfo,
+  handleFormError,
+  parseEditMentionUser,
+} from '@/utils';
 import type * as Type from '@/common/interface';
 
 import './index.scss';
 
 interface Props {
+  originalData: {
+    id: string;
+    flag_id: string;
+    question_id?: string;
+    answer_id?: string;
+    title: string;
+    content: string;
+    tags: Type.Tag[];
+  };
+  objectType: Type.FlagReviewItem['object_type'] | '';
   visible: boolean;
   handleClose: () => void;
+  callback?: () => void;
 }
 
 interface FormDataItem {
@@ -23,65 +39,151 @@ interface FormDataItem {
   content: Type.FormValue<string>;
 }
 
-const Index: FC<Props> = ({ visible = false, handleClose }) => {
-  const initFormData = {
-    title: {
-      value: '',
-      isInvalid: false,
-      errorMsg: '',
-    },
-    tags: {
-      value: [],
-      isInvalid: false,
-      errorMsg: '',
-    },
-    content: {
-      value: '',
-      isInvalid: false,
-      errorMsg: '',
-    },
-  };
+const initFormData = {
+  title: {
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  },
+  tags: {
+    value: [],
+    isInvalid: false,
+    errorMsg: '',
+  },
+  content: {
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  },
+};
+
+const Index: FC<Props> = ({
+  originalData,
+  visible = false,
+  objectType,
+  handleClose,
+  callback,
+}) => {
   const { t } = useTranslation('translation', { keyPrefix: 'ask' });
   const [formData, setFormData] = useState<FormDataItem>(initFormData);
   const [focusEditor, setFocusEditor] = useState(false);
+  const [loaded, setLoaded] = useState(false);
+  const pageUsers = usePageUsers();
 
   const editCaptcha = useCaptchaModal('edit');
 
+  const onClose = (bol) => {
+    if (bol) {
+      callback?.();
+    }
+    handleClose();
+    setLoaded(false);
+  };
+
   const handleInput = (data: Partial<FormDataItem>) => {
+    if (!loaded) {
+      return;
+    }
     setFormData({
       ...formData,
       ...data,
     });
   };
 
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+  const checkValidated = (): boolean => {
+    let bol = true;
+    const { title, tags, content } = formData;
+    if (objectType === 'question') {
+      if (!title.value) {
+        bol = false;
+        formData.title = {
+          value: title.value,
+          isInvalid: true,
+          errorMsg: t('form.fields.title.msg.empty', {
+            keyPrefix: 'ask',
+          }),
+        };
+      }
+
+      if (!tags.value.length) {
+        bol = false;
+        formData.tags = {
+          value: tags.value,
+          isInvalid: true,
+          errorMsg: t('form.fields.tags.msg.empty', {
+            keyPrefix: 'ask',
+          }),
+        };
+      }
+    }
+
+    if (!content.value || Array.from(content.value.trim()).length < 6) {
+      bol = false;
+      formData.content = {
+        value: content.value,
+        isInvalid: true,
+        errorMsg: t('form.fields.answer.feedback.characters', {
+          keyPrefix: 'edit_answer',
+        }),
+      };
+    } else {
+      formData.content = {
+        value: content.value,
+        isInvalid: false,
+        errorMsg: '',
+      };
+    }
+
+    setFormData({
+      ...formData,
+    });
+    return bol;
+  };
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
     event.stopPropagation();
 
-    const params: Type.QuestionParams = {
+    if (!checkValidated()) {
+      return;
+    }
+
+    const params: Type.PutFlagReviewParams = {
       title: formData.title.value,
       content: formData.content.value,
       tags: formData.tags.value,
+      operation_type: 'edit_post',
+      flag_id: originalData.flag_id,
     };
+    if (objectType === 'answer') {
+      delete params.title;
+      delete params.tags;
+    }
+    if (objectType === 'comment') {
+      const { value } = formData.content;
+      // const users = matchedUsers(value);
+      // const userNames = unionBy(users.map((user) => user.userName));
+      const commentMarkDown = parseUserInfo(value);
+
+      // params.mention_username_list = userNames;
+      params.content = commentMarkDown;
+
+      delete params.title;
+      delete params.tags;
+    }
 
     editCaptcha.check(() => {
-      const ep = {
-        ...params,
-        id: '',
-        edit_summary: '',
-      };
-      const imgCode = editCaptcha.getCaptcha();
-      if (imgCode.verify) {
-        ep.captcha_code = imgCode.captcha_code;
-        ep.captcha_id = imgCode.captcha_id;
+      if (objectType === 'question') {
+        const imgCode = editCaptcha.getCaptcha();
+        if (imgCode.verify) {
+          params.captcha_code = imgCode.captcha_code;
+          params.captcha_id = imgCode.captcha_id;
+        }
       }
-      modifyQuestion(ep)
-        .then(async (res) => {
+      putFlagReviewAction(params)
+        .then(async () => {
           await editCaptcha.close();
-          console.log('res', res);
-          // navigate(pathFactory.questionLanding(qid, res?.url_title), {
-          //   state: { isReview: res?.wait_for_review },
-          // });
+          onClose(true);
         })
         .catch((err) => {
           if (err.isError) {
@@ -92,102 +194,180 @@ const Index: FC<Props> = ({ visible = false, handleClose }) => {
         });
     });
   };
+
+  const handleSelected = (val) => {
+    if (!loaded) {
+      return;
+    }
+    setFormData({
+      ...formData,
+      content: {
+        value: val,
+        errorMsg: '',
+        isInvalid: false,
+      },
+    });
+  };
+
+  useEffect(() => {
+    if (!visible) {
+      return;
+    }
+
+    formData.title.value = originalData.title;
+    formData.content.value = originalData.content;
+    formData.tags.value = originalData.tags.map((item) => {
+      return {
+        ...item,
+        parsed_text: '',
+        original_text: '',
+      };
+    });
+    setFormData({ ...formData });
+    setLoaded(true);
+  }, [visible]);
+
   return (
     <Modal
       show={visible}
-      onHide={handleClose}
+      onHide={() => onClose(false)}
       className="w-100"
       dialogClassName="edit-post-modal">
       <Modal.Header closeButton>
-        <Modal.Title>Edit post</Modal.Title>
+        <Modal.Title>
+          {t('edit_post', { keyPrefix: 'page_review' })}
+        </Modal.Title>
       </Modal.Header>
-      <Modal.Body>
-        <Form noValidate onSubmit={handleSubmit}>
-          <Form.Group controlId="title" className="mb-3">
-            <Form.Label>{t('form.fields.title.label')}</Form.Label>
-            <Form.Control
-              type="text"
-              value={formData.title.value}
-              isInvalid={formData.title.isInvalid}
-              onChange={(e) => {
-                handleInput({
-                  title: {
-                    value: e.target.value,
-                    isInvalid: false,
-                    errorMsg: '',
-                  },
-                });
-              }}
-              placeholder={t('form.fields.title.placeholder')}
-              autoFocus
-              contentEditable
-            />
+      <Form noValidate onSubmit={handleSubmit}>
+        <Modal.Body>
+          {objectType === 'question' && (
+            <Form.Group controlId="title" className="mb-3">
+              <Form.Label>{t('form.fields.title.label')}</Form.Label>
+              <Form.Control
+                type="text"
+                value={formData.title.value}
+                isInvalid={formData.title.isInvalid}
+                onChange={(e) => {
+                  handleInput({
+                    title: {
+                      value: e.target.value,
+                      isInvalid: false,
+                      errorMsg: '',
+                    },
+                  });
+                }}
+                placeholder={t('form.fields.title.placeholder')}
+                autoFocus
+                contentEditable
+              />
 
-            <Form.Control.Feedback type="invalid">
-              {formData.title.errorMsg}
-            </Form.Control.Feedback>
-          </Form.Group>
+              <Form.Control.Feedback type="invalid">
+                {formData.title.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
 
-          <Form.Group controlId="body">
-            <Form.Label>{t('form.fields.body.label')}</Form.Label>
-            <Form.Control
-              defaultValue={formData.content.value}
-              isInvalid={formData.content.isInvalid}
-              hidden
-            />
-            <Editor
-              value={formData.content.value}
-              onChange={(value) => {
-                handleInput({
-                  content: { value, errorMsg: '', isInvalid: false },
-                });
-              }}
-              className={classNames(
-                'form-control p-0',
-                focusEditor ? 'focus' : '',
-              )}
-              onFocus={() => {
-                setFocusEditor(true);
-              }}
-              onBlur={() => {
-                setFocusEditor(false);
-              }}
-            />
-            <Form.Control.Feedback type="invalid">
-              {formData.content.errorMsg}
-            </Form.Control.Feedback>
-          </Form.Group>
-          <Form.Group controlId="tags" className="my-3">
-            <Form.Label>{t('form.fields.tags.label')}</Form.Label>
-            <Form.Control
-              defaultValue={JSON.stringify(formData.tags.value)}
-              isInvalid={formData.tags.isInvalid}
-              hidden
-            />
-            <TagSelector
-              value={formData.tags.value}
-              onChange={(value) => {
-                handleInput({
-                  tags: { value, errorMsg: '', isInvalid: false },
-                });
-              }}
-              showRequiredTag
-              maxTagLength={5}
-            />
-            <Form.Control.Feedback type="invalid">
-              {formData.tags.errorMsg}
-            </Form.Control.Feedback>
-          </Form.Group>
-        </Form>
-      </Modal.Body>
-      <Modal.Footer>
-        <Button variant="secondary" onClick={handleClose}>
-          {t('close', { keyPrefix: 'btns' })}
-        </Button>
-        <Button variant="primary" onClick={handleClose}>
-          {t('submit', { keyPrefix: 'btns' })}
-        </Button>
-      </Modal.Footer>
+          {objectType !== 'comment' && (
+            <Form.Group controlId="body">
+              <Form.Label>
+                {objectType === 'question'
+                  ? t('form.fields.body.label')
+                  : t('form.fields.answer.label')}
+              </Form.Label>
+              <Form.Control
+                defaultValue={formData.content.value}
+                isInvalid={formData.content.isInvalid}
+                hidden
+              />
+              <Editor
+                value={formData.content.value}
+                onChange={(value) => {
+                  handleInput({
+                    content: { value, errorMsg: '', isInvalid: false },
+                  });
+                }}
+                className={classNames(
+                  'form-control p-0',
+                  focusEditor ? 'focus' : '',
+                )}
+                onFocus={() => {
+                  setFocusEditor(true);
+                }}
+                onBlur={() => {
+                  setFocusEditor(false);
+                }}
+              />
+              <Form.Control.Feedback type="invalid">
+                {formData.content.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
+
+          {objectType === 'question' && (
+            <Form.Group controlId="tags" className="my-3">
+              <Form.Label>{t('form.fields.tags.label')}</Form.Label>
+              <Form.Control
+                defaultValue={JSON.stringify(formData.tags.value)}
+                isInvalid={formData.tags.isInvalid}
+                hidden
+              />
+              <TagSelector
+                value={formData.tags.value}
+                onChange={(value) => {
+                  handleInput({
+                    tags: { value, errorMsg: '', isInvalid: false },
+                  });
+                }}
+                showRequiredTag
+                maxTagLength={5}
+              />
+              <Form.Control.Feedback type="invalid">
+                {formData.tags.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
+
+          {objectType === 'comment' && (
+            <div className="w-100">
+              <div
+                className={classNames('custom-form-control', {
+                  'is-invalid': formData.content.isInvalid,
+                })}>
+                <Form.Label>Comment</Form.Label>
+                <Mentions
+                  pageUsers={pageUsers.getUsers()}
+                  onSelected={handleSelected}>
+                  <TextArea
+                    size="sm"
+                    rows={4}
+                    value={parseEditMentionUser(formData.content.value)}
+                    onChange={(e) => {
+                      handleInput({
+                        content: {
+                          value: e.target.value,
+                          errorMsg: '',
+                          isInvalid: false,
+                        },
+                      });
+                    }}
+                  />
+                </Mentions>
+              </div>
+              <Form.Control.Feedback type="invalid">
+                {formData.content.errorMsg}
+              </Form.Control.Feedback>
+            </div>
+          )}
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={() => onClose(false)}>
+            {t('close', { keyPrefix: 'btns' })}
+          </Button>
+          <Button variant="primary" type="submit">
+            {t('submit', { keyPrefix: 'btns' })}
+          </Button>
+        </Modal.Footer>
+      </Form>
     </Modal>
   );
 };
diff --git a/ui/src/pages/Review/components/Filter/index.tsx b/ui/src/pages/Review/components/Filter/index.tsx
index 2eccf86a..16a392e2 100644
--- a/ui/src/pages/Review/components/Filter/index.tsx
+++ b/ui/src/pages/Review/components/Filter/index.tsx
@@ -1,29 +1,36 @@
-import { useState } from 'react';
+import { FC } from 'react';
 import { Card, Form } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
-const Index = () => {
+import * as Type from '@/common/interface';
+
+interface IProps {
+  list: Type.ReviewTypeItem[] | undefined;
+  checked: string;
+  callback: (type: string) => void;
+}
+
+const Index: FC<IProps> = ({ list, checked, callback }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
-  const [checked, setValue] = useState(false);
   return (
     <Card>
       <Card.Header>{t('filter', { keyPrefix: 'btns' })}</Card.Header>
       <Card.Body>
         <Form.Group>
           <Form.Label>{t('filter_label')}</Form.Label>
-          <Form.Check
-            type="radio"
-            label="Queued post (99+)"
-            checked={checked}
-            onChange={(e) => setValue(e.target.checked)}
-          />
-
-          <Form.Check
-            type="radio"
-            label="Queued post (199+)"
-            checked={checked}
-            onChange={(e) => setValue(e.target.checked)}
-          />
+          {list?.map((item) => {
+            return (
+              <Form.Check
+                key={item.name}
+                type="radio"
+                id={item.name}
+                disabled={item.todo_amount <= 0}
+                label={`${item.label} (${item.todo_amount})`}
+                checked={checked === item.name}
+                onChange={() => callback(item.name)}
+              />
+            );
+          })}
         </Form.Group>
       </Card.Body>
     </Card>
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index fdead753..526e273b 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -1,101 +1,235 @@
-import { FC } from 'react';
-import { Card, Badge } from 'react-bootstrap';
+import { FC, useEffect, useState } from 'react';
+import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
-import { BaseUserCard, Tag, FormatTime, Avatar } from '@/components';
+import classNames from 'classnames';
 
-const tag = [
-  {
-    display_name: 'bug',
-    slug_name: 'bug',
-    original_text: '111',
-    recommend: true,
-  },
-  {
-    display_name: 'react',
-    slug_name: 'react',
-    original_text: '222',
-    reserved: true,
-  },
-  {
-    display_name: 'test',
-    slug_name: 'test',
-    original_text: '111',
-    recommend: false,
-    reserved: false,
-  },
-];
+import { getFlagReviewPostList, putFlagReviewAction } from '@/services';
+import { BaseUserCard, Tag, FormatTime } from '@/components';
+import { pathFactory } from '@/router/pathFactory';
+import { scrollToDocTop } from '@/utils';
+import type * as Type from '@/common/interface';
+import { ADMIN_LIST_STATUS } from '@/common/constants';
+import ApproveDropdown from '../ApproveDropdown';
 
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
-  const objectType = 'question';
+  const [noTasks, setNoTasks] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [page, setPage] = useState(1);
+  const [reviewResp, setReviewResp] = useState<Type.FlagReviewResp>();
+  const flagItemData = reviewResp?.list[0] as Type.FlagReviewItem;
+
+  console.log('reviewResp', reviewResp);
+
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+
+  const queryNextOne = (pageNumber) => {
+    getFlagReviewPostList(pageNumber)
+      .then((resp) => {
+        resolveNextOne(resp, pageNumber);
+      })
+      .catch((ex) => {
+        console.error('review next error: ', ex);
+      });
+  };
+
+  useEffect(() => {
+    queryNextOne(page);
+  }, []);
+
+  const handlingApprove = () => {
+    if (!flagItemData) {
+      return;
+    }
+    queryNextOne(page);
+  };
+
+  const handleIgnore = () => {
+    setIsLoading(true);
+    putFlagReviewAction({
+      operation_type: 'ignore_report',
+      flag_id: String(flagItemData?.flag_id),
+    })
+      .then(() => {
+        queryNextOne(page + 1);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const {
+    object_type,
+    submitter_user,
+    author_user_info,
+    object_status,
+    reason,
+  } = flagItemData || {
+    object_type: '',
+    submitter_user: null,
+    author_user_info: null,
+    reason: null,
+    object_status: 0,
+  };
+  let itemLink = '';
+  let itemId = '';
+  let itemTimePrefix = '';
+
+  if (object_type === 'question') {
+    itemLink = pathFactory.questionLanding(
+      String(flagItemData?.question_id),
+      flagItemData?.title,
+    );
+    itemId = String(flagItemData?.question_id);
+    itemTimePrefix = 'asked';
+  } else if (object_type === 'answer') {
+    itemLink = pathFactory.answerLanding({
+      // @ts-ignore
+      questionId: flagItemData?.question_id,
+      slugTitle: flagItemData?.title,
+      answerId: String(flagItemData?.object_id),
+    });
+    itemId = String(flagItemData?.object_id);
+    itemTimePrefix = 'answered';
+  } else if (object_type === 'comment') {
+    if (flagItemData?.question_id && flagItemData?.answer_id) {
+      itemLink = `${pathFactory.answerLanding({
+        questionId: flagItemData?.question_id,
+        answerId: flagItemData?.answer_id,
+      })}?commentId=${flagItemData?.comment_id}`;
+    } else {
+      itemLink = `${pathFactory.questionLanding(
+        String(flagItemData?.question_id),
+        flagItemData?.title,
+      )}?commentId=${flagItemData?.comment_id}`;
+    }
+    itemId = String(flagItemData?.comment_id);
+    itemTimePrefix = 'commented';
+  }
+
+  if (noTasks) return null;
   return (
     <Card>
-      <Card.Header>{t('flag_type', { type: 'post' })}</Card.Header>
+      <Card.Header>
+        {object_type !== 'user' ? t('flag_post') : t('flag_user')}
+      </Card.Header>
       <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <BaseUserCard data={submitter_user} avatarSize="24" />
+            {flagItemData?.submit_at && (
+              <FormatTime
+                time={flagItemData.submit_at}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">
+              {object_type !== 'user'
+                ? t('flag_post_type', { type: reason?.name })
+                : t('flag_user_type', { type: reason?.name })}
+            </p>
+          </Stack>
+        </Alert>
         <div className="p-3">
-          <h5 className="mb-3">
-            How do I test weather variable against multiple
-          </h5>
-          {objectType === 'question' && (
-            <div className="mb-4">
-              {tag?.map((item) => {
-                return (
-                  <Tag key={item.slug_name} className="me-1" data={item} />
-                );
-              })}
-            </div>
+          <small className="d-block text-secondary mb-4">
+            <span>{t(object_type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+          {object_type === 'question' && (
+            <>
+              <h5 className="mb-3">{flagItemData?.title}</h5>
+              <div className="mb-4">
+                {flagItemData?.tags?.map((item) => {
+                  return (
+                    <Tag key={item.slug_name} className="me-1" data={item} />
+                  );
+                })}
+              </div>
+            </>
           )}
           <div className="small font-monospace">
-            Python is a multi-paradigm, dynamically typed, multi-purpose
-            programming language. It is designed to be quick to learn,
-            understand, and use, and enforces a clean and uniform syntax. Please
-            note that Python 2 is officially out of support as of 2020-01-01.
-            For version-specific Python questions, add the [python-2.7] or
-            [python-3.x] tag. When using a Python variant library (e.g. Pandas,
-            NumPy), please include it in the tags.
+            {flagItemData?.original_text}
           </div>
-          <div className="d-flex align-items-center justify-content-between mt-4">
-            <Badge bg="success">normal</Badge>
+          <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
+            <div>
+              <span
+                className={classNames(
+                  'badge',
+                  ADMIN_LIST_STATUS[object_status]?.variant,
+                )}>
+                {t(ADMIN_LIST_STATUS[object_status]?.name, {
+                  keyPrefix: 'admin.questions',
+                })}
+              </span>
+              {flagItemData?.object_show_status === 2 && (
+                <span
+                  className={classNames(
+                    'ms-1 badge',
+                    ADMIN_LIST_STATUS.unlist.variant,
+                  )}>
+                  {t(ADMIN_LIST_STATUS.unlist.name, { keyPrefix: 'btns' })}
+                </span>
+              )}
+            </div>
             <div className="d-flex align-items-center small">
-              <BaseUserCard
-                data={{
-                  username: 'username',
-                  display_name: 'username',
-                  avatar: '',
-                  reputation: 100,
-                }}
-                avatarSize="24"
-              />
+              <BaseUserCard data={author_user_info} avatarSize="24" />
               <FormatTime
-                time={1688107033}
+                time={Number(flagItemData?.created_at)}
                 className="text-secondary ms-1 flex-shrink-0"
-                preFix="answered"
+                preFix={t(itemTimePrefix, { keyPrefix: 'question_detail' })}
               />
             </div>
           </div>
         </div>
-
-        <div className="p-3 d-flex">
-          <Avatar
-            avatar=""
-            size="40"
-            searchStr="s=48"
-            alt=""
-            className="me-2"
-          />
-          <div className="small">
-            <Link to="/test">
-              111 <span className="text-secondary">@111</span>
-            </Link>
-            <div className="mt-1">
-              I'm a web developer with in-depth experience in UI/UX design.
-            </div>
-            <div className="text-secondary mt-1">280 {t('reputation')}</div>
-          </div>
-        </div>
       </Card.Body>
+
+      <Card.Footer className="p-3">
+        <p>{t('approve_this_type', { type: 'revision' })}</p>
+        <Stack direction="horizontal" gap={2}>
+          <ApproveDropdown
+            objectType={object_type}
+            itemData={flagItemData}
+            curFilter={ADMIN_LIST_STATUS[object_status]?.name}
+            approveCallback={handlingApprove}
+          />
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={handleIgnore}>
+            {t('ignore', { keyPrefix: 'btns' })}
+          </Button>
+        </Stack>
+      </Card.Footer>
     </Card>
   );
 };
diff --git a/ui/src/pages/Review/components/SuggestEditContent/index.tsx b/ui/src/pages/Review/components/SuggestEditContent/index.tsx
new file mode 100644
index 00000000..9e45b97d
--- /dev/null
+++ b/ui/src/pages/Review/components/SuggestEditContent/index.tsx
@@ -0,0 +1,246 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FC, useEffect, useState } from 'react';
+import { Alert, Stack, Button, Card } from 'react-bootstrap';
+import { Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+
+import { BaseUserCard, FormatTime, DiffContent } from '@/components';
+import { getSuggestReviewList, revisionAudit } from '@/services';
+import { pathFactory } from '@/router/pathFactory';
+import { scrollToDocTop } from '@/utils';
+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 [reviewResp, setReviewResp] = useState<Type.SuggestReviewResp>();
+  const ro = reviewResp?.list[0];
+  const { info, type, unreviewed_info } = ro || {
+    info: null,
+    type: '',
+    unreviewed_info: null,
+  };
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+  const queryNextOne = (pageNumber) => {
+    getSuggestReviewList(pageNumber)
+      .then((resp) => {
+        resolveNextOne(resp, pageNumber);
+      })
+      .catch((ex) => {
+        console.error('review next error: ', ex);
+      });
+  };
+  const reviewInfo = unreviewed_info?.content;
+
+  const handlingApprove = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'approve')
+      .then(() => {
+        queryNextOne(page);
+      })
+      .catch((ex) => {
+        console.error('revisionAudit approve error: ', ex);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const handlingReject = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'reject')
+      .then(() => {
+        queryNextOne(page);
+      })
+      .catch((ex) => {
+        console.error('revisionAudit reject error: ', ex);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  let itemLink = '';
+  let itemId = '';
+  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, info?.url_title);
+    itemId = info?.object_id;
+    editSummary ||= t('edit_question');
+  } else if (type === 'answer') {
+    itemLink = pathFactory.answerLanding({
+      // @ts-ignore
+      questionId: unreviewed_info.content.question_id,
+      slugTitle: info?.url_title,
+      answerId: unreviewed_info.object_id,
+    });
+    itemId = unreviewed_info.object_id;
+    editSummary ||= t('edit_answer');
+  } else if (type === 'tag') {
+    const tagInfo = unreviewed_info.content as Type.Tag;
+    itemLink = pathFactory.tagLanding(tagInfo.slug_name);
+    itemId = tagInfo?.tag_id || tagInfo.slug_name;
+    editSummary ||= t('edit_tag');
+  }
+  useEffect(() => {
+    queryNextOne(page);
+  }, []);
+
+  if (noTasks) return null;
+
+  let newData: Record<string, any> = {};
+  let oldData: Record<string, any> = {};
+  let diffOpts: Partial<{
+    showTitle: boolean;
+    showTagUrlSlug: boolean;
+  }> = {
+    showTitle: true,
+    showTagUrlSlug: true,
+  };
+  if (type === 'question' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      title: reviewInfo.title,
+      original_text: reviewInfo.content,
+      tags: reviewInfo.tags,
+    };
+    oldData = {
+      title: info.title,
+      original_text: info.content,
+      tags: info.tags,
+    };
+  }
+  if (type === 'answer' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      original_text: reviewInfo.content,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+  }
+
+  if (type === 'tag' && info && reviewInfo) {
+    newData = {
+      original_text: reviewInfo.original_text,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+    diffOpts = { showTitle: false, showTagUrlSlug: false };
+  }
+
+  return (
+    <Card>
+      <Card.Header>
+        {t('suggest_type_edit', {
+          type:
+            type === 'question' || type === 'answer'
+              ? t('post_lowercase', { keyPrefix: 'btns' })
+              : type,
+        })}
+      </Card.Header>
+      <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <BaseUserCard data={editor} avatarSize="24" />
+            {editTime && (
+              <FormatTime
+                time={editTime}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">{editSummary}</p>
+          </Stack>
+        </Alert>
+        <div className="p-3">
+          <small className="d-block text-secondary mb-4">
+            <span>{t(type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+
+          <DiffContent
+            className="mt-2"
+            objectType={type}
+            newData={newData}
+            oldData={oldData}
+            opts={diffOpts}
+          />
+        </div>
+      </Card.Body>
+      <Card.Footer className="p-3">
+        <p>{t('approve_this_type', { type: 'revision' })}</p>
+        <Stack direction="horizontal" gap={2}>
+          <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>
+        </Stack>
+      </Card.Footer>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/index.ts b/ui/src/pages/Review/components/index.ts
index 74f4f1df..ff1950b1 100644
--- a/ui/src/pages/Review/components/index.ts
+++ b/ui/src/pages/Review/components/index.ts
@@ -1,6 +1,13 @@
 import Filter from './Filter';
 import ApproveDropdown from './ApproveDropdown';
 import EditPostModal from './EditPostModal';
+import SuggestEditContent from './SuggestEditContent';
 import FlagContent from './FlagContent';
 
-export { Filter, ApproveDropdown, EditPostModal, FlagContent };
+export {
+  Filter,
+  ApproveDropdown,
+  EditPostModal,
+  FlagContent,
+  SuggestEditContent,
+};
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 77af95b9..c73ba9b7 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -18,260 +18,62 @@
  */
 
 import { FC, useEffect, useState } from 'react';
-import { Row, Col, Alert, Stack, Button, Card } from 'react-bootstrap';
-import { Link } from 'react-router-dom';
+import { Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import { usePageTags } from '@/hooks';
-import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
-import { getReviewList, revisionAudit } from '@/services';
-import { pathFactory } from '@/router/pathFactory';
-import { scrollToDocTop } from '@/utils';
+import { Empty } from '@/components';
+import { getReviewType } from '@/services';
 import type * as Type from '@/common/interface';
 
-import { Filter, ApproveDropdown, FlagContent } from './components';
+import { Filter, FlagContent, SuggestEditContent } from './components';
 
 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 [reviewResp, setReviewResp] = useState<Type.ReviewResp>();
-  const ro = reviewResp?.list[0];
-  const { info, type, unreviewed_info } = ro || {
-    info: null,
-    type: '',
-    unreviewed_info: null,
-  };
-  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(() => {
-      scrollToDocTop();
-    }, 150);
-  };
-  const queryNextOne = (pageNumber) => {
-    getReviewList(pageNumber)
+  const [reviewTypeList, setReviewTypeList] = useState<Type.ReviewTypeItem[]>();
+  const [currentReviewType, setCurrentReviewType] = useState('');
+
+  const fetchReviewType = () => {
+    getReviewType()
       .then((resp) => {
-        resolveNextOne(resp, pageNumber);
+        const filterData = resp.filter((item) => item.todo_amount > 0);
+        if (filterData.length > 0) {
+          setCurrentReviewType(filterData[0].name);
+        }
+        setReviewTypeList(resp);
       })
       .catch((ex) => {
-        console.error('review next error: ', ex);
+        console.error('getReviewType error: ', ex);
       });
   };
-  const reviewInfo = unreviewed_info?.content;
-  const handlingSkip = () => {
-    queryNextOne(page + 1);
-  };
-  const handlingApprove = () => {
-    if (!unreviewed_info) {
-      return;
-    }
-    setIsLoading(true);
-    revisionAudit(unreviewed_info.id, 'approve')
-      .then(() => {
-        queryNextOne(page);
-      })
-      .catch((ex) => {
-        console.error('revisionAudit approve error: ', ex);
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
-  };
-  const handlingReject = () => {
-    if (!unreviewed_info) {
-      return;
-    }
-    setIsLoading(true);
-    revisionAudit(unreviewed_info.id, 'reject')
-      .then(() => {
-        queryNextOne(page);
-      })
-      .catch((ex) => {
-        console.error('revisionAudit reject error: ', ex);
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
-  };
-  let itemLink = '';
-  let itemId = '';
-  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, info?.url_title);
-    itemId = info?.object_id;
-    editSummary ||= t('edit_question');
-  } else if (type === 'answer') {
-    itemLink = pathFactory.answerLanding({
-      // @ts-ignore
-      questionId: unreviewed_info.content.question_id,
-      slugTitle: info?.url_title,
-      answerId: unreviewed_info.object_id,
-    });
-    itemId = unreviewed_info.object_id;
-    editSummary ||= t('edit_answer');
-  } else if (type === 'tag') {
-    const tagInfo = unreviewed_info.content as Type.Tag;
-    itemLink = pathFactory.tagLanding(tagInfo.slug_name);
-    itemId = tagInfo?.tag_id || tagInfo.slug_name;
-    editSummary ||= t('edit_tag');
-  }
+
   useEffect(() => {
-    queryNextOne(page);
+    fetchReviewType();
   }, []);
+
   usePageTags({
     title: t('review'),
   });
 
-  let newData: Record<string, any> = {};
-  let oldData: Record<string, any> = {};
-  let diffOpts: Partial<{
-    showTitle: boolean;
-    showTagUrlSlug: boolean;
-  }> = {
-    showTitle: true,
-    showTagUrlSlug: true,
-  };
-  if (type === 'question' && info && reviewInfo && 'content' in reviewInfo) {
-    newData = {
-      title: reviewInfo.title,
-      original_text: reviewInfo.content,
-      tags: reviewInfo.tags,
-    };
-    oldData = {
-      title: info.title,
-      original_text: info.content,
-      tags: info.tags,
-    };
-  }
-  if (type === 'answer' && info && reviewInfo && 'content' in reviewInfo) {
-    newData = {
-      original_text: reviewInfo.content,
-    };
-    oldData = {
-      original_text: info.content,
-    };
-  }
-
-  if (type === 'tag' && info && reviewInfo) {
-    newData = {
-      original_text: reviewInfo.original_text,
-    };
-    oldData = {
-      original_text: info.content,
-    };
-    diffOpts = { showTitle: false, showTagUrlSlug: false };
-  }
-
   return (
     <Row className="pt-4 mb-5">
       <h3 className="mb-4">{t('review')}</h3>
       <Col className="page-main flex-auto">
-        {!noTasks && ro && (
-          <Card>
-            <Card.Header>
-              {t('suggest_type_edit', {
-                type:
-                  type === 'question' || type === 'answer'
-                    ? t('post_lowercase', { keyPrefix: 'btns' })
-                    : type,
-              })}
-            </Card.Header>
-            <Card.Body className="p-0">
-              <Alert variant="info" className="border-0 rounded-0 mb-0">
-                <Stack
-                  direction="horizontal"
-                  gap={1}
-                  className="align-items-center mb-2">
-                  <BaseUserCard data={editor} avatarSize="24" />
-                  {editTime && (
-                    <FormatTime
-                      time={editTime}
-                      className="small text-secondary"
-                      preFix={t('proposed')}
-                    />
-                  )}
-                </Stack>
-                <Stack className="align-items-start">
-                  <p className="mb-0">{editSummary}</p>
-                </Stack>
-              </Alert>
-              <div className="p-3">
-                <small className="d-block text-secondary mb-4">
-                  <span>{t(type, { keyPrefix: 'btns' })} </span>
-                  <Link
-                    to={itemLink}
-                    target="_blank"
-                    className="link-secondary">
-                    #{itemId}
-                  </Link>
-                </small>
-
-                <DiffContent
-                  className="mt-2"
-                  objectType={type}
-                  newData={newData}
-                  oldData={oldData}
-                  opts={diffOpts}
-                />
-              </div>
-            </Card.Body>
-            <Card.Footer className="p-3">
-              <p>{t('approve_this_type', { type: 'revision' })}</p>
-              <Stack direction="horizontal" gap={2}>
-                <Button
-                  variant="outline-primary"
-                  disabled={isLoading}
-                  onClick={handlingApprove}>
-                  {t('approve', { keyPrefix: 'btns' })}
-                </Button>
-                <ApproveDropdown />
-                <Button
-                  variant="outline-primary"
-                  disabled={isLoading}
-                  onClick={handlingReject}>
-                  {t('reject', { keyPrefix: 'btns' })}
-                </Button>
-                <Button
-                  variant="outline-primary"
-                  disabled={isLoading}
-                  onClick={handlingReject}>
-                  {t('ignore', { keyPrefix: 'btns' })}
-                </Button>
-                <Button
-                  variant="outline-primary"
-                  disabled={isLoading}
-                  onClick={handlingSkip}>
-                  {t('skip', { keyPrefix: 'btns' })}
-                </Button>
-              </Stack>
-            </Card.Footer>
-          </Card>
-        )}
-        {noTasks && <Empty>{t('empty')}</Empty>}
+        {currentReviewType === 'suggested_post_edit' && <SuggestEditContent />}
 
+        {/* {currentReviewType === 'flagged_post' && <FlagContent />} */}
         <FlagContent />
+        <Empty>{t('empty')}</Empty>
       </Col>
 
       <Col className="page-right-side mt-4 mt-xl-0">
-        <Filter />
+        <Filter
+          list={reviewTypeList}
+          checked={currentReviewType}
+          callback={(name) => {
+            setCurrentReviewType(name);
+          }}
+        />
       </Col>
     </Row>
   );
diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.ts
index ec326acf..ea353604 100644
--- a/ui/src/router/pathFactory.ts
+++ b/ui/src/router/pathFactory.ts
@@ -41,7 +41,7 @@ const questionLanding = (questionId: string, slugTitle: string = '') => {
   }
   // @ts-ignore
   if (/[13]/.test(seo.permalink) && slugTitle) {
-    return `/questions/${questionId}/${slugTitle}`;
+    return `/questions/${questionId}/${encodeURIComponent(slugTitle)}`;
   }
 
   return `/questions/${questionId}`;
diff --git a/ui/src/services/client/index.ts b/ui/src/services/client/index.ts
index 89d38a95..0d718423 100644
--- a/ui/src/services/client/index.ts
+++ b/ui/src/services/client/index.ts
@@ -29,3 +29,4 @@ export * from './timeline';
 export * from './revision';
 export * from './user';
 export * from './Oauth';
+export * from './review';
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
new file mode 100644
index 00000000..09278914
--- /dev/null
+++ b/ui/src/services/client/review.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// import useSWR from 'swr';
+
+import request from '@/utils/request';
+import * as Type from '@/common/interface';
+
+export const getSuggestReviewList = (page: number) => {
+  const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
+  return request.get<Type.SuggestReviewResp>(apiUrl);
+};
+
+export const getReviewType = () => {
+  return request.get<Type.ReviewTypeItem[]>('/answer/api/v1/reviewing/type');
+};
+
+export const getFlagReviewPostList = (page: number) => {
+  const apiUrl = `/answer/api/v1/report/unreviewed/post?page=${page}`;
+  return request.get<Type.FlagReviewResp>(apiUrl);
+};
+
+export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {
+  return request.put('/answer/api/v1/report/review', params);
+};
diff --git a/ui/src/services/client/revision.ts b/ui/src/services/client/revision.ts
index b71d7f24..489730e4 100644
--- a/ui/src/services/client/revision.ts
+++ b/ui/src/services/client/revision.ts
@@ -18,7 +18,6 @@
  */
 
 import request from '@/utils/request';
-import * as Type from '@/common/interface';
 
 export const editCheck = (id: string, passingError: boolean = false) => {
   const apiUrl = `/answer/api/v1/revisions/edit/check?id=${id}`;
@@ -34,8 +33,3 @@ export const revisionAudit = (id: string, operation: 'approve' | 'reject') => {
     operation,
   });
 };
-
-export const getReviewList = (page: number) => {
-  const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
-  return request.get<Type.ReviewResp>(apiUrl);
-};

From e529d33dbf451c9f45ac629551a8b6fa9412ea13 Mon Sep 17 00:00:00 2001
From: easy <58644520+foxzero-007@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:12:35 +0800
Subject: [PATCH 048/114] fix(ui): fixed the ui issue of skeleton screen
 flickering (#830)

The changes made in this pull request are quite extensive, and the
proposed solution is briefly described in the following text. I hope you
can take some time to review it when you have a moment.

**What did I modify in this branch?**

Perhaps you have noticed that we have been using the skeleton screen
technology on the frontend pages. However, the control over it seems a
bit simplistic. We currently only initiate the skeleton screen when
entering the page and directly replace it with new nodes upon interface
returns. As a result, there is a "skeleton screen flickering" issue
during usage. In favorable network conditions, we often observe a quick
flash of the skeleton screen. From a user experience perspective, I
prefer the page not to change so rapidly. Therefore, I have submitted
this pull request to address the issue.

**How did I make the modification?**

Through code comparison, it can be observed that I actually encapsulated
a new hook named `useSkeletonControl`. The parameters it returns are as
follows:

```ts
{
     isSkeletonShow, // Should the skeleton screen be displayed?
     openSkeleton, // Activate the skeleton screen.
     closeSkeleton // Deactivate the skeleton screen.
}
```

In the code logic, you can see that I have implemented a delay-like
operation for both activation and deactivation. The reason behind this
is that I believe the opening logic of the skeleton screen should be
like this:

- When the interface returns within 1 second, there is no need to
activate the skeleton screen.

- When the interface takes more than 1 second to return, the skeleton
screen is activated, and the activation time should not be less than 3
seconds.


(The above-mentioned times are all defined as constants and can be
adjusted according to the actual situation.)

Based on this design approach, I utilized `setTimeout` and
`clearTimeout` to control the timing of activation and deactivation.

Why provide a `needShowFirst` parameter?

Clearly, this parameter is used to control whether the skeleton screen
is rendered right from the start. It allows the skeleton screen to
bypass the first timing condition mentioned earlier, meaning it can be
activated even if the interface returns in less than 1 second. The
reason behind this is that I noticed in some pages, the skeleton screen
needs to occupy its position right from the start to prevent the
'flickering' issue on the page. So, I introduced this parameter.
However, in my design, I don't intend to show the skeleton screen when
the interface response time is too short, as it might negatively impact
the user experience.

The above is the reason behind my pull request. I have made
modifications for the pages I identified, and I hope they will be
accepted. Additionally, if there are better solutions, I am eager to see
them. Thanks again for considering my changes.

---------

Co-authored-by: LinkinStars <linkinstar@foxmail.com>
Co-authored-by: robin <robin@rnode.me>
---
 ui/src/common/constants.ts                |  1 +
 ui/src/components/QuestionList/index.tsx  |  5 +-
 ui/src/hooks/index.ts                     |  2 +
 ui/src/hooks/useSkeletonControl/index.tsx | 61 +++++++++++++++++++++++
 ui/src/pages/Questions/Detail/index.tsx   |  5 +-
 ui/src/pages/Search/index.tsx             |  5 +-
 ui/src/pages/Tags/index.tsx               |  8 ++-
 7 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 ui/src/hooks/useSkeletonControl/index.tsx

diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 8868c9a0..ec7f1ba6 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -30,6 +30,7 @@ export const DRAFT_TIMESIGH_STORAGE_KEY = '|_a_t_s_|';
 export const QUESTIONS_ORDER_STORAGE_KEY = '_a_qok_';
 export const DEFAULT_THEME = 'system';
 export const ADMIN_PRIVILEGE_CUSTOM_LEVEL = 99;
+export const SKELETON_SHOW_TIME = 1000;
 
 export const USER_AGENT_NAMES = {
   SegmentFault: 'SegmentFault',
diff --git a/ui/src/components/QuestionList/index.tsx b/ui/src/components/QuestionList/index.tsx
index 4f410990..94a300d8 100644
--- a/ui/src/components/QuestionList/index.tsx
+++ b/ui/src/components/QuestionList/index.tsx
@@ -36,6 +36,7 @@ import {
   Icon,
 } from '@/components';
 import * as Type from '@/common/interface';
+import { useSkeletonControl } from '@/hooks';
 
 export const QUESTION_ORDER_KEYS: Type.QuestionOrderBy[] = [
   'active',
@@ -59,11 +60,13 @@ const QuestionList: FC<Props> = ({
 }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'question' });
   const [urlSearchParams] = useSearchParams();
+  const { isSkeletonShow } = useSkeletonControl(isLoading);
   const curOrder =
     order || urlSearchParams.get('order') || QUESTION_ORDER_KEYS[0];
   const curPage = Number(urlSearchParams.get('page')) || 1;
   const pageSize = 20;
   const count = data?.count || 0;
+
   return (
     <div>
       <div className="mb-3 d-flex flex-wrap justify-content-between">
@@ -80,7 +83,7 @@ const QuestionList: FC<Props> = ({
         />
       </div>
       <ListGroup className="rounded-0">
-        {isLoading ? (
+        {isSkeletonShow ? (
           <QuestionListLoader />
         ) : (
           data?.list?.map((li) => {
diff --git a/ui/src/hooks/index.ts b/ui/src/hooks/index.ts
index 54c7fd28..d0615fa3 100644
--- a/ui/src/hooks/index.ts
+++ b/ui/src/hooks/index.ts
@@ -29,6 +29,7 @@ import useLoginRedirect from './useLoginRedirect';
 import usePromptWithUnload from './usePrompt';
 import useActivationEmailModal from './useActivationEmailModal';
 import useCaptchaModal from './useCaptchaModal';
+import useSkeletonControl from './useSkeletonControl';
 
 export {
   useTagModal,
@@ -43,4 +44,5 @@ export {
   usePromptWithUnload,
   useActivationEmailModal,
   useCaptchaModal,
+  useSkeletonControl,
 };
diff --git a/ui/src/hooks/useSkeletonControl/index.tsx b/ui/src/hooks/useSkeletonControl/index.tsx
new file mode 100644
index 00000000..2642ba9f
--- /dev/null
+++ b/ui/src/hooks/useSkeletonControl/index.tsx
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { useEffect, useRef, useState } from 'react';
+
+import { SKELETON_SHOW_TIME } from '@/common/constants';
+
+/**
+ * @param needShowFirst whether the skeleton should show at first
+ *
+ * Why need 'needShowFirst' param?
+ * Sometimes we need skeleton screens to take up space in the dom from the start
+ *
+ * If you set the 'needShowFirst' param as false, If the interface time is too short,
+ * the skeleton screen will not be displayed, which can reduce the time occupation
+ */
+const useSkeletonControl = (isLoading: boolean) => {
+  const [isSkeletonShow, setIsSkeletonShow] = useState(false);
+  const timer = useRef<NodeJS.Timeout | null>(null);
+  const openSkeleton = () => {
+    if (timer.current) {
+      clearTimeout(timer.current);
+    }
+    timer.current = setTimeout(() => {
+      setIsSkeletonShow(true);
+    }, SKELETON_SHOW_TIME);
+  };
+
+  const closeSkeleton = () => {
+    clearTimeout(timer.current as NodeJS.Timeout);
+    setIsSkeletonShow(false);
+  };
+
+  useEffect(() => {
+    if (isLoading) {
+      openSkeleton();
+    } else {
+      closeSkeleton();
+    }
+  }, [isLoading]);
+
+  return { isSkeletonShow };
+};
+
+export default useSkeletonControl;
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index e0908eac..b289ac68 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -30,7 +30,7 @@ import { useTranslation } from 'react-i18next';
 import { Pagination, CustomSidebar } from '@/components';
 import { loggedUserInfoStore, toastStore } from '@/stores';
 import { scrollToElementTop, scrollToDocTop } from '@/utils';
-import { usePageTags, usePageUsers } from '@/hooks';
+import { usePageTags, usePageUsers, useSkeletonControl } from '@/hooks';
 import type {
   ListResult,
   QuestionDetailRes,
@@ -68,6 +68,7 @@ const Index = () => {
   const order = urlSearch.get('order') || '';
   const [question, setQuestion] = useState<QuestionDetailRes | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(true);
+  const { isSkeletonShow } = useSkeletonControl(isLoading);
   const [answers, setAnswers] = useState<ListResult<AnswerItem>>({
     count: -1,
     list: [],
@@ -239,7 +240,7 @@ const Index = () => {
     <Row className="questionDetailPage pt-4 mb-5">
       <Col className="page-main flex-auto">
         {question?.operation?.level && <Alert data={question.operation} />}
-        {isLoading ? (
+        {isSkeletonShow ? (
           <ContentLoader />
         ) : (
           <Question
diff --git a/ui/src/pages/Search/index.tsx b/ui/src/pages/Search/index.tsx
index c7c42d96..8517172d 100644
--- a/ui/src/pages/Search/index.tsx
+++ b/ui/src/pages/Search/index.tsx
@@ -22,7 +22,7 @@ import { useTranslation } from 'react-i18next';
 import { useSearchParams } from 'react-router-dom';
 import { useEffect, useState } from 'react';
 
-import { usePageTags, useCaptchaModal } from '@/hooks';
+import { usePageTags, useCaptchaModal, useSkeletonControl } from '@/hooks';
 import { Pagination } from '@/components';
 import { getSearchResult } from '@/services';
 import type { SearchParams, SearchRes } from '@/common/interface';
@@ -43,6 +43,7 @@ const Index = () => {
   const q = searchParams.get('q') || '';
   const order = searchParams.get('order') || 'active';
   const [isLoading, setIsLoading] = useState(false);
+  const { isSkeletonShow } = useSkeletonControl(isLoading);
   const [data, setData] = useState<SearchRes>({
     count: 0,
     list: [],
@@ -102,7 +103,7 @@ const Index = () => {
         <Head data={extra} />
         <SearchHead sort={order} count={count} />
         <ListGroup className="rounded-0 mb-5">
-          {isLoading ? (
+          {isSkeletonShow ? (
             <ListLoader />
           ) : (
             list?.map((item) => {
diff --git a/ui/src/pages/Tags/index.tsx b/ui/src/pages/Tags/index.tsx
index aa0f8c6e..e8f682f7 100644
--- a/ui/src/pages/Tags/index.tsx
+++ b/ui/src/pages/Tags/index.tsx
@@ -22,7 +22,7 @@ import { Row, Col, Card, Button, Form, Stack } from 'react-bootstrap';
 import { useSearchParams, Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
-import { usePageTags } from '@/hooks';
+import { usePageTags, useSkeletonControl } from '@/hooks';
 import { Tag, Pagination, QueryGroup, TagsLoader } from '@/components';
 import { formatCount, escapeRemove } from '@/utils';
 import { tryNormalLogged } from '@/utils/guard';
@@ -52,6 +52,8 @@ const Tags = () => {
     ...(sort ? { query_cond: sort } : {}),
   });
 
+  const { isSkeletonShow } = useSkeletonControl(isLoading);
+
   const handleChange = (e) => {
     setSearchTag(e.target.value);
   };
@@ -67,9 +69,11 @@ const Tags = () => {
       mutate();
     });
   };
+
   usePageTags({
     title: t('tags', { keyPrefix: 'page_title' }),
   });
+
   return (
     <Row className="py-4 mb-4">
       <Col xxl={12}>
@@ -106,7 +110,7 @@ const Tags = () => {
 
       <Col className="mt-4" xxl={12}>
         <Row>
-          {isLoading ? (
+          {isSkeletonShow ? (
             <TagsLoader />
           ) : (
             tags?.list?.map((tag) => (

From 7d0b4121c6232a587583690dea91f50dd682b1a4 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 12 Mar 2024 17:51:30 +0800
Subject: [PATCH 049/114] feat: add queued review content

---
 i18n/en_US.yaml                               |   8 +-
 ui/src/common/constants.ts                    |   5 +
 ui/src/common/interface.ts                    |  19 +-
 .../Review/components/FlagContent/index.tsx   |  49 +----
 .../Review/components/QueuedContent/index.tsx | 197 ++++++++++++++++++
 .../{Filter => ReviewType}/index.tsx          |   0
 .../index.tsx                                 |  10 +-
 ui/src/pages/Review/components/index.ts       |  10 +-
 ui/src/pages/Review/index.tsx                 |  35 +++-
 ui/src/pages/Review/utils/generateData.ts     |  58 ++++++
 ui/src/services/client/review.ts              |  12 ++
 11 files changed, 346 insertions(+), 57 deletions(-)
 create mode 100644 ui/src/pages/Review/components/QueuedContent/index.tsx
 rename ui/src/pages/Review/components/{Filter => ReviewType}/index.tsx (100%)
 rename ui/src/pages/Review/components/{SuggestEditContent => SuggestContent}/index.tsx (97%)
 create mode 100644 ui/src/pages/Review/utils/generateData.ts

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index e640b642..8dd7f55c 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1563,6 +1563,7 @@ ui:
       status: Status
       action: Action
       change: Change
+      pending: Pending
       filter:
         placeholder: "Filter by title, question:id"
     answers:
@@ -1814,10 +1815,15 @@ ui:
     edit_answer: Edit answer
     edit_tag: Edit tag
     empty: No review tasks left.
-    approve_this_type: Do you approve this {{ type }}?
+    approve_revision_tip: Do you approve this revision?
+    approve_flag_tip: Do you approve this flag?
+    approve_post_tip: Do you approve this post?
+    approve_user_tip: Do you approve this user?
     suggest_edits: Suggested edits
     flag_post: Flag post
     flag_user: Flag user
+    queued_post: Queued post
+    queued_user: Queued user
     filter_label: Type
     reputation: reputation
     flag_post_type: Flagged this post as {{ type }}
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index d11dc7f8..71ad6223 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -54,6 +54,11 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
+  // pending
+  11: {
+    variant: 'text-bg-warning',
+    name: 'pending',
+  },
   normal: {
     variant: 'text-bg-success',
     name: 'normal',
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 847c4fb7..7c4c5e71 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -597,7 +597,7 @@ export interface ReasonItem {
   reason_type: number;
 }
 
-export interface FlagReviewItem {
+export interface BaseReviewItem {
   object_type: 'question' | 'answer' | 'comment' | 'user';
   object_id: string;
   object_show_status: number;
@@ -605,9 +605,7 @@ export interface FlagReviewItem {
   tags: Tag[];
   title: string;
   original_text: string;
-  reason: ReasonItem;
   author_user_info: UserInfoBase;
-  submitter_user: UserInfoBase;
   created_at: number;
   submit_at: number;
   comment_id: string;
@@ -618,11 +616,26 @@ export interface FlagReviewItem {
   flag_id: string;
 }
 
+export interface FlagReviewItem extends BaseReviewItem {
+  reason: ReasonItem;
+  submitter_user: UserInfoBase;
+}
+
 export interface FlagReviewResp {
   count: number;
   list: FlagReviewItem[];
 }
 
+export interface QueuedReviewItem extends BaseReviewItem {
+  reason: string;
+  submitter_display_name: string;
+}
+
+export interface QueuedReviewResp {
+  count: number;
+  list: QueuedReviewItem[];
+}
+
 export interface UserRoleItem {
   id: number;
   name: string;
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 526e273b..a509ccd0 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -7,13 +7,17 @@ import classNames from 'classnames';
 
 import { getFlagReviewPostList, putFlagReviewAction } from '@/services';
 import { BaseUserCard, Tag, FormatTime } from '@/components';
-import { pathFactory } from '@/router/pathFactory';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 import { ADMIN_LIST_STATUS } from '@/common/constants';
 import ApproveDropdown from '../ApproveDropdown';
+import generateData from '../../utils/generateData';
 
-const Index: FC = () => {
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -63,6 +67,7 @@ const Index: FC = () => {
     if (!flagItemData) {
       return;
     }
+    refreshCount();
     queryNextOne(page);
   };
 
@@ -73,7 +78,8 @@ const Index: FC = () => {
       flag_id: String(flagItemData?.flag_id),
     })
       .then(() => {
-        queryNextOne(page + 1);
+        refreshCount();
+        queryNextOne(page);
       })
       .finally(() => {
         setIsLoading(false);
@@ -93,41 +99,8 @@ const Index: FC = () => {
     reason: null,
     object_status: 0,
   };
-  let itemLink = '';
-  let itemId = '';
-  let itemTimePrefix = '';
 
-  if (object_type === 'question') {
-    itemLink = pathFactory.questionLanding(
-      String(flagItemData?.question_id),
-      flagItemData?.title,
-    );
-    itemId = String(flagItemData?.question_id);
-    itemTimePrefix = 'asked';
-  } else if (object_type === 'answer') {
-    itemLink = pathFactory.answerLanding({
-      // @ts-ignore
-      questionId: flagItemData?.question_id,
-      slugTitle: flagItemData?.title,
-      answerId: String(flagItemData?.object_id),
-    });
-    itemId = String(flagItemData?.object_id);
-    itemTimePrefix = 'answered';
-  } else if (object_type === 'comment') {
-    if (flagItemData?.question_id && flagItemData?.answer_id) {
-      itemLink = `${pathFactory.answerLanding({
-        questionId: flagItemData?.question_id,
-        answerId: flagItemData?.answer_id,
-      })}?commentId=${flagItemData?.comment_id}`;
-    } else {
-      itemLink = `${pathFactory.questionLanding(
-        String(flagItemData?.question_id),
-        flagItemData?.title,
-      )}?commentId=${flagItemData?.comment_id}`;
-    }
-    itemId = String(flagItemData?.comment_id);
-    itemTimePrefix = 'commented';
-  }
+  const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);
 
   if (noTasks) return null;
   return (
@@ -214,7 +187,7 @@ const Index: FC = () => {
       </Card.Body>
 
       <Card.Footer className="p-3">
-        <p>{t('approve_this_type', { type: 'revision' })}</p>
+        <p>{t('approve_flag_tip')}</p>
         <Stack direction="horizontal" gap={2}>
           <ApproveDropdown
             objectType={object_type}
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
new file mode 100644
index 00000000..630a8e9b
--- /dev/null
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -0,0 +1,197 @@
+import { FC, useEffect, useState } from 'react';
+import { Card, Alert, Stack, Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+
+import classNames from 'classnames';
+
+import { getPendingReviewPostList, putPendingReviewAction } from '@/services';
+import { BaseUserCard, Tag, FormatTime, Icon } from '@/components';
+import { scrollToDocTop } from '@/utils';
+import type * as Type from '@/common/interface';
+import { ADMIN_LIST_STATUS } from '@/common/constants';
+import generateData from '../../utils/generateData';
+
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [noTasks, setNoTasks] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [page, setPage] = useState(1);
+  const [reviewResp, setReviewResp] = useState<Type.QuestionDetailRes>();
+  const flagItemData = reviewResp?.list[0] as Type.QueuedReviewItem;
+
+  console.log('pendingResp', reviewResp);
+
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+
+  const queryNextOne = (pageNumber) => {
+    getPendingReviewPostList(pageNumber).then((resp) => {
+      resolveNextOne(resp, pageNumber);
+    });
+  };
+
+  useEffect(() => {
+    queryNextOne(page);
+  }, []);
+
+  const handleAction = (type: 'approve' | 'reject') => {
+    if (!flagItemData) {
+      return;
+    }
+    setIsLoading(true);
+    putPendingReviewAction({
+      status: type,
+      review_id: String(flagItemData?.flag_id),
+    })
+      .then(() => {
+        refreshCount();
+        queryNextOne(page + 1);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const { object_type, author_user_info, object_status, reason } =
+    flagItemData || {
+      object_type: '',
+      author_user_info: null,
+      reason: null,
+      object_status: 0,
+    };
+
+  const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);
+
+  if (noTasks) return null;
+  return (
+    <Card>
+      <Card.Header>
+        {object_type !== 'user' ? t('queued_post') : t('queued_post_user')}
+      </Card.Header>
+      <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <div className="small d-flex align-items-center">
+              <Icon type="bi" name="plugin" size="24px" className="me-1" />
+              <span>{flagItemData?.submitter_display_name}</span>
+            </div>
+            {flagItemData?.submit_at && (
+              <FormatTime
+                time={flagItemData.submit_at}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">{reason}</p>
+          </Stack>
+        </Alert>
+        <div className="p-3">
+          <small className="d-block text-secondary mb-4">
+            <span>{t(object_type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+          {object_type === 'question' && (
+            <>
+              <h5 className="mb-3">{flagItemData?.title}</h5>
+              <div className="mb-4">
+                {flagItemData?.tags?.map((item) => {
+                  return (
+                    <Tag key={item.slug_name} className="me-1" data={item} />
+                  );
+                })}
+              </div>
+            </>
+          )}
+          <div className="small font-monospace">
+            {flagItemData?.original_text}
+          </div>
+          <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
+            <div>
+              <span
+                className={classNames(
+                  'badge',
+                  ADMIN_LIST_STATUS[object_status]?.variant,
+                )}>
+                {t(ADMIN_LIST_STATUS[object_status]?.name, {
+                  keyPrefix: 'admin.questions',
+                })}
+              </span>
+              {flagItemData?.object_show_status === 2 && (
+                <span
+                  className={classNames(
+                    'ms-1 badge',
+                    ADMIN_LIST_STATUS.unlist.variant,
+                  )}>
+                  {t(ADMIN_LIST_STATUS.unlist.name, { keyPrefix: 'btns' })}
+                </span>
+              )}
+            </div>
+            <div className="d-flex align-items-center small">
+              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <FormatTime
+                time={Number(flagItemData?.created_at)}
+                className="text-secondary ms-1 flex-shrink-0"
+                preFix={t(itemTimePrefix, { keyPrefix: 'question_detail' })}
+              />
+            </div>
+          </div>
+        </div>
+      </Card.Body>
+
+      <Card.Footer className="p-3">
+        <p>
+          {object_type !== 'user'
+            ? t('approve_post_tip')
+            : t('approve_user_tip')}
+        </p>
+        <Stack direction="horizontal" gap={2}>
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={() => handleAction('approve')}>
+            {t('approve', { keyPrefix: 'btns' })}
+          </Button>
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={() => handleAction('reject')}>
+            {t('reject', { keyPrefix: 'btns' })}
+          </Button>
+        </Stack>
+      </Card.Footer>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/Filter/index.tsx b/ui/src/pages/Review/components/ReviewType/index.tsx
similarity index 100%
rename from ui/src/pages/Review/components/Filter/index.tsx
rename to ui/src/pages/Review/components/ReviewType/index.tsx
diff --git a/ui/src/pages/Review/components/SuggestEditContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsx
similarity index 97%
rename from ui/src/pages/Review/components/SuggestEditContent/index.tsx
rename to ui/src/pages/Review/components/SuggestContent/index.tsx
index 9e45b97d..b30c16fb 100644
--- a/ui/src/pages/Review/components/SuggestEditContent/index.tsx
+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx
@@ -28,7 +28,11 @@ import { pathFactory } from '@/router/pathFactory';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 
-const Index: FC = () => {
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [isLoading, setIsLoading] = useState(false);
   const [noTasks, setNoTasks] = useState(false);
@@ -79,6 +83,7 @@ const Index: FC = () => {
     setIsLoading(true);
     revisionAudit(unreviewed_info.id, 'approve')
       .then(() => {
+        refreshCount();
         queryNextOne(page);
       })
       .catch((ex) => {
@@ -96,6 +101,7 @@ const Index: FC = () => {
     setIsLoading(true);
     revisionAudit(unreviewed_info.id, 'reject')
       .then(() => {
+        refreshCount();
         queryNextOne(page);
       })
       .catch((ex) => {
@@ -223,7 +229,7 @@ const Index: FC = () => {
         </div>
       </Card.Body>
       <Card.Footer className="p-3">
-        <p>{t('approve_this_type', { type: 'revision' })}</p>
+        <p>{t('approve_revision_tip')}</p>
         <Stack direction="horizontal" gap={2}>
           <Button
             variant="outline-primary"
diff --git a/ui/src/pages/Review/components/index.ts b/ui/src/pages/Review/components/index.ts
index ff1950b1..0e02a69b 100644
--- a/ui/src/pages/Review/components/index.ts
+++ b/ui/src/pages/Review/components/index.ts
@@ -1,13 +1,15 @@
-import Filter from './Filter';
+import ReviewType from './ReviewType';
 import ApproveDropdown from './ApproveDropdown';
 import EditPostModal from './EditPostModal';
-import SuggestEditContent from './SuggestEditContent';
+import SuggestContent from './SuggestContent';
 import FlagContent from './FlagContent';
+import QueuedContent from './QueuedContent';
 
 export {
-  Filter,
+  ReviewType,
   ApproveDropdown,
   EditPostModal,
   FlagContent,
-  SuggestEditContent,
+  SuggestContent,
+  QueuedContent,
 };
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index c73ba9b7..40bf6b3b 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -26,19 +26,29 @@ import { Empty } from '@/components';
 import { getReviewType } from '@/services';
 import type * as Type from '@/common/interface';
 
-import { Filter, FlagContent, SuggestEditContent } from './components';
+import {
+  ReviewType,
+  FlagContent,
+  SuggestContent,
+  QueuedContent,
+} from './components';
 
 const Index: FC = () => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [reviewTypeList, setReviewTypeList] = useState<Type.ReviewTypeItem[]>();
   const [currentReviewType, setCurrentReviewType] = useState('');
+  const [isEmpty, setIsEmpty] = useState(false);
 
-  const fetchReviewType = () => {
+  const fetchReviewType = (changeReviewType: boolean) => {
     getReviewType()
       .then((resp) => {
         const filterData = resp.filter((item) => item.todo_amount > 0);
         if (filterData.length > 0) {
-          setCurrentReviewType(filterData[0].name);
+          if (changeReviewType) {
+            setCurrentReviewType(filterData[0].name);
+          }
+        } else {
+          setIsEmpty(true);
         }
         setReviewTypeList(resp);
       })
@@ -48,7 +58,7 @@ const Index: FC = () => {
   };
 
   useEffect(() => {
-    fetchReviewType();
+    fetchReviewType(true);
   }, []);
 
   usePageTags({
@@ -59,15 +69,22 @@ const Index: FC = () => {
     <Row className="pt-4 mb-5">
       <h3 className="mb-4">{t('review')}</h3>
       <Col className="page-main flex-auto">
-        {currentReviewType === 'suggested_post_edit' && <SuggestEditContent />}
+        {currentReviewType === 'suggested_post_edit' && (
+          <SuggestContent refreshCount={() => fetchReviewType(false)} />
+        )}
 
-        {/* {currentReviewType === 'flagged_post' && <FlagContent />} */}
-        <FlagContent />
-        <Empty>{t('empty')}</Empty>
+        {currentReviewType === 'flagged_post' && (
+          <FlagContent refreshCount={() => fetchReviewType(false)} />
+        )}
+
+        {currentReviewType === 'queued_post' && (
+          <QueuedContent refreshCount={() => fetchReviewType(false)} />
+        )}
+        {isEmpty && <Empty>{t('empty')}</Empty>}
       </Col>
 
       <Col className="page-right-side mt-4 mt-xl-0">
-        <Filter
+        <ReviewType
           list={reviewTypeList}
           checked={currentReviewType}
           callback={(name) => {
diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
new file mode 100644
index 00000000..42d80726
--- /dev/null
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -0,0 +1,58 @@
+import { pathFactory } from '@/router/pathFactory';
+
+export default (data: any) => {
+  if (!data?.object_id) {
+    return {
+      itemLink: '',
+      itemId: '',
+      itemTimePrefix: '',
+    };
+  }
+
+  const {
+    object_type = '',
+    object_id = '',
+    question_id = '',
+    answer_id = '',
+    comment_id = '',
+    title = '',
+  } = data;
+  let itemLink = '';
+  let itemId = '';
+  let itemTimePrefix = '';
+
+  if (object_type === 'question') {
+    itemLink = pathFactory.questionLanding(String(object_id), title);
+    itemId = String(question_id);
+    itemTimePrefix = 'asked';
+  } else if (object_type === 'answer') {
+    itemLink = pathFactory.answerLanding({
+      // @ts-ignore
+      questionId: question_id,
+      slugTitle: title,
+      answerId: String(object_id),
+    });
+    itemId = String(object_id);
+    itemTimePrefix = 'answered';
+  } else if (object_type === 'comment') {
+    if (question_id && answer_id) {
+      itemLink = `${pathFactory.answerLanding({
+        questionId: question_id,
+        answerId: answer_id,
+      })}?commentId=${comment_id}`;
+    } else {
+      itemLink = `${pathFactory.questionLanding(
+        String(question_id),
+        title,
+      )}?commentId=${comment_id}`;
+    }
+    itemId = String(comment_id);
+    itemTimePrefix = 'commented';
+  }
+
+  return {
+    itemLink,
+    itemId,
+    itemTimePrefix,
+  };
+};
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
index 09278914..22d95ecd 100644
--- a/ui/src/services/client/review.ts
+++ b/ui/src/services/client/review.ts
@@ -38,3 +38,15 @@ export const getFlagReviewPostList = (page: number) => {
 export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {
   return request.put('/answer/api/v1/report/review', params);
 };
+
+export const getPendingReviewPostList = (page: number) => {
+  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}`;
+  return request.get<Type.QueuedReviewResp>(apiUrl);
+};
+
+export const putPendingReviewAction = (params: {
+  review_id: string;
+  status: 'approve' | 'reject';
+}) => {
+  return request.put('/answer/api/v1/review/pending/post', params);
+};

From 4e11ce5ee7b310492767418830980209264cf569 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 12 Mar 2024 18:20:09 +0800
Subject: [PATCH 050/114] feat: delete admin/flag page

---
 ui/src/common/constants.ts                    |   4 -
 .../Dashboard/components/Statistics/index.tsx |   2 +-
 ui/src/pages/Admin/Flags/index.tsx            | 186 ------------------
 .../components/ApproveDropdown/index.tsx      |   1 -
 .../Review/components/FlagContent/index.tsx   |   2 +-
 .../Review/components/QueuedContent/index.tsx |   2 +-
 .../components/SuggestContent/index.tsx       |  13 +-
 ui/src/pages/Review/index.tsx                 |  30 ++-
 ui/src/router/routes.ts                       |   4 -
 9 files changed, 29 insertions(+), 215 deletions(-)
 delete mode 100644 ui/src/pages/Admin/Flags/index.tsx

diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 71ad6223..7b5a6803 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -89,10 +89,6 @@ export const ADMIN_NAV_MENUS = [
   {
     name: 'users',
   },
-  {
-    name: 'flags',
-    // badgeContent: 5,
-  },
   {
     name: 'customize',
     children: [
diff --git a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
index 85262724..6555c8cc 100644
--- a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
@@ -58,7 +58,7 @@ const Statistics: FC<IProps> = ({ data }) => {
           <Col xs={6}>
             <span className="text-secondary me-1">{t('flags')}</span>
             <strong>
-              <Link to="/admin/flags" className="ms-2">
+              <Link to="/review?type=flagged" className="ms-2">
                 {data.report_count}
               </Link>
             </strong>
diff --git a/ui/src/pages/Admin/Flags/index.tsx b/ui/src/pages/Admin/Flags/index.tsx
deleted file mode 100644
index 73f32113..00000000
--- a/ui/src/pages/Admin/Flags/index.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { FC } from 'react';
-import { Button, Form, Table, Stack } from 'react-bootstrap';
-import { useSearchParams } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-
-import {
-  FormatTime,
-  BaseUserCard,
-  Empty,
-  Pagination,
-  QueryGroup,
-} from '@/components';
-import { useReportModal } from '@/hooks';
-import * as Type from '@/common/interface';
-import { useFlagSearch } from '@/services';
-import { escapeRemove } from '@/utils';
-import { pathFactory } from '@/router/pathFactory';
-
-const flagFilterKeys: Type.FlagStatus[] = ['pending', 'completed'];
-const flagTypeKeys: Type.FlagType[] = ['all', 'question', 'answer', 'comment'];
-
-const Flags: FC = () => {
-  const { t } = useTranslation('translation', { keyPrefix: 'admin.flags' });
-  const [urlSearchParams, setUrlSearchParams] = useSearchParams();
-  const curFilter = urlSearchParams.get('status') || flagFilterKeys[0];
-  const curType = urlSearchParams.get('type') || flagTypeKeys[0];
-  const PAGE_SIZE = 20;
-  const curPage = Number(urlSearchParams.get('page')) || 1;
-  const {
-    data: listData,
-    isLoading,
-    mutate: refreshList,
-  } = useFlagSearch({
-    page_size: PAGE_SIZE,
-    page: curPage,
-    status: curFilter as Type.FlagStatus,
-    object_type: curType as Type.FlagType,
-  });
-  const reportModal = useReportModal(refreshList);
-
-  const count = listData?.count || 0;
-
-  const onTypeChange = (evt) => {
-    urlSearchParams.set('type', evt.target.value);
-    setUrlSearchParams(urlSearchParams);
-  };
-
-  const handleReview = ({ id, object_type }) => {
-    reportModal.onShow({
-      id,
-      type: object_type,
-      isBackend: true,
-      action: 'review',
-    });
-  };
-
-  return (
-    <>
-      <h3 className="mb-4">{t('title')}</h3>
-      <div className="d-flex justify-content-between align-items-center mb-3">
-        <QueryGroup
-          data={flagFilterKeys}
-          currentSort={curFilter}
-          sortKey="status"
-          i18nKeyPrefix="admin.flags"
-        />
-
-        <Form.Select
-          value={curType}
-          onChange={onTypeChange}
-          size="sm"
-          style={{ width: '12.25rem' }}>
-          {flagTypeKeys.map((li) => {
-            return (
-              <option value={li} key={li}>
-                {t(li, { keyPrefix: 'btns' })}
-              </option>
-            );
-          })}
-        </Form.Select>
-      </div>
-      <Table>
-        <thead>
-          <tr>
-            <th>{t('flagged')}</th>
-            <th style={{ width: '20%' }}>{t('created')}</th>
-            {curFilter !== 'completed' ? (
-              <th style={{ width: '20%' }}>{t('action')}</th>
-            ) : null}
-          </tr>
-        </thead>
-        <tbody className="align-middle">
-          {listData?.list?.map((li) => {
-            return (
-              <tr key={li.id}>
-                <td>
-                  <Stack>
-                    <small className="text-secondary">
-                      {t('flagged_type', {
-                        type: t(li.object_type, { keyPrefix: 'btns' }),
-                      })}
-                    </small>
-                    <BaseUserCard
-                      data={li.reported_user}
-                      className="mt-2 small"
-                    />
-                    <a
-                      href={pathFactory.questionLanding(
-                        li.question_id,
-                        li.url_title,
-                      )}
-                      target="_blank"
-                      className="text-wrap text-break mt-2"
-                      rel="noreferrer">
-                      {li.title}
-                    </a>
-                    <small className="text-break text-wrap word">
-                      {escapeRemove(li.excerpt)}
-                    </small>
-                  </Stack>
-                </td>
-                <td>
-                  <Stack>
-                    <FormatTime
-                      time={li.created_at}
-                      className="small text-secondary"
-                    />
-                    <BaseUserCard
-                      data={li.report_user}
-                      className="mt-2 mb-2 small"
-                    />
-                    {li.flagged_reason ? (
-                      <small>{li.flagged_content}</small>
-                    ) : (
-                      <small>
-                        {li.reason?.name}
-                        <br />
-                        <span className="text-secondary">{li.content}</span>
-                      </small>
-                    )}
-                  </Stack>
-                </td>
-                {curFilter !== 'completed' ? (
-                  <td>
-                    <Button variant="link" onClick={() => handleReview(li)}>
-                      {t('review')}
-                    </Button>
-                  </td>
-                ) : null}
-              </tr>
-            );
-          })}
-        </tbody>
-      </Table>
-      {Number(count) <= 0 && !isLoading && <Empty />}
-      <div className="mt-4 mb-2 d-flex justify-content-center">
-        <Pagination
-          currentPage={curPage}
-          totalSize={count}
-          pageSize={PAGE_SIZE}
-        />
-      </div>
-    </>
-  );
-};
-
-export default Flags;
diff --git a/ui/src/pages/Review/components/ApproveDropdown/index.tsx b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
index d26b10f6..85be41db 100644
--- a/ui/src/pages/Review/components/ApproveDropdown/index.tsx
+++ b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
@@ -21,7 +21,6 @@ const Index: FC<IProps> = ({
   curFilter,
   approveCallback,
 }) => {
-  console.log(objectType);
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
 
   const [isLoading, setIsLoading] = useState(false);
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index a509ccd0..6a8556ad 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -25,7 +25,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
   const [reviewResp, setReviewResp] = useState<Type.FlagReviewResp>();
   const flagItemData = reviewResp?.list[0] as Type.FlagReviewItem;
 
-  console.log('reviewResp', reviewResp);
+  // console.log('reviewResp', reviewResp);
 
   const resolveNextOne = (resp, pageNumber) => {
     const { count, list = [] } = resp;
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index 630a8e9b..b490bb22 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -24,7 +24,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
   const [reviewResp, setReviewResp] = useState<Type.QuestionDetailRes>();
   const flagItemData = reviewResp?.list[0] as Type.QueuedReviewItem;
 
-  console.log('pendingResp', reviewResp);
+  // console.log('pendingResp', reviewResp);
 
   const resolveNextOne = (resp, pageNumber) => {
     const { count, list = [] } = resp;
diff --git a/ui/src/pages/Review/components/SuggestContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsx
index b30c16fb..dde42796 100644
--- a/ui/src/pages/Review/components/SuggestContent/index.tsx
+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx
@@ -66,13 +66,9 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     }, 150);
   };
   const queryNextOne = (pageNumber) => {
-    getSuggestReviewList(pageNumber)
-      .then((resp) => {
-        resolveNextOne(resp, pageNumber);
-      })
-      .catch((ex) => {
-        console.error('review next error: ', ex);
-      });
+    getSuggestReviewList(pageNumber).then((resp) => {
+      resolveNextOne(resp, pageNumber);
+    });
   };
   const reviewInfo = unreviewed_info?.content;
 
@@ -86,9 +82,6 @@ const Index: FC<IProps> = ({ refreshCount }) => {
         refreshCount();
         queryNextOne(page);
       })
-      .catch((ex) => {
-        console.error('revisionAudit approve error: ', ex);
-      })
       .finally(() => {
         setIsLoading(false);
       });
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 40bf6b3b..0fc84b06 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -20,6 +20,7 @@
 import { FC, useEffect, useState } from 'react';
 import { Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { useSearchParams } from 'react-router-dom';
 
 import { usePageTags } from '@/hooks';
 import { Empty } from '@/components';
@@ -34,6 +35,8 @@ import {
 } from './components';
 
 const Index: FC = () => {
+  const [urlSearch, setUrlSearchParams] = useSearchParams();
+  const searchType = urlSearch.get('type');
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [reviewTypeList, setReviewTypeList] = useState<Type.ReviewTypeItem[]>();
   const [currentReviewType, setCurrentReviewType] = useState('');
@@ -42,13 +45,22 @@ const Index: FC = () => {
   const fetchReviewType = (changeReviewType: boolean) => {
     getReviewType()
       .then((resp) => {
-        const filterData = resp.filter((item) => item.todo_amount > 0);
-        if (filterData.length > 0) {
-          if (changeReviewType) {
+        if (searchType) {
+          const filterData = resp.filter((item) =>
+            item.name.includes(searchType),
+          );
+          if (filterData.length > 0) {
             setCurrentReviewType(filterData[0].name);
           }
         } else {
-          setIsEmpty(true);
+          const filterData = resp.filter((item) => item.todo_amount > 0);
+          if (filterData.length > 0) {
+            if (changeReviewType) {
+              setCurrentReviewType(filterData[0].name);
+            }
+          } else {
+            setIsEmpty(true);
+          }
         }
         setReviewTypeList(resp);
       })
@@ -57,6 +69,12 @@ const Index: FC = () => {
       });
   };
 
+  const handleTypeChange = (name) => {
+    urlSearch.delete('type');
+    setUrlSearchParams(urlSearch);
+    setCurrentReviewType(name);
+  };
+
   useEffect(() => {
     fetchReviewType(true);
   }, []);
@@ -87,9 +105,7 @@ const Index: FC = () => {
         <ReviewType
           list={reviewTypeList}
           checked={currentReviewType}
-          callback={(name) => {
-            setCurrentReviewType(name);
-          }}
+          callback={handleTypeChange}
         />
       </Col>
     </Row>
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index 9880dd38..5c420e36 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -332,10 +332,6 @@ const routes: RouteNode[] = [
             path: 'answers',
             page: 'pages/Admin/Answers',
           },
-          {
-            path: 'flags',
-            page: 'pages/Admin/Flags',
-          },
           {
             path: 'themes',
             page: 'pages/Admin/Themes',

From 724dc022b70ce230baba1950ad57b5fbd6d6e6e7 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 13 Mar 2024 11:22:44 +0800
Subject: [PATCH 051/114] feat: admin qeustions and answers add pending list

---
 i18n/en_US.yaml                               |  9 ++++-----
 i18n/zh_CN.yaml                               |  9 +++++++++
 ui/src/common/constants.ts                    |  4 ++++
 ui/src/common/interface.ts                    |  8 ++++++--
 .../Admin/Answers/components/Action/index.tsx | 12 +++++++++++
 ui/src/pages/Admin/Answers/index.tsx          | 12 ++++++++---
 .../Dashboard/components/Statistics/index.tsx |  2 +-
 .../Questions/components/Action/index.tsx     | 12 +++++++++++
 ui/src/pages/Admin/Questions/index.tsx        | 11 +++++++---
 .../Review/components/FlagContent/index.tsx   |  2 +-
 .../Review/components/QueuedContent/index.tsx | 20 ++++++++++++-------
 .../components/SuggestContent/index.tsx       |  9 +--------
 ui/src/pages/Review/index.tsx                 | 10 +++++-----
 ui/src/services/client/review.ts              |  4 ++--
 14 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 8dd7f55c..7236e700 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1174,6 +1174,10 @@ ui:
     filter: Filter
     ignore: Ignore
     submit: Submit
+    normal: Normal
+    closed: Closed
+    deleted: Deleted
+    pending: Pending
   search:
     title: Search Results
     keywords: Keywords
@@ -1552,9 +1556,6 @@ ui:
         content: A suspended user can't log in.
     questions:
       page_title: Questions
-      normal: Normal
-      closed: Closed
-      deleted: Deleted
       unlisted: Unlisted
       post: Post
       votes: Votes
@@ -1568,8 +1569,6 @@ ui:
         placeholder: "Filter by title, question:id"
     answers:
       page_title: Answers
-      normal: Normal
-      deleted: Deleted
       post: Post
       votes: Votes
       created: Created
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index 1151de96..1b964c4d 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1133,6 +1133,15 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: 帖子
+    filter: Filter
+    ignore: 忽略
+    submit: 提交
+    normal: 正常
+    closed: 已关闭
+    deleted: 已删除
+    pending: Pending
   search:
     title: 搜索结果
     keywords: 关键词
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index 7b5a6803..59f28c91 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -71,6 +71,10 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
+  pending: {
+    variant: 'text-bg-warning',
+    name: 'pending',
+  },
   unlist: {
     variant: 'text-bg-secondary',
     name: 'unlist',
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 7c4c5e71..2bc8876c 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -300,9 +300,13 @@ export interface QueryQuestionsReq extends Paging {
   in_days?: number;
 }
 
-export type AdminQuestionStatus = 'available' | 'closed' | 'deleted';
+export type AdminQuestionStatus =
+  | 'available'
+  | 'pending'
+  | 'closed'
+  | 'deleted';
 
-export type AdminContentsFilterBy = 'normal' | 'closed' | 'deleted';
+export type AdminContentsFilterBy = 'normal' | 'pending' | 'closed' | 'deleted';
 
 export interface AdminContentsReq extends Paging {
   status: AdminContentsFilterBy;
diff --git a/ui/src/pages/Admin/Answers/components/Action/index.tsx b/ui/src/pages/Admin/Answers/components/Action/index.tsx
index 7f34f219..c4308cd2 100644
--- a/ui/src/pages/Admin/Answers/components/Action/index.tsx
+++ b/ui/src/pages/Admin/Answers/components/Action/index.tsx
@@ -19,6 +19,7 @@
 
 import { Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { Icon, Modal } from '@/components';
 import { changeAnswerStatus } from '@/services';
@@ -58,6 +59,17 @@ const AnswerActions = ({ itemData, curFilter, refreshList }) => {
     }
   };
 
+  if (curFilter === 'pending') {
+    return (
+      <Link
+        to={`/review?type=queued_post&objectId=${itemData.id}`}
+        className="btn btn-link p-0"
+        title={t('review', { keyPrefix: 'header.nav' })}>
+        <Icon name="three-dots-vertical" />
+      </Link>
+    );
+  }
+
   return (
     <Dropdown>
       <Dropdown.Toggle variant="link" className="no-toggle p-0">
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index febc8e81..a653f7f5 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -40,7 +40,11 @@ import { pathFactory } from '@/router/pathFactory';
 
 import AnswerAction from './components/Action';
 
-const answerFilterItems: Type.AdminContentsFilterBy[] = ['normal', 'deleted'];
+const answerFilterItems: Type.AdminContentsFilterBy[] = [
+  'normal',
+  'pending',
+  'deleted',
+];
 
 const Answers: FC = () => {
   const [urlSearchParams, setUrlSearchParams] = useSearchParams();
@@ -77,7 +81,7 @@ const Answers: FC = () => {
           data={answerFilterItems}
           currentSort={curFilter}
           sortKey="status"
-          i18nKeyPrefix="admin.answers"
+          i18nKeyPrefix="btns"
         />
 
         <Form.Control
@@ -150,7 +154,9 @@ const Answers: FC = () => {
                       'badge',
                       ADMIN_LIST_STATUS[curFilter]?.variant,
                     )}>
-                    {t(ADMIN_LIST_STATUS[curFilter]?.name)}
+                    {t(ADMIN_LIST_STATUS[curFilter]?.name, {
+                      keyPrefix: 'btns',
+                    })}
                   </span>
                 </td>
                 <td className="text-end">
diff --git a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
index 6555c8cc..d0f5f410 100644
--- a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
@@ -58,7 +58,7 @@ const Statistics: FC<IProps> = ({ data }) => {
           <Col xs={6}>
             <span className="text-secondary me-1">{t('flags')}</span>
             <strong>
-              <Link to="/review?type=flagged" className="ms-2">
+              <Link to="/review?type=flagged_post" className="ms-2">
                 {data.report_count}
               </Link>
             </strong>
diff --git a/ui/src/pages/Admin/Questions/components/Action/index.tsx b/ui/src/pages/Admin/Questions/components/Action/index.tsx
index a1f7e2a2..f5d2b41f 100644
--- a/ui/src/pages/Admin/Questions/components/Action/index.tsx
+++ b/ui/src/pages/Admin/Questions/components/Action/index.tsx
@@ -19,6 +19,7 @@
 
 import { Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { Icon, Modal } from '@/components';
 import {
@@ -119,6 +120,17 @@ const AnswerActions = ({ itemData, refreshList, curFilter, show, pin }) => {
     }
   };
 
+  if (curFilter === 'pending') {
+    return (
+      <Link
+        to={`/review?type=queued_post&objectId=${itemData.id}`}
+        className="btn btn-link p-0"
+        title={t('review', { keyPrefix: 'header.nav' })}>
+        <Icon name="three-dots-vertical" />
+      </Link>
+    );
+  }
+
   return (
     <Dropdown>
       <Dropdown.Toggle variant="link" className="no-toggle p-0">
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 7a7b7be9..0488a08b 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -41,6 +41,7 @@ import Action from './components/Action';
 
 const questionFilterItems: Type.AdminContentsFilterBy[] = [
   'normal',
+  'pending',
   'closed',
   'deleted',
 ];
@@ -78,7 +79,7 @@ const Questions: FC = () => {
           data={questionFilterItems}
           currentSort={curFilter}
           sortKey="status"
-          i18nKeyPrefix="admin.questions"
+          i18nKeyPrefix="btns"
         />
 
         <Form.Control
@@ -147,7 +148,9 @@ const Questions: FC = () => {
                       'mb-1',
                       ADMIN_LIST_STATUS[curFilter]?.variant,
                     )}>
-                    {t(ADMIN_LIST_STATUS[curFilter]?.name)}
+                    {t(ADMIN_LIST_STATUS[curFilter]?.name, {
+                      keyPrefix: 'btns',
+                    })}
                   </span>
                   {li.show === 2 && (
                     <span
@@ -155,7 +158,9 @@ const Questions: FC = () => {
                         'badge',
                         ADMIN_LIST_STATUS.unlist.variant,
                       )}>
-                      {t(ADMIN_LIST_STATUS.unlist.name)}
+                      {t(ADMIN_LIST_STATUS.unlist.name, {
+                        keyPrefix: 'btns',
+                      })}
                     </span>
                   )}
                 </td>
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 6a8556ad..11056c89 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -161,7 +161,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
                   ADMIN_LIST_STATUS[object_status]?.variant,
                 )}>
                 {t(ADMIN_LIST_STATUS[object_status]?.name, {
-                  keyPrefix: 'admin.questions',
+                  keyPrefix: 'btns',
                 })}
               </span>
               {flagItemData?.object_show_status === 2 && (
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index b490bb22..3d3b579d 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react';
 import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
 
 import classNames from 'classnames';
 
@@ -17,6 +17,8 @@ interface IProps {
 }
 
 const Index: FC<IProps> = ({ refreshCount }) => {
+  const [urlSearch, setUrlSearchParams] = useSearchParams();
+  const objectId = urlSearch.get('objectId') || '';
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -33,7 +35,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       pageNumber = 1;
       setPage(pageNumber);
       // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      queryNextOne(pageNumber);
+      queryNextOne(pageNumber, '');
       return;
     }
     if (pageNumber !== page) {
@@ -48,14 +50,14 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     }, 150);
   };
 
-  const queryNextOne = (pageNumber) => {
-    getPendingReviewPostList(pageNumber).then((resp) => {
+  const queryNextOne = (pageNumber, id) => {
+    getPendingReviewPostList(pageNumber, id).then((resp) => {
       resolveNextOne(resp, pageNumber);
     });
   };
 
   useEffect(() => {
-    queryNextOne(page);
+    queryNextOne(page, objectId);
   }, []);
 
   const handleAction = (type: 'approve' | 'reject') => {
@@ -69,7 +71,11 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     })
       .then(() => {
         refreshCount();
-        queryNextOne(page + 1);
+        queryNextOne(page, '');
+        if (objectId) {
+          urlSearch.delete('objectId');
+          setUrlSearchParams(urlSearch);
+        }
       })
       .finally(() => {
         setIsLoading(false);
@@ -144,7 +150,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
                   ADMIN_LIST_STATUS[object_status]?.variant,
                 )}>
                 {t(ADMIN_LIST_STATUS[object_status]?.name, {
-                  keyPrefix: 'admin.questions',
+                  keyPrefix: 'btns',
                 })}
               </span>
               {flagItemData?.object_show_status === 2 && (
diff --git a/ui/src/pages/Review/components/SuggestContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsx
index dde42796..8b618a91 100644
--- a/ui/src/pages/Review/components/SuggestContent/index.tsx
+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx
@@ -177,14 +177,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
 
   return (
     <Card>
-      <Card.Header>
-        {t('suggest_type_edit', {
-          type:
-            type === 'question' || type === 'answer'
-              ? t('post_lowercase', { keyPrefix: 'btns' })
-              : type,
-        })}
-      </Card.Header>
+      <Card.Header>{t('suggest_edits')}</Card.Header>
       <Card.Body className="p-0">
         <Alert variant="info" className="border-0 rounded-0 mb-0">
           <Stack
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 0fc84b06..a0590e7e 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -46,11 +46,11 @@ const Index: FC = () => {
     getReviewType()
       .then((resp) => {
         if (searchType) {
-          const filterData = resp.filter((item) =>
-            item.name.includes(searchType),
-          );
-          if (filterData.length > 0) {
-            setCurrentReviewType(filterData[0].name);
+          const filterData = resp.find((item) => item.name === searchType);
+          if (Number(filterData?.todo_amount) > 0) {
+            setCurrentReviewType(filterData?.name || '');
+          } else {
+            setIsEmpty(true);
           }
         } else {
           const filterData = resp.filter((item) => item.todo_amount > 0);
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
index 22d95ecd..c1ff0079 100644
--- a/ui/src/services/client/review.ts
+++ b/ui/src/services/client/review.ts
@@ -39,8 +39,8 @@ export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {
   return request.put('/answer/api/v1/report/review', params);
 };
 
-export const getPendingReviewPostList = (page: number) => {
-  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}`;
+export const getPendingReviewPostList = (page: number, objectId?: string) => {
+  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}&object_id=${objectId}`;
   return request.get<Type.QueuedReviewResp>(apiUrl);
 };
 

From cbfd7512f8c480cd300116a6d884a9ec99028818 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Wed, 13 Mar 2024 11:23:40 +0800
Subject: [PATCH 052/114] feat(review): postpone the notification after review

---
 cmd/wire_gen.go                              |   2 +-
 docs/docs.go                                 |   6 +
 docs/swagger.json                            |   6 +
 docs/swagger.yaml                            |   4 +
 internal/controller/report_controller.go     |   1 +
 internal/controller/review_controller.go     |   1 +
 internal/service/content/answer_service.go   |   6 +-
 internal/service/content/question_service.go |   6 +-
 internal/service/review/review_service.go    | 120 ++++++++++++++++---
 9 files changed, 128 insertions(+), 24 deletions(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 7cab7d18..e864af5c 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -172,7 +172,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
 	reviewRepo := review.NewReviewRepo(dataData)
-	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService)
+	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService)
 	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
 	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService, reviewService)
 	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
diff --git a/docs/docs.go b/docs/docs.go
index 6f690389..44320f78 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4509,6 +4509,12 @@ const docTemplate = `{
                         "description": "page",
                         "name": "page",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "object_id",
+                        "name": "object_id",
+                        "in": "query"
                     }
                 ],
                 "responses": {
diff --git a/docs/swagger.json b/docs/swagger.json
index d227bfef..e96e622a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -4497,6 +4497,12 @@
                         "description": "page",
                         "name": "page",
                         "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "object_id",
+                        "name": "object_id",
+                        "in": "query"
                     }
                 ],
                 "responses": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d2e2c041..6a794feb 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -5345,6 +5345,10 @@ paths:
         in: query
         name: page
         type: integer
+      - description: object_id
+        in: query
+        name: object_id
+        type: string
       produces:
       - application/json
       responses:
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index f4068579..484c7516 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -144,6 +144,7 @@ func (rc *ReportController) ReviewReport(ctx *gin.Context) {
 	}
 
 	// TODO: check permission
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	err := rc.reportService.ReviewReport(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
index 5331cc52..967a2a16 100644
--- a/internal/controller/review_controller.go
+++ b/internal/controller/review_controller.go
@@ -58,6 +58,7 @@ func NewReviewController(
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query int false "page"
+// @Param object_id query string false "object_id"
 // @Success 200 {object} handler.RespBody{data=pager.PageModel{list=[]schema.GetUnreviewedPostPageResp}}
 // @Router /answer/api/v1/review/pending/post/page [get]
 func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.go
index 88fa5e3a..3c8b96ee 100644
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -277,8 +277,10 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	if err != nil {
 		return insertData.ID, err
 	}
-	as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
-		insertData.OriginalText)
+	if insertData.Status == entity.AnswerStatusAvailable {
+		as.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, insertData.ID, req.UserID, questionInfo.Title,
+			insertData.OriginalText)
+	}
 
 	as.activityQueueService.Send(ctx, &schema.ActivityMsg{
 		UserID:           insertData.UserID,
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index 9a068640..58b7b931 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -365,8 +365,10 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
 		RevisionID:       revisionID,
 	})
 
-	qs.externalNotificationQueueService.Send(ctx,
-		schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
+	if question.Status == entity.QuestionStatusAvailable {
+		qs.externalNotificationQueueService.Send(ctx,
+			schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
+	}
 
 	questionInfo, err = qs.GetQuestion(ctx, question.ID, question.UserID, req.QuestionPermission)
 	return
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 354eb972..3f77f68c 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -28,10 +28,13 @@ import (
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
+	"github.com/apache/incubator-answer/internal/service/notice_queue"
 	"github.com/apache/incubator-answer/internal/service/object_info"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/role"
+	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/pkg/token"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/apache/incubator-answer/plugin"
 	"github.com/jinzhu/copier"
@@ -50,12 +53,16 @@ type ReviewRepo interface {
 
 // ReviewService user service
 type ReviewService struct {
-	reviewRepo        ReviewRepo
-	objectInfoService *object_info.ObjService
-	userCommon        *usercommon.UserCommon
-	questionRepo      questioncommon.QuestionRepo
-	answerRepo        answercommon.AnswerRepo
-	userRoleService   *role.UserRoleRelService
+	reviewRepo                       ReviewRepo
+	objectInfoService                *object_info.ObjService
+	userCommon                       *usercommon.UserCommon
+	userRepo                         usercommon.UserRepo
+	questionRepo                     questioncommon.QuestionRepo
+	answerRepo                       answercommon.AnswerRepo
+	userRoleService                  *role.UserRoleRelService
+	tagCommon                        *tagcommon.TagCommonService
+	externalNotificationQueueService notice_queue.ExternalNotificationQueueService
+	notificationQueueService         notice_queue.NotificationQueueService
 }
 
 // NewReviewService new review service
@@ -66,14 +73,20 @@ func NewReviewService(
 	questionRepo questioncommon.QuestionRepo,
 	answerRepo answercommon.AnswerRepo,
 	userRoleService *role.UserRoleRelService,
+	externalNotificationQueueService notice_queue.ExternalNotificationQueueService,
+	tagCommon *tagcommon.TagCommonService,
+	notificationQueueService notice_queue.NotificationQueueService,
 ) *ReviewService {
 	return &ReviewService{
-		reviewRepo:        reviewRepo,
-		objectInfoService: objectInfoService,
-		userCommon:        userCommon,
-		questionRepo:      questionRepo,
-		answerRepo:        answerRepo,
-		userRoleService:   userRoleService,
+		reviewRepo:                       reviewRepo,
+		objectInfoService:                objectInfoService,
+		userCommon:                       userCommon,
+		questionRepo:                     questionRepo,
+		answerRepo:                       answerRepo,
+		userRoleService:                  userRoleService,
+		externalNotificationQueueService: externalNotificationQueueService,
+		tagCommon:                        tagCommon,
+		notificationQueueService:         notificationQueueService,
 	}
 }
 
@@ -199,9 +212,19 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 		} else {
 			question.Status = entity.QuestionStatusDeleted
 		}
-		return cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status)
+		if err := cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status); err != nil {
+			return err
+		}
+		if isApprove {
+			tags, err := cs.tagCommon.GetObjectEntityTag(ctx, question.ID)
+			if err != nil {
+				log.Errorf("get question tags failed, err: %v", err)
+			}
+			cs.externalNotificationQueueService.Send(ctx,
+				schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
+		}
 	case constant.AnswerObjectType:
-		answer, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
+		answerInfo, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
 		if err != nil {
 			return err
 		}
@@ -209,14 +232,72 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 			return errors.BadRequest(reason.ObjectNotFound)
 		}
 		if isApprove {
-			answer.Status = entity.AnswerStatusAvailable
+			answerInfo.Status = entity.AnswerStatusAvailable
 		} else {
-			answer.Status = entity.AnswerStatusDeleted
+			answerInfo.Status = entity.AnswerStatusDeleted
+		}
+		if err := cs.answerRepo.UpdateAnswerStatus(ctx, answerInfo.ID, answerInfo.Status); err != nil {
+			return err
+		}
+		questionInfo, exist, err := cs.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
+		if err != nil {
+			return err
+		}
+		if !exist {
+			return errors.BadRequest(reason.ObjectNotFound)
+		}
+		if isApprove {
+			cs.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, answerInfo.ID,
+				answerInfo.UserID, questionInfo.Title, answerInfo.OriginalText)
 		}
-		return cs.answerRepo.UpdateAnswerStatus(ctx, answer.ID, answer.Status)
 	}
 	return
+}
 
+func (cs *ReviewService) notificationAnswerTheQuestion(ctx context.Context,
+	questionUserID, questionID, answerID, answerUserID, questionTitle, answerSummary string) {
+	// If the question is answered by me, there is no notification for myself.
+	if questionUserID == answerUserID {
+		return
+	}
+	msg := &schema.NotificationMsg{
+		TriggerUserID:  answerUserID,
+		ReceiverUserID: questionUserID,
+		Type:           schema.NotificationTypeInbox,
+		ObjectID:       answerID,
+	}
+	msg.ObjectType = constant.AnswerObjectType
+	msg.NotificationAction = constant.NotificationAnswerTheQuestion
+	cs.notificationQueueService.Send(ctx, msg)
+
+	receiverUserInfo, exist, err := cs.userRepo.GetByUserID(ctx, questionUserID)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	if !exist {
+		log.Warnf("user %s not found", questionUserID)
+		return
+	}
+
+	externalNotificationMsg := &schema.ExternalNotificationMsg{
+		ReceiverUserID: receiverUserInfo.ID,
+		ReceiverEmail:  receiverUserInfo.EMail,
+		ReceiverLang:   receiverUserInfo.Language,
+	}
+	rawData := &schema.NewAnswerTemplateRawData{
+		QuestionTitle:   questionTitle,
+		QuestionID:      questionID,
+		AnswerID:        answerID,
+		AnswerSummary:   answerSummary,
+		UnsubscribeCode: token.GenerateToken(),
+	}
+	answerUser, _, _ := cs.userCommon.GetUserBasicInfoByID(ctx, answerUserID)
+	if answerUser != nil {
+		rawData.AnswerUserDisplayName = answerUser.DisplayName
+	}
+	externalNotificationMsg.NewAnswerTemplateRawData = rawData
+	cs.externalNotificationQueueService.Send(ctx, externalNotificationMsg)
 }
 
 // GetReviewPendingCount get review pending count
@@ -227,10 +308,11 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
 // GetUnreviewedPostPage get review page
 func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
 	pageModel *pager.PageModel, err error) {
-	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{
+	cond := &entity.Review{
 		ObjectID: req.ObjectID,
 		Status:   entity.ReviewStatusPending,
-	})
+	}
+	reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, cond)
 	if err != nil {
 		return
 	}

From d2c53e861367c964453033a5314eddc449be936e Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 13 Mar 2024 12:27:08 +0800
Subject: [PATCH 053/114] fix: review close action

---
 ui/src/hooks/useReportModal/index.tsx         | 34 +++++++++++--------
 .../components/ApproveDropdown/index.tsx      |  3 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ui/src/hooks/useReportModal/index.tsx b/ui/src/hooks/useReportModal/index.tsx
index 24d26b02..88cd2442 100644
--- a/ui/src/hooks/useReportModal/index.tsx
+++ b/ui/src/hooks/useReportModal/index.tsx
@@ -38,7 +38,8 @@ interface Params {
   type: Type.ReportType;
   id: string;
   title?: string;
-  action: Type.ReportAction | 'flag_review_close';
+  action: Type.ReportAction;
+  source?: string;
 }
 
 const useReportModal = (callback?: () => void) => {
@@ -70,7 +71,11 @@ const useReportModal = (callback?: () => void) => {
   }, []);
   const getList = ({ type, action, isBackend }: Params) => {
     // @ts-ignore
-    reportList({ type, action, isBackend }).then((res) => {
+    reportList({
+      type,
+      action,
+      isBackend,
+    }).then((res) => {
       setList(res);
       setShow(true);
     });
@@ -120,6 +125,18 @@ const useReportModal = (callback?: () => void) => {
       return;
     }
     if (params.type === 'question' && params.action === 'close') {
+      if (params?.source === 'review') {
+        putFlagReviewAction({
+          flag_id: params.id,
+          operation_type: 'close_post',
+          close_type: reportType.type,
+          close_msg: content.value,
+        }).then(() => {
+          onClose();
+          asyncCallback();
+        });
+        return;
+      }
       closeQuestion({
         id: params.id,
         close_type: reportType.type,
@@ -130,19 +147,6 @@ const useReportModal = (callback?: () => void) => {
       });
       return;
     }
-
-    if (params.type === 'question' && params.action === 'flag_review_close') {
-      putFlagReviewAction({
-        flag_id: params.id,
-        operation_type: 'close_post',
-        close_type: reportType.type,
-        close_msg: content.value,
-      }).then(() => {
-        onClose();
-        asyncCallback();
-      });
-      return;
-    }
     if (!params.isBackend && params.action === 'flag') {
       rCaptcha.check(() => {
         const flagReq = {
diff --git a/ui/src/pages/Review/components/ApproveDropdown/index.tsx b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
index 85be41db..05f92296 100644
--- a/ui/src/pages/Review/components/ApproveDropdown/index.tsx
+++ b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
@@ -111,7 +111,8 @@ const Index: FC<IProps> = ({
       closeModal.onShow({
         type: 'question',
         id: itemData?.flag_id || '',
-        action: 'flag_review_close',
+        action: 'close',
+        source: 'review',
       });
     }
 

From df60809ab183fb671fa0bd580967c3e11604998f Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 13 Mar 2024 14:45:16 +0800
Subject: [PATCH 054/114] fix: review_id should be number

---
 ui/src/common/interface.ts                             | 1 +
 ui/src/pages/Review/components/QueuedContent/index.tsx | 2 +-
 ui/src/services/client/review.ts                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 2bc8876c..28518e4c 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -631,6 +631,7 @@ export interface FlagReviewResp {
 }
 
 export interface QueuedReviewItem extends BaseReviewItem {
+  review_id: number;
   reason: string;
   submitter_display_name: string;
 }
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index 3d3b579d..bd22d297 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -67,7 +67,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     setIsLoading(true);
     putPendingReviewAction({
       status: type,
-      review_id: String(flagItemData?.flag_id),
+      review_id: flagItemData?.review_id,
     })
       .then(() => {
         refreshCount();
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
index c1ff0079..de289453 100644
--- a/ui/src/services/client/review.ts
+++ b/ui/src/services/client/review.ts
@@ -45,7 +45,7 @@ export const getPendingReviewPostList = (page: number, objectId?: string) => {
 };
 
 export const putPendingReviewAction = (params: {
-  review_id: string;
+  review_id: number;
   status: 'approve' | 'reject';
 }) => {
   return request.put('/answer/api/v1/review/pending/post', params);

From a8345ca3074cb57fb8b0f6b8a55f0669fd970fc7 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 13 Mar 2024 15:02:51 +0800
Subject: [PATCH 055/114] fix: after the review is completed, it will
 automatically switch to other types to be reviewed

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

diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index a0590e7e..4febbb9e 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -57,6 +57,13 @@ const Index: FC = () => {
           if (filterData.length > 0) {
             if (changeReviewType) {
               setCurrentReviewType(filterData[0].name);
+            } else {
+              const currentTypeItem = resp.find(
+                (item) => item.name === currentReviewType,
+              );
+              if (currentTypeItem?.todo_amount === 0) {
+                setCurrentReviewType(filterData[0].name);
+              }
             }
           } else {
             setIsEmpty(true);

From 3c802cc9002d5ceef6e254f9c045d961632040fa Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Wed, 13 Mar 2024 16:30:21 +0800
Subject: [PATCH 056/114] feat(review): add review amount to revision count

---
 cmd/wire_gen.go                               |  2 +-
 .../controller/notification_controller.go     |  1 +
 internal/schema/notification_schema.go        |  1 +
 .../notification/notification_service.go      | 53 ++++++++++++++++---
 .../revision_common/revision_service.go       |  3 +-
 5 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index e864af5c..af0c88c4 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -210,7 +210,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	controllerSiteInfoController := controller.NewSiteInfoController(siteInfoCommonService)
 	notificationRepo := notification2.NewNotificationRepo(dataData)
 	notificationCommon := notificationcommon.NewNotificationCommon(dataData, notificationRepo, userCommon, activityRepo, followRepo, objService, notificationQueueService, userExternalLoginRepo, siteInfoCommonService)
-	notificationService := notification.NewNotificationService(dataData, notificationRepo, notificationCommon, revisionService, userRepo)
+	notificationService := notification.NewNotificationService(dataData, notificationRepo, notificationCommon, revisionService, userRepo, reportRepo, reviewService)
 	notificationController := controller.NewNotificationController(notificationService, rankService)
 	dashboardService := dashboard.NewDashboardService(questionRepo, answerRepo, commentCommonRepo, voteRepo, userRepo, reportRepo, configService, siteInfoCommonService, serviceConf, dataData)
 	dashboardController := controller.NewDashboardController(dashboardService)
diff --git a/internal/controller/notification_controller.go b/internal/controller/notification_controller.go
index ab923e96..15796b9c 100644
--- a/internal/controller/notification_controller.go
+++ b/internal/controller/notification_controller.go
@@ -70,6 +70,7 @@ func (nc *NotificationController) GetRedDot(ctx *gin.Context) {
 	req.CanReviewQuestion = canList[0]
 	req.CanReviewAnswer = canList[1]
 	req.CanReviewTag = canList[2]
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
 
 	resp, err := nc.notificationService.GetRedDot(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
diff --git a/internal/schema/notification_schema.go b/internal/schema/notification_schema.go
index c3b64fb8..4e0e9316 100644
--- a/internal/schema/notification_schema.go
+++ b/internal/schema/notification_schema.go
@@ -62,6 +62,7 @@ type GetRedDot struct {
 	CanReviewAnswer   bool   `json:"-"`
 	CanReviewTag      bool   `json:"-"`
 	UserID            string `json:"-"`
+	IsAdmin           bool   `json:"-"`
 }
 
 // NotificationMsg notification message
diff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.go
index bda225d1..71febb67 100644
--- a/internal/service/notification/notification_service.go
+++ b/internal/service/notification/notification_service.go
@@ -23,6 +23,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+
+	"github.com/apache/incubator-answer/internal/service/report_common"
+	"github.com/apache/incubator-answer/internal/service/review"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
 	"github.com/apache/incubator-answer/pkg/converter"
 
@@ -46,6 +49,8 @@ type NotificationService struct {
 	notificationRepo   notficationcommon.NotificationRepo
 	notificationCommon *notficationcommon.NotificationCommon
 	revisionService    *revision_common.RevisionService
+	reportRepo         report_common.ReportRepo
+	reviewService      *review.ReviewService
 	userRepo           usercommon.UserRepo
 }
 
@@ -55,6 +60,8 @@ func NewNotificationService(
 	notificationCommon *notficationcommon.NotificationCommon,
 	revisionService *revision_common.RevisionService,
 	userRepo usercommon.UserRepo,
+	reportRepo report_common.ReportRepo,
+	reviewService *review.ReviewService,
 ) *NotificationService {
 	return &NotificationService{
 		data:               data,
@@ -62,10 +69,12 @@ func NewNotificationService(
 		notificationCommon: notificationCommon,
 		revisionService:    revisionService,
 		userRepo:           userRepo,
+		reportRepo:         reportRepo,
+		reviewService:      reviewService,
 	}
 }
 
-func (ns *NotificationService) GetRedDot(ctx context.Context, req *schema.GetRedDot) (*schema.RedDot, error) {
+func (ns *NotificationService) GetRedDot(ctx context.Context, req *schema.GetRedDot) (resp *schema.RedDot, err error) {
 	redBot := &schema.RedDot{}
 	inboxKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeInbox, req.UserID)
 	achievementKey := fmt.Sprintf("answer_RedDot_%d_%s", schema.NotificationTypeAchievement, req.UserID)
@@ -85,16 +94,48 @@ func (ns *NotificationService) GetRedDot(ctx context.Context, req *schema.GetRed
 	_ = 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
+		redBot.Revision = ns.countAllReviewAmount(ctx, req)
 	}
 
 	return redBot, nil
 }
 
+func (ns *NotificationService) countAllReviewAmount(ctx context.Context, req *schema.GetRedDot) (amount int64) {
+	// get queue amount
+	if req.IsAdmin {
+		reviewCount, err := ns.reviewService.GetReviewPendingCount(ctx)
+		if err != nil {
+			log.Errorf("get report count failed: %v", err)
+		} else {
+			amount += reviewCount
+		}
+	}
+
+	// get flag amount
+	if req.IsAdmin {
+		reportCount, err := ns.reportRepo.GetReportCount(ctx)
+		if err != nil {
+			log.Errorf("get report count failed: %v", err)
+		} else {
+			amount += reportCount
+		}
+	}
+
+	// get suggestion amount
+	countUnreviewedRevision, err := ns.revisionService.GetUnreviewedRevisionCount(ctx, &schema.RevisionSearch{
+		CanReviewQuestion: req.CanReviewQuestion,
+		CanReviewAnswer:   req.CanReviewAnswer,
+		CanReviewTag:      req.CanReviewTag,
+		UserID:            req.UserID,
+	})
+	if err != nil {
+		log.Errorf("get unreviewed revision count failed: %v", err)
+	} else {
+		amount += countUnreviewedRevision
+	}
+	return amount
+}
+
 func (ns *NotificationService) ClearRedDot(ctx context.Context, req *schema.NotificationClearRequest) (*schema.RedDot, error) {
 	botType, ok := schema.NotificationType[req.TypeStr]
 	if ok {
diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go
index c9d454e3..ba73f797 100644
--- a/internal/service/revision_common/revision_service.go
+++ b/internal/service/revision_common/revision_service.go
@@ -53,8 +53,7 @@ func (rs *RevisionService) GetUnreviewedRevisionCount(ctx context.Context, req *
 	if len(req.GetCanReviewObjectTypes()) == 0 {
 		return 0, nil
 	}
-	_, count, err = rs.revisionRepo.GetUnreviewedRevisionPage(ctx, req.Page, 1, req.GetCanReviewObjectTypes())
-	return count, err
+	return rs.revisionRepo.CountUnreviewedRevision(ctx, req.GetCanReviewObjectTypes())
 }
 
 // AddRevision add revision

From faf0b7e9ccf68799df95c4f4efef5a1e4c04bfb9 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Wed, 13 Mar 2024 17:08:02 +0800
Subject: [PATCH 057/114] fix(notification): If receiver not set language, use
 site default language. #833

---
 internal/service/notification/external_notification.go |  8 ++++++++
 .../service/notification/new_question_notification.go  | 10 +++++++++-
 internal/service/notification_common/notification.go   | 10 ++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/internal/service/notification/external_notification.go b/internal/service/notification/external_notification.go
index 58228884..1db83f0b 100644
--- a/internal/service/notification/external_notification.go
+++ b/internal/service/notification/external_notification.go
@@ -21,7 +21,9 @@ package notification
 
 import (
 	"context"
+
 	"github.com/apache/incubator-answer/internal/base/data"
+	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/activity_common"
 	"github.com/apache/incubator-answer/internal/service/export"
@@ -71,6 +73,12 @@ func NewExternalNotificationService(
 func (ns *ExternalNotificationService) Handler(ctx context.Context, msg *schema.ExternalNotificationMsg) error {
 	log.Debugf("try to send external notification %+v", msg)
 
+	// If receiver not set language, use site default language.
+	if len(msg.ReceiverLang) == 0 || msg.ReceiverLang == translator.DefaultLangOption {
+		if interfaceInfo, _ := ns.siteInfoService.GetSiteInterface(ctx); interfaceInfo != nil {
+			msg.ReceiverLang = interfaceInfo.Language
+		}
+	}
 	if msg.NewQuestionTemplateRawData != nil {
 		return ns.handleNewQuestionNotification(ctx, msg)
 	}
diff --git a/internal/service/notification/new_question_notification.go b/internal/service/notification/new_question_notification.go
index c079ac28..d4173397 100644
--- a/internal/service/notification/new_question_notification.go
+++ b/internal/service/notification/new_question_notification.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
+	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/pkg/display"
 	"github.com/apache/incubator-answer/pkg/token"
@@ -229,7 +230,7 @@ func (ns *ExternalNotificationService) syncNewQuestionNotificationToPlugin(ctx c
 
 			if len(subscriberUserID) > 0 {
 				userInfo, _, _ := ns.userRepo.GetByUserID(ctx, subscriberUserID)
-				if userInfo != nil {
+				if userInfo != nil && len(userInfo.Language) > 0 && userInfo.Language != translator.DefaultLangOption {
 					newMsg.ReceiverLang = userInfo.Language
 				}
 			}
@@ -264,6 +265,13 @@ func (ns *ExternalNotificationService) newPluginQuestionNotification(
 	if err != nil {
 		return raw
 	}
+	interfaceInfo, err := ns.siteInfoService.GetSiteInterface(ctx)
+	if err != nil {
+		return raw
+	}
+	if len(raw.ReceiverLang) == 0 || raw.ReceiverLang == translator.DefaultLangOption {
+		raw.ReceiverLang = interfaceInfo.Language
+	}
 	raw.QuestionUrl = display.QuestionURL(
 		seoInfo.Permalink, siteInfo.SiteUrl,
 		msg.NewQuestionTemplateRawData.QuestionID, msg.NewQuestionTemplateRawData.QuestionTitle)
diff --git a/internal/service/notification_common/notification.go b/internal/service/notification_common/notification.go
index 2338023c..319403b2 100644
--- a/internal/service/notification_common/notification.go
+++ b/internal/service/notification_common/notification.go
@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/apache/incubator-answer/internal/service/user_external_login"
 	"github.com/apache/incubator-answer/pkg/display"
@@ -253,6 +254,11 @@ func (ns *NotificationCommon) syncNotificationToPlugin(ctx context.Context, objI
 		log.Errorf("get site seo info failed: %v", err)
 		return
 	}
+	interfaceInfo, err := ns.siteInfoService.GetSiteInterface(ctx)
+	if err != nil {
+		log.Errorf("get site interface info failed: %v", err)
+		return
+	}
 
 	objInfo.QuestionID = uid.DeShortID(objInfo.QuestionID)
 	objInfo.AnswerID = uid.DeShortID(objInfo.AnswerID)
@@ -294,6 +300,10 @@ func (ns *NotificationCommon) syncNotificationToPlugin(ctx context.Context, objI
 		if userInfo != nil {
 			pluginNotificationMsg.ReceiverLang = userInfo.Language
 		}
+		// If receiver not set language, use site default language.
+		if len(pluginNotificationMsg.ReceiverLang) == 0 || pluginNotificationMsg.ReceiverLang == translator.DefaultLangOption {
+			pluginNotificationMsg.ReceiverLang = interfaceInfo.Language
+		}
 	}
 
 	_ = plugin.CallNotification(func(fn plugin.Notification) error {

From f9a93e2efea182bcdc67abd635d9b081501ef06c Mon Sep 17 00:00:00 2001
From: hgaol <dhangao@hotmail.com>
Date: Wed, 13 Mar 2024 10:09:49 +0800
Subject: [PATCH 058/114] fix: not changing rank for newly registered user when
 changing mail

---
 internal/service/user_service.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/internal/service/user_service.go b/internal/service/user_service.go
index c6d98fc2..bcac08ad 100644
--- a/internal/service/user_service.go
+++ b/internal/service/user_service.go
@@ -23,9 +23,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/service/user_notification_config"
-	"time"
 
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/reason"
@@ -644,6 +645,12 @@ func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string
 	if err != nil {
 		return nil, err
 	}
+	// if email status is to be verified, active user as well
+	if userInfo.MailStatus == entity.EmailStatusToBeVerified {
+		if err = us.userActivity.UserActive(ctx, userInfo.ID); err != nil {
+			log.Error(err)
+		}
+	}
 
 	roleID, err := us.userRoleService.GetUserRole(ctx, userInfo.ID)
 	if err != nil {

From 1b7618f25b233a28eff75147c21952d6d5bf3104 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 10:01:05 +0800
Subject: [PATCH 059/114] fix(notification): update question and answer count
 amount after reviewing

---
 internal/service/review/review_service.go | 30 ++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 3f77f68c..217a8877 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -200,7 +200,7 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 	objectType := constant.ObjectTypeNumberMapping[review.ObjectType]
 	switch objectType {
 	case constant.QuestionObjectType:
-		question, exist, err := cs.questionRepo.GetQuestion(ctx, review.ObjectID)
+		questionInfo, exist, err := cs.questionRepo.GetQuestion(ctx, review.ObjectID)
 		if err != nil {
 			return err
 		}
@@ -208,20 +208,29 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 			return errors.BadRequest(reason.ObjectNotFound)
 		}
 		if isApprove {
-			question.Status = entity.QuestionStatusAvailable
+			questionInfo.Status = entity.QuestionStatusAvailable
 		} else {
-			question.Status = entity.QuestionStatusDeleted
+			questionInfo.Status = entity.QuestionStatusDeleted
 		}
-		if err := cs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status); err != nil {
+		if err := cs.questionRepo.UpdateQuestionStatus(ctx, questionInfo.ID, questionInfo.Status); err != nil {
 			return err
 		}
 		if isApprove {
-			tags, err := cs.tagCommon.GetObjectEntityTag(ctx, question.ID)
+			tags, err := cs.tagCommon.GetObjectEntityTag(ctx, questionInfo.ID)
 			if err != nil {
 				log.Errorf("get question tags failed, err: %v", err)
 			}
 			cs.externalNotificationQueueService.Send(ctx,
-				schema.CreateNewQuestionNotificationMsg(question.ID, question.Title, question.UserID, tags))
+				schema.CreateNewQuestionNotificationMsg(questionInfo.ID, questionInfo.Title, questionInfo.UserID, tags))
+		}
+		userQuestionCount, err := cs.questionRepo.GetUserQuestionCount(ctx, questionInfo.UserID)
+		if err != nil {
+			log.Errorf("get user question count failed, err: %v", err)
+		} else {
+			err = cs.userCommon.UpdateQuestionCount(ctx, questionInfo.UserID, userQuestionCount)
+			if err != nil {
+				log.Errorf("update user question count failed, err: %v", err)
+			}
 		}
 	case constant.AnswerObjectType:
 		answerInfo, exist, err := cs.answerRepo.GetAnswer(ctx, review.ObjectID)
@@ -250,6 +259,15 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 			cs.notificationAnswerTheQuestion(ctx, questionInfo.UserID, questionInfo.ID, answerInfo.ID,
 				answerInfo.UserID, questionInfo.Title, answerInfo.OriginalText)
 		}
+		userAnswerCount, err := cs.answerRepo.GetCountByUserID(ctx, answerInfo.UserID)
+		if err != nil {
+			log.Errorf("get user answer count failed, err: %v", err)
+		} else {
+			err = cs.userCommon.UpdateAnswerCount(ctx, answerInfo.UserID, int(userAnswerCount))
+			if err != nil {
+				log.Errorf("update user answer count failed, err: %v", err)
+			}
+		}
 	}
 	return
 }

From 7606940a9068fe2b3bca87e10ab3e3371ae54905 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 10:06:41 +0800
Subject: [PATCH 060/114] Feat/1.3.0/UI (#840)

---
 i18n/en_US.yaml                               |  36 +-
 i18n/zh_CN.yaml                               |  13 +-
 internal/controller/template_controller.go    |  19 +-
 ui/config-overrides.js                        |  96 +++++
 ui/package.json                               |   4 +-
 ui/pnpm-lock.yaml                             | 100 +++--
 ui/src/common/constants.ts                    |  17 +-
 ui/src/common/interface.ts                    |  87 +++-
 .../Comment/components/Form/index.tsx         |   7 +-
 ui/src/components/Comment/index.tsx           |   2 +-
 ui/src/components/SchemaForm/index.tsx        |   2 +-
 ui/src/hooks/usePageUsers/index.tsx           |   2 +-
 ui/src/hooks/useReportModal/index.tsx         |  28 +-
 ui/src/i18n/init.ts                           |   8 +-
 .../Admin/Answers/components/Action/index.tsx |  12 +
 ui/src/pages/Admin/Answers/index.tsx          |  24 +-
 .../components/AnswerLinks/index.tsx          |  16 +-
 .../components/HealthStatus/index.tsx         |   4 +-
 .../Dashboard/components/Statistics/index.tsx |   2 +-
 ui/src/pages/Admin/Flags/index.tsx            | 186 ---------
 .../Questions/components/Action/index.tsx     |  12 +
 ui/src/pages/Admin/Questions/index.tsx        |  13 +-
 ui/src/pages/Admin/index.tsx                  |   2 +-
 .../Ask/components/SearchQuestion/index.tsx   |   6 +-
 ui/src/pages/Questions/Ask/index.tsx          |   3 +-
 .../components/ApproveDropdown/index.tsx      | 202 ++++++++++
 .../components/EditPostModal/index.scss       |   4 +
 .../Review/components/EditPostModal/index.tsx | 375 ++++++++++++++++++
 .../Review/components/FlagContent/index.tsx   | 210 ++++++++++
 .../Review/components/QueuedContent/index.tsx | 203 ++++++++++
 .../Review/components/ReviewType/index.tsx    |  40 ++
 .../components/SuggestContent/index.tsx       | 238 +++++++++++
 ui/src/pages/Review/components/index.ts       |  15 +
 ui/src/pages/Review/index.tsx                 | 276 ++++---------
 ui/src/pages/Review/utils/generateData.ts     |  58 +++
 .../components/Achievements/index.tsx         |   2 +-
 .../Notifications/components/Inbox/index.tsx  |   2 +-
 .../pages/Users/Settings/Interface/index.tsx  |   3 +-
 ui/src/router/pathFactory.ts                  |   2 +-
 ui/src/router/routes.ts                       |   5 -
 ui/src/services/client/index.ts               |   1 +
 ui/src/services/client/review.ts              |  52 +++
 ui/src/services/client/revision.ts            |   6 -
 ui/src/utils/common.ts                        |  49 ++-
 ui/src/utils/saveDraft.ts                     |   2 +-
 ui/template/header.html                       |   4 +-
 46 files changed, 1922 insertions(+), 528 deletions(-)
 delete mode 100644 ui/src/pages/Admin/Flags/index.tsx
 create mode 100644 ui/src/pages/Review/components/ApproveDropdown/index.tsx
 create mode 100644 ui/src/pages/Review/components/EditPostModal/index.scss
 create mode 100644 ui/src/pages/Review/components/EditPostModal/index.tsx
 create mode 100644 ui/src/pages/Review/components/FlagContent/index.tsx
 create mode 100644 ui/src/pages/Review/components/QueuedContent/index.tsx
 create mode 100644 ui/src/pages/Review/components/ReviewType/index.tsx
 create mode 100644 ui/src/pages/Review/components/SuggestContent/index.tsx
 create mode 100644 ui/src/pages/Review/components/index.ts
 create mode 100644 ui/src/pages/Review/utils/generateData.ts
 create mode 100644 ui/src/services/client/review.ts

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 18312e5e..61af80e1 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1169,6 +1169,15 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: post
+    filter: Filter
+    ignore: Ignore
+    submit: Submit
+    normal: Normal
+    closed: Closed
+    deleted: Deleted
+    pending: Pending
   search:
     title: Search Results
     keywords: Keywords
@@ -1444,6 +1453,7 @@ ui:
       github: GitHub
       blog: Blog
       contact: Contact
+      forum: Forum
       documents: Documents
       feedback: Feedback
       support: Support
@@ -1546,9 +1556,6 @@ ui:
         content: A suspended user can't log in.
     questions:
       page_title: Questions
-      normal: Normal
-      closed: Closed
-      deleted: Deleted
       unlisted: Unlisted
       post: Post
       votes: Votes
@@ -1557,12 +1564,11 @@ ui:
       status: Status
       action: Action
       change: Change
+      pending: Pending
       filter:
         placeholder: "Filter by title, question:id"
     answers:
       page_title: Answers
-      normal: Normal
-      deleted: Deleted
       post: Post
       votes: Votes
       created: Created
@@ -1676,8 +1682,8 @@ ui:
       page_title: Write
       restrict_answer:
         title: Restrict answer
-        label: Each user can only write one answer for each question
-        text: "They can use the edit link to refine and improve their existing answer, instead."
+        label: Each user can only write one answer for the same question
+        text: "Turn off to allow users to write multiple answers to the same question, which may cause answers to be unfocused."
       recommend_tags:
         label: Recommend tags
         text: "Please input tag slug above, one tag per line."
@@ -1811,6 +1817,22 @@ ui:
     edit_answer: Edit answer
     edit_tag: Edit tag
     empty: No review tasks left.
+    approve_revision_tip: Do you approve this revision?
+    approve_flag_tip: Do you approve this flag?
+    approve_post_tip: Do you approve this post?
+    approve_user_tip: Do you approve this user?
+    suggest_edits: Suggested edits
+    flag_post: Flag post
+    flag_user: Flag user
+    queued_post: Queued post
+    queued_user: Queued user
+    filter_label: Type
+    reputation: reputation
+    flag_post_type: Flagged this post as {{ type }}
+    flag_user_type: Flagged this user as {{ type }}
+    edit_post: Edit post
+    list_post: List post
+    unlist_post: Unlist post
   timeline:
     undeleted: undeleted
     deleted: deleted
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index 01bc07b9..cdabc86f 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -1133,6 +1133,15 @@ ui:
     system_setting: System setting
     default: Default
     reset: Reset
+    tag: Tag
+    post_lowercase: 帖子
+    filter: Filter
+    ignore: 忽略
+    submit: 提交
+    normal: 正常
+    closed: 已关闭
+    deleted: 已删除
+    pending: Pending
   search:
     title: 搜索结果
     keywords: 关键词
@@ -1631,8 +1640,8 @@ ui:
       page_title: 编辑
       restrict_answer:
         title: 限制一个回答
-        label: 每个用户对于每个问题只能有一个回答
-        text: "用户可以使用编辑按钮优化已有的回答"
+        label: 每个用户只能为同一问题写一个回答
+        text: "关闭以允许用户对同一问题编写多个回答，这可能会导致回答不集中。"
       recommend_tags:
         label: 推荐标签
         text: "请在上方输入标签固定链接，每行一个标签。"
diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go
index 6b4c4bbe..b128b91a 100644
--- a/internal/controller/template_controller.go
+++ b/internal/controller/template_controller.go
@@ -22,7 +22,6 @@ package controller
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/apache/incubator-answer/internal/entity"
 	"html/template"
 	"net/http"
 	"regexp"
@@ -32,6 +31,7 @@ import (
 	"github.com/apache/incubator-answer/internal/base/constant"
 	"github.com/apache/incubator-answer/internal/base/handler"
 	templaterender "github.com/apache/incubator-answer/internal/controller/template_render"
+	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	"github.com/apache/incubator-answer/pkg/checker"
@@ -47,7 +47,7 @@ import (
 var SiteUrl = ""
 
 type TemplateController struct {
-	scriptPath               string
+	scriptPath               []string
 	cssPath                  string
 	templateRenderController *templaterender.TemplateRenderController
 	siteInfoService          siteinfo_common.SiteInfoCommonService
@@ -66,18 +66,21 @@ func NewTemplateController(
 		siteInfoService:          siteInfoService,
 	}
 }
-func GetStyle() (script, css string) {
+func GetStyle() (script []string, css string) {
 	file, err := ui.Build.ReadFile("build/index.html")
 	if err != nil {
 		return
 	}
-	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="(.*)"></script>`)
-	scriptData := scriptRegexp.FindStringSubmatch(string(file))
+	scriptRegexp := regexp.MustCompile(`<script defer="defer" src="([^"]*)"></script>`)
+	scriptData := scriptRegexp.FindAllStringSubmatch(string(file), -1)
+	for _, s := range scriptData {
+		if len(s) == 2 {
+			script = append(script, s[1])
+		}
+	}
+
 	cssRegexp := regexp.MustCompile(`<link href="(.*)" rel="stylesheet">`)
 	cssListData := cssRegexp.FindStringSubmatch(string(file))
-	if len(scriptData) == 2 {
-		script = scriptData[1]
-	}
 	if len(cssListData) == 2 {
 		css = cssListData[1]
 	}
diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 293d6bc1..0df95a9b 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -20,6 +20,7 @@
 const {
   addWebpackModuleRule,
   addWebpackAlias,
+  setWebpackOptimizationSplitChunks,
 } = require("customize-cra");
 
 const path = require("path");
@@ -37,6 +38,101 @@ module.exports = {
       use: "yaml-loader"
     })(config);
 
+    setWebpackOptimizationSplitChunks({
+      maxInitialRequests: 20,
+      minSize: 20 * 1024,
+      minChunks: 2,
+      cacheGroups: {
+        automaticNamePrefix: 'chunk',
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 14,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        i18next: {
+          name: 'i18next',
+          test: /[\/]node_modules[\/](i18next)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 12,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        reactBootstrap: {
+          name: 'react-bootstrap',
+          test: /[\/]node_modules[\/](react-bootstrap)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 11,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+        lodash: {
+          name: 'lodash',
+          test: /[\/]node_modules[\/](lodash)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 10,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        codemirror: {
+          name: 'codemirror',
+          test: /[\/]node_modules[\/](codemirror)[\/]/,
+          priority: 9,
+          reuseExistingChunk: true,
+          enforce: true,
+        },
+        nextShare: {
+          name: 'next-share',
+          test: /[\/]node_modules[\/](next-share)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 8,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        marked: {
+          name: 'marked',
+          test: /[\/]node_modules[\/](marked)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          minChunks: 1,
+          chunks: 'initial',
+        },
+        reactDom: {
+          name: 'react-dom',
+          test: /[\/]node_modules[\/](react-dom)[\/]/,
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          priority: 7,
+          reuseExistingChunk: true,
+          chunks: 'all',
+          enforce: true,
+        },
+        nodesAsync: {
+          name: 'chunk-nodesAsync',
+          test: /[\/]node_modules[\/]/,
+          priority: 2,
+          minChunks: 2,
+          chunks: 'async', // 仅打包异步引用的依赖
+          reuseExistingChunk: true, // 重复使用已经存在的块
+        },
+        nodesInitial: {
+          name: 'chunk-nodesInitial',
+          filename: 'static/js/[name].[contenthash:8].chunk.js',
+          test: /[\/]node_modules[\/]/,
+          priority: 1,
+          minChunks: 1,
+          chunks: 'initial',
+          reuseExistingChunk: true,
+        },
+      },
+    })(config);
+
     // add i18n dir to ModuleScopePlugin allowedPaths
     const moduleScopePlugin = config.resolve.plugins.find(_ => _.constructor.name === "ModuleScopePlugin");
     if (moduleScopePlugin) {
diff --git a/ui/package.json b/ui/package.json
index ac7e4411..63a1f85d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -12,7 +12,8 @@
     "prepare": "pnpm build:packages",
     "pre-commit": "lint-staged",
     "build:packages": "pnpm -r --filter=./src/plugins/* run build",
-    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules"
+    "clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules",
+    "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "dependencies": {
     "axios": "^0.27.2",
@@ -82,6 +83,7 @@
     "react-app-rewired": "^2.2.1",
     "react-scripts": "5.0.1",
     "sass": "^1.54.4",
+    "source-map-explorer": "^2.5.3",
     "typescript": "^4.9.5",
     "yaml-loader": "^0.8.0"
   },
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
index 77f3c9b1..83bdc9e2 100644
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 lockfileVersion: '6.0'
 
 settings:
@@ -221,6 +204,9 @@ importers:
       sass:
         specifier: ^1.54.4
         version: 1.54.9
+      source-map-explorer:
+        specifier: ^2.5.3
+        version: 2.5.3
       typescript:
         specifier: ^4.9.5
         version: 4.9.5
@@ -2223,7 +2209,7 @@ packages:
       chalk: 4.1.2
       emittery: 0.8.1
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-changed-files: 27.5.1
       jest-config: 27.5.1(ts-node@10.9.1)
       jest-haste-map: 27.5.1
@@ -2295,7 +2281,7 @@ packages:
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       istanbul-lib-coverage: 3.2.0
       istanbul-lib-instrument: 5.2.0
       istanbul-lib-report: 3.0.0
@@ -2324,7 +2310,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       callsites: 3.1.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       source-map: 0.6.1
 
   /@jest/test-result@27.5.1:
@@ -2350,7 +2336,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/test-result': 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-runtime: 27.5.1
     transitivePeerDependencies:
@@ -4550,6 +4536,12 @@ packages:
     dependencies:
       node-int64: 0.4.0
 
+  /btoa@1.2.1:
+    resolution: {integrity: sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==}
+    engines: {node: '>= 0.4.0'}
+    hasBin: true
+    dev: true
+
   /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -5914,7 +5906,7 @@ packages:
     resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
     engines: {node: '>=10.13.0'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       tapable: 2.2.1
 
   /enhanced-resolve@5.15.0:
@@ -7899,7 +7891,7 @@ packages:
       '@jest/types': 27.5.1
       chalk: 4.1.2
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       import-local: 3.1.0
       jest-config: 27.5.1(ts-node@10.9.1)
       jest-util: 27.5.1
@@ -7930,7 +7922,7 @@ packages:
       ci-info: 3.4.0
       deepmerge: 4.2.2
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-circus: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -8034,7 +8026,7 @@ packages:
       '@types/node': 16.11.59
       anymatch: 3.1.2
       fb-watchman: 2.0.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-regex-util: 27.5.1
       jest-serializer: 27.5.1
       jest-util: 27.5.1
@@ -8102,7 +8094,7 @@ packages:
       '@jest/types': 27.5.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 27.5.1
       slash: 3.0.0
@@ -8185,7 +8177,7 @@ packages:
       '@types/node': 16.11.59
       chalk: 4.1.2
       emittery: 0.8.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-docblock: 27.5.1
       jest-environment-jsdom: 27.5.1
       jest-environment-node: 27.5.1
@@ -8220,7 +8212,7 @@ packages:
       collect-v8-coverage: 1.0.1
       execa: 5.1.1
       glob: 7.2.3
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
@@ -8238,7 +8230,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@types/node': 16.11.59
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jest-snapshot@27.5.1:
     resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
@@ -8256,7 +8248,7 @@ packages:
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.19.1)
       chalk: 4.1.2
       expect: 27.5.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-diff: 27.5.1
       jest-get-type: 27.5.1
       jest-haste-map: 27.5.1
@@ -8277,7 +8269,7 @@ packages:
       '@types/node': 16.11.59
       chalk: 4.1.2
       ci-info: 3.4.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       picomatch: 2.3.1
 
   /jest-util@28.1.3:
@@ -8483,7 +8475,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /jsonp@0.2.1:
     resolution: {integrity: sha512-pfog5gdDxPdV4eP7Kg87M8/bHgshlZ5pybl+yKxAnCZ5O7lCIn7Ixydj03wOlnDQesky2BPyA91SQ+5Y/mNwzw==}
@@ -9153,6 +9145,14 @@ packages:
       mimic-fn: 4.0.0
     dev: true
 
+  /open@7.4.2:
+    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
+    engines: {node: '>=8'}
+    dependencies:
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+    dev: true
+
   /open@8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
@@ -10792,6 +10792,13 @@ packages:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
     dev: true
 
+  /rimraf@2.6.3:
+    resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    hasBin: true
+    dependencies:
+      glob: 7.2.3
+    dev: true
+
   /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
@@ -11151,6 +11158,25 @@ packages:
   /source-list-map@2.0.1:
     resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
 
+  /source-map-explorer@2.5.3:
+    resolution: {integrity: sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    dependencies:
+      btoa: 1.2.1
+      chalk: 4.1.2
+      convert-source-map: 1.8.0
+      ejs: 3.1.8
+      escape-html: 1.0.3
+      glob: 7.2.3
+      gzip-size: 6.0.0
+      lodash: 4.17.21
+      open: 7.4.2
+      source-map: 0.7.4
+      temp: 0.9.4
+      yargs: 16.2.0
+    dev: true
+
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -11593,6 +11619,14 @@ packages:
     resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
     engines: {node: '>=8'}
 
+  /temp@0.9.4:
+    resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      mkdirp: 0.5.6
+      rimraf: 2.6.3
+    dev: true
+
   /tempy@0.6.0:
     resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==}
     engines: {node: '>=10'}
@@ -12184,7 +12218,7 @@ packages:
     engines: {node: '>=10.13.0'}
     dependencies:
       glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
 
   /wbuf@1.7.3:
     resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.ts
index ec7f1ba6..92944f83 100644
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@ -55,6 +55,11 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
+  // pending
+  11: {
+    variant: 'text-bg-warning',
+    name: 'pending',
+  },
   normal: {
     variant: 'text-bg-success',
     name: 'normal',
@@ -67,9 +72,13 @@ export const ADMIN_LIST_STATUS = {
     variant: 'text-bg-danger',
     name: 'deleted',
   },
-  unlisted: {
+  pending: {
+    variant: 'text-bg-warning',
+    name: 'pending',
+  },
+  unlist: {
     variant: 'text-bg-secondary',
-    name: 'unlisted',
+    name: 'unlist',
   },
 };
 
@@ -85,10 +94,6 @@ export const ADMIN_NAV_MENUS = [
   {
     name: 'users',
   },
-  {
-    name: 'flags',
-    // badgeContent: 5,
-  },
   {
     name: 'customize',
     children: [
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 65117ae1..86c87798 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -56,6 +56,7 @@ export interface TagBase {
 export interface Tag extends TagBase {
   main_tag_slug_name?: string;
   parsed_text?: string;
+  tag_id?: string;
 }
 
 export interface SynonymsTag extends Tag {
@@ -299,9 +300,13 @@ export interface QueryQuestionsReq extends Paging {
   in_days?: number;
 }
 
-export type AdminQuestionStatus = 'available' | 'closed' | 'deleted';
+export type AdminQuestionStatus =
+  | 'available'
+  | 'pending'
+  | 'closed'
+  | 'deleted';
 
-export type AdminContentsFilterBy = 'normal' | 'closed' | 'deleted';
+export type AdminContentsFilterBy = 'normal' | 'pending' | 'closed' | 'deleted';
 
 export interface AdminContentsReq extends Paging {
   status: AdminContentsFilterBy;
@@ -563,7 +568,7 @@ export interface TimelineRes {
   timeline: TimelineItem[];
 }
 
-export interface ReviewItem {
+export interface SuggestReviewItem {
   type: 'question' | 'answer' | 'tag';
   info: {
     url_title?: string;
@@ -585,9 +590,57 @@ export interface ReviewItem {
     content: Tag | QuestionDetailRes | AnswerItem;
   };
 }
-export interface ReviewResp {
+export interface SuggestReviewResp {
   count: number;
-  list: ReviewItem[];
+  list: SuggestReviewItem[];
+}
+
+export interface ReasonItem {
+  content_type: string;
+  description: string;
+  name: string;
+  placeholder: string;
+  reason_type: number;
+}
+
+export interface BaseReviewItem {
+  object_type: 'question' | 'answer' | 'comment' | 'user';
+  object_id: string;
+  object_show_status: number;
+  object_status: number;
+  tags: Tag[];
+  title: string;
+  original_text: string;
+  author_user_info: UserInfoBase;
+  created_at: number;
+  submit_at: number;
+  comment_id: string;
+  question_id: string;
+  answer_id: string;
+  answer_count: number;
+  answer_accepted?: boolean;
+  flag_id: string;
+}
+
+export interface FlagReviewItem extends BaseReviewItem {
+  reason: ReasonItem;
+  submitter_user: UserInfoBase;
+}
+
+export interface FlagReviewResp {
+  count: number;
+  list: FlagReviewItem[];
+}
+
+export interface QueuedReviewItem extends BaseReviewItem {
+  review_id: number;
+  reason: string;
+  submitter_display_name: string;
+}
+
+export interface QueuedReviewResp {
+  count: number;
+  list: QueuedReviewItem[];
 }
 
 export interface UserRoleItem {
@@ -639,3 +692,27 @@ export interface UserPluginsConfigRes {
   name: string;
   slug_name: string;
 }
+
+export interface ReviewTypeItem {
+  label: string;
+  name: string;
+  todo_amount: number;
+}
+
+export interface PutFlagReviewParams {
+  operation_type:
+    | 'edit_post'
+    | 'close_post'
+    | 'delete_post'
+    | 'unlist_post'
+    | 'ignore_report';
+  flag_id: string;
+  close_msg?: string;
+  close_type?: number;
+  title?: string;
+  content?: string;
+  tags?: Tag[];
+  // mention_username_list?: any;
+  captcha_code?: any;
+  captcha_id?: any;
+}
diff --git a/ui/src/components/Comment/components/Form/index.tsx b/ui/src/components/Comment/components/Form/index.tsx
index 8809778c..05ae5b2d 100644
--- a/ui/src/components/Comment/components/Form/index.tsx
+++ b/ui/src/components/Comment/components/Form/index.tsx
@@ -25,6 +25,7 @@ import classNames from 'classnames';
 
 import { TextArea, Mentions } from '@/components';
 import { usePageUsers, usePromptWithUnload } from '@/hooks';
+import { parseEditMentionUser } from '@/utils';
 
 const Index = ({
   className = '',
@@ -78,7 +79,11 @@ const Index = ({
           <Mentions
             pageUsers={pageUsers.getUsers()}
             onSelected={handleSelected}>
-            <TextArea size="sm" value={value} onChange={handleChange} />
+            <TextArea
+              size="sm"
+              value={type === 'edit' ? parseEditMentionUser(value) : value}
+              onChange={handleChange}
+            />
           </Mentions>
           <div className="form-text">{t(`tip_${mode}`)}</div>
         </div>
diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index be2d5553..81345e7e 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -23,7 +23,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
 import classNames from 'classnames';
-import { unionBy } from 'lodash';
+import unionBy from 'lodash/unionBy';
 
 import * as Types from '@/common/interface';
 import { Modal } from '@/components';
diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index 2bb91e31..d0afb692 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -26,7 +26,7 @@ import React, {
 import { Form, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import classnames from 'classnames';
 
 import type * as Type from '@/common/interface';
diff --git a/ui/src/hooks/usePageUsers/index.tsx b/ui/src/hooks/usePageUsers/index.tsx
index 9db172da..c0b3836e 100644
--- a/ui/src/hooks/usePageUsers/index.tsx
+++ b/ui/src/hooks/usePageUsers/index.tsx
@@ -19,7 +19,7 @@
 
 import { useState } from 'react';
 
-import { uniqBy } from 'lodash';
+import uniqBy from 'lodash/uniqBy';
 
 import * as Types from '@/common/interface';
 
diff --git a/ui/src/hooks/useReportModal/index.tsx b/ui/src/hooks/useReportModal/index.tsx
index 9ad66513..88cd2442 100644
--- a/ui/src/hooks/useReportModal/index.tsx
+++ b/ui/src/hooks/useReportModal/index.tsx
@@ -25,7 +25,13 @@ import ReactDOM from 'react-dom/client';
 
 import { useToast, useCaptchaModal } from '@/hooks';
 import type * as Type from '@/common/interface';
-import { reportList, postReport, closeQuestion, putReport } from '@/services';
+import {
+  reportList,
+  postReport,
+  closeQuestion,
+  putReport,
+  putFlagReviewAction,
+} from '@/services';
 
 interface Params {
   isBackend?: boolean;
@@ -33,6 +39,7 @@ interface Params {
   id: string;
   title?: string;
   action: Type.ReportAction;
+  source?: string;
 }
 
 const useReportModal = (callback?: () => void) => {
@@ -63,7 +70,12 @@ const useReportModal = (callback?: () => void) => {
     rootRef.current.root = ReactDOM.createRoot(div);
   }, []);
   const getList = ({ type, action, isBackend }: Params) => {
-    reportList({ type, action, isBackend }).then((res) => {
+    // @ts-ignore
+    reportList({
+      type,
+      action,
+      isBackend,
+    }).then((res) => {
       setList(res);
       setShow(true);
     });
@@ -113,6 +125,18 @@ const useReportModal = (callback?: () => void) => {
       return;
     }
     if (params.type === 'question' && params.action === 'close') {
+      if (params?.source === 'review') {
+        putFlagReviewAction({
+          flag_id: params.id,
+          operation_type: 'close_post',
+          close_type: reportType.type,
+          close_msg: content.value,
+        }).then(() => {
+          onClose();
+          asyncCallback();
+        });
+        return;
+      }
       closeQuestion({
         id: params.id,
         close_type: reportType.type,
diff --git a/ui/src/i18n/init.ts b/ui/src/i18n/init.ts
index 03f775cb..66d9576e 100644
--- a/ui/src/i18n/init.ts
+++ b/ui/src/i18n/init.ts
@@ -21,7 +21,7 @@ import { initReactI18next } from 'react-i18next';
 
 import i18next from 'i18next';
 import en_US from '@i18n/en_US.yaml';
-import zh_CN from '@i18n/zh_CN.yaml';
+// import zh_CN from '@i18n/zh_CN.yaml';
 
 import { DEFAULT_LANG, LANG_RESOURCE_STORAGE_KEY } from '@/common/constants';
 import Storage from '@/utils/storage';
@@ -34,9 +34,9 @@ const initResources = {
   en_US: {
     translation: en_US.ui,
   },
-  zh_CN: {
-    translation: zh_CN.ui,
-  },
+  // zh_CN: {
+  //   translation: zh_CN.ui,
+  // },
 };
 
 const storageLang = Storage.get(LANG_RESOURCE_STORAGE_KEY);
diff --git a/ui/src/pages/Admin/Answers/components/Action/index.tsx b/ui/src/pages/Admin/Answers/components/Action/index.tsx
index 7f34f219..c4308cd2 100644
--- a/ui/src/pages/Admin/Answers/components/Action/index.tsx
+++ b/ui/src/pages/Admin/Answers/components/Action/index.tsx
@@ -19,6 +19,7 @@
 
 import { Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { Icon, Modal } from '@/components';
 import { changeAnswerStatus } from '@/services';
@@ -58,6 +59,17 @@ const AnswerActions = ({ itemData, curFilter, refreshList }) => {
     }
   };
 
+  if (curFilter === 'pending') {
+    return (
+      <Link
+        to={`/review?type=queued_post&objectId=${itemData.id}`}
+        className="btn btn-link p-0"
+        title={t('review', { keyPrefix: 'header.nav' })}>
+        <Icon name="three-dots-vertical" />
+      </Link>
+    );
+  }
+
   return (
     <Dropdown>
       <Dropdown.Toggle variant="link" className="no-toggle p-0">
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index 869bec9a..a653f7f5 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -40,7 +40,11 @@ import { pathFactory } from '@/router/pathFactory';
 
 import AnswerAction from './components/Action';
 
-const answerFilterItems: Type.AdminContentsFilterBy[] = ['normal', 'deleted'];
+const answerFilterItems: Type.AdminContentsFilterBy[] = [
+  'normal',
+  'pending',
+  'deleted',
+];
 
 const Answers: FC = () => {
   const [urlSearchParams, setUrlSearchParams] = useSearchParams();
@@ -77,7 +81,7 @@ const Answers: FC = () => {
           data={answerFilterItems}
           currentSort={curFilter}
           sortKey="status"
-          i18nKeyPrefix="admin.answers"
+          i18nKeyPrefix="btns"
         />
 
         <Form.Control
@@ -118,13 +122,13 @@ const Answers: FC = () => {
                         className="text-break text-wrap"
                         rel="noreferrer">
                         {li.question_info.title}
+                        {li.accepted === 2 && (
+                          <Icon
+                            name="check-circle-fill"
+                            className="ms-2 text-success"
+                          />
+                        )}
                       </a>
-                      {li.accepted === 2 && (
-                        <Icon
-                          name="check-circle-fill"
-                          className="ms-2 text-success"
-                        />
-                      )}
                     </Stack>
                     <div
                       className="text-truncate-2 small"
@@ -150,7 +154,9 @@ const Answers: FC = () => {
                       'badge',
                       ADMIN_LIST_STATUS[curFilter]?.variant,
                     )}>
-                    {t(ADMIN_LIST_STATUS[curFilter]?.name)}
+                    {t(ADMIN_LIST_STATUS[curFilter]?.name, {
+                      keyPrefix: 'btns',
+                    })}
                   </span>
                 </td>
                 <td className="text-end">
diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
index b2a04ffa..39a803b0 100644
--- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
@@ -45,16 +45,16 @@ const AnswerLinks = () => {
             </a>
           </Col>
           <Col xs={6}>
-            <a href="https://meta.answer.dev" target="_blank" rel="noreferrer">
+            <a
+              href="https://answer.apache.org/community"
+              target="_blank"
+              rel="noreferrer">
               {t('support')}
             </a>
           </Col>
           <Col xs={6}>
-            <a
-              href="https://github.com/apache/incubator-answer"
-              target="_blank"
-              rel="noreferrer">
-              {t('github')}
+            <a href="https://meta.answer.dev" target="_blank" rel="noreferrer">
+              {t('forum')}
             </a>
           </Col>
           <Col xs={6}>
@@ -67,10 +67,10 @@ const AnswerLinks = () => {
           </Col>
           <Col xs={6}>
             <a
-              href="https://answer.apache.org/contact"
+              href="https://github.com/apache/incubator-answer"
               target="_blank"
               rel="noreferrer">
-              {t('contact')}
+              {t('github')}
             </a>
           </Col>
         </Row>
diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
index 64122669..36690198 100644
--- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx
@@ -93,7 +93,9 @@ const HealthStatus: FC<IProps> = ({ data }) => {
           </Col>
           <Col xs={6}>
             <span className="text-secondary me-1">{t('timezone')}</span>
-            <strong>{data.time_zone.split('/')?.[1]}</strong>
+            <strong>
+              {data.time_zone.split('/')?.[1].replaceAll('_', ' ')}
+            </strong>
           </Col>
           <Col xs={6}>
             <span className="text-secondary me-1">{t('smtp')}</span>
diff --git a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
index 85262724..d0f5f410 100644
--- a/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/Statistics/index.tsx
@@ -58,7 +58,7 @@ const Statistics: FC<IProps> = ({ data }) => {
           <Col xs={6}>
             <span className="text-secondary me-1">{t('flags')}</span>
             <strong>
-              <Link to="/admin/flags" className="ms-2">
+              <Link to="/review?type=flagged_post" className="ms-2">
                 {data.report_count}
               </Link>
             </strong>
diff --git a/ui/src/pages/Admin/Flags/index.tsx b/ui/src/pages/Admin/Flags/index.tsx
deleted file mode 100644
index 73f32113..00000000
--- a/ui/src/pages/Admin/Flags/index.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { FC } from 'react';
-import { Button, Form, Table, Stack } from 'react-bootstrap';
-import { useSearchParams } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-
-import {
-  FormatTime,
-  BaseUserCard,
-  Empty,
-  Pagination,
-  QueryGroup,
-} from '@/components';
-import { useReportModal } from '@/hooks';
-import * as Type from '@/common/interface';
-import { useFlagSearch } from '@/services';
-import { escapeRemove } from '@/utils';
-import { pathFactory } from '@/router/pathFactory';
-
-const flagFilterKeys: Type.FlagStatus[] = ['pending', 'completed'];
-const flagTypeKeys: Type.FlagType[] = ['all', 'question', 'answer', 'comment'];
-
-const Flags: FC = () => {
-  const { t } = useTranslation('translation', { keyPrefix: 'admin.flags' });
-  const [urlSearchParams, setUrlSearchParams] = useSearchParams();
-  const curFilter = urlSearchParams.get('status') || flagFilterKeys[0];
-  const curType = urlSearchParams.get('type') || flagTypeKeys[0];
-  const PAGE_SIZE = 20;
-  const curPage = Number(urlSearchParams.get('page')) || 1;
-  const {
-    data: listData,
-    isLoading,
-    mutate: refreshList,
-  } = useFlagSearch({
-    page_size: PAGE_SIZE,
-    page: curPage,
-    status: curFilter as Type.FlagStatus,
-    object_type: curType as Type.FlagType,
-  });
-  const reportModal = useReportModal(refreshList);
-
-  const count = listData?.count || 0;
-
-  const onTypeChange = (evt) => {
-    urlSearchParams.set('type', evt.target.value);
-    setUrlSearchParams(urlSearchParams);
-  };
-
-  const handleReview = ({ id, object_type }) => {
-    reportModal.onShow({
-      id,
-      type: object_type,
-      isBackend: true,
-      action: 'review',
-    });
-  };
-
-  return (
-    <>
-      <h3 className="mb-4">{t('title')}</h3>
-      <div className="d-flex justify-content-between align-items-center mb-3">
-        <QueryGroup
-          data={flagFilterKeys}
-          currentSort={curFilter}
-          sortKey="status"
-          i18nKeyPrefix="admin.flags"
-        />
-
-        <Form.Select
-          value={curType}
-          onChange={onTypeChange}
-          size="sm"
-          style={{ width: '12.25rem' }}>
-          {flagTypeKeys.map((li) => {
-            return (
-              <option value={li} key={li}>
-                {t(li, { keyPrefix: 'btns' })}
-              </option>
-            );
-          })}
-        </Form.Select>
-      </div>
-      <Table>
-        <thead>
-          <tr>
-            <th>{t('flagged')}</th>
-            <th style={{ width: '20%' }}>{t('created')}</th>
-            {curFilter !== 'completed' ? (
-              <th style={{ width: '20%' }}>{t('action')}</th>
-            ) : null}
-          </tr>
-        </thead>
-        <tbody className="align-middle">
-          {listData?.list?.map((li) => {
-            return (
-              <tr key={li.id}>
-                <td>
-                  <Stack>
-                    <small className="text-secondary">
-                      {t('flagged_type', {
-                        type: t(li.object_type, { keyPrefix: 'btns' }),
-                      })}
-                    </small>
-                    <BaseUserCard
-                      data={li.reported_user}
-                      className="mt-2 small"
-                    />
-                    <a
-                      href={pathFactory.questionLanding(
-                        li.question_id,
-                        li.url_title,
-                      )}
-                      target="_blank"
-                      className="text-wrap text-break mt-2"
-                      rel="noreferrer">
-                      {li.title}
-                    </a>
-                    <small className="text-break text-wrap word">
-                      {escapeRemove(li.excerpt)}
-                    </small>
-                  </Stack>
-                </td>
-                <td>
-                  <Stack>
-                    <FormatTime
-                      time={li.created_at}
-                      className="small text-secondary"
-                    />
-                    <BaseUserCard
-                      data={li.report_user}
-                      className="mt-2 mb-2 small"
-                    />
-                    {li.flagged_reason ? (
-                      <small>{li.flagged_content}</small>
-                    ) : (
-                      <small>
-                        {li.reason?.name}
-                        <br />
-                        <span className="text-secondary">{li.content}</span>
-                      </small>
-                    )}
-                  </Stack>
-                </td>
-                {curFilter !== 'completed' ? (
-                  <td>
-                    <Button variant="link" onClick={() => handleReview(li)}>
-                      {t('review')}
-                    </Button>
-                  </td>
-                ) : null}
-              </tr>
-            );
-          })}
-        </tbody>
-      </Table>
-      {Number(count) <= 0 && !isLoading && <Empty />}
-      <div className="mt-4 mb-2 d-flex justify-content-center">
-        <Pagination
-          currentPage={curPage}
-          totalSize={count}
-          pageSize={PAGE_SIZE}
-        />
-      </div>
-    </>
-  );
-};
-
-export default Flags;
diff --git a/ui/src/pages/Admin/Questions/components/Action/index.tsx b/ui/src/pages/Admin/Questions/components/Action/index.tsx
index a1f7e2a2..f5d2b41f 100644
--- a/ui/src/pages/Admin/Questions/components/Action/index.tsx
+++ b/ui/src/pages/Admin/Questions/components/Action/index.tsx
@@ -19,6 +19,7 @@
 
 import { Dropdown } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { Icon, Modal } from '@/components';
 import {
@@ -119,6 +120,17 @@ const AnswerActions = ({ itemData, refreshList, curFilter, show, pin }) => {
     }
   };
 
+  if (curFilter === 'pending') {
+    return (
+      <Link
+        to={`/review?type=queued_post&objectId=${itemData.id}`}
+        className="btn btn-link p-0"
+        title={t('review', { keyPrefix: 'header.nav' })}>
+        <Icon name="three-dots-vertical" />
+      </Link>
+    );
+  }
+
   return (
     <Dropdown>
       <Dropdown.Toggle variant="link" className="no-toggle p-0">
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 27565fa6..0488a08b 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -41,6 +41,7 @@ import Action from './components/Action';
 
 const questionFilterItems: Type.AdminContentsFilterBy[] = [
   'normal',
+  'pending',
   'closed',
   'deleted',
 ];
@@ -78,7 +79,7 @@ const Questions: FC = () => {
           data={questionFilterItems}
           currentSort={curFilter}
           sortKey="status"
-          i18nKeyPrefix="admin.questions"
+          i18nKeyPrefix="btns"
         />
 
         <Form.Control
@@ -147,15 +148,19 @@ const Questions: FC = () => {
                       'mb-1',
                       ADMIN_LIST_STATUS[curFilter]?.variant,
                     )}>
-                    {t(ADMIN_LIST_STATUS[curFilter]?.name)}
+                    {t(ADMIN_LIST_STATUS[curFilter]?.name, {
+                      keyPrefix: 'btns',
+                    })}
                   </span>
                   {li.show === 2 && (
                     <span
                       className={classNames(
                         'badge',
-                        ADMIN_LIST_STATUS.unlisted.variant,
+                        ADMIN_LIST_STATUS.unlist.variant,
                       )}>
-                      {t(ADMIN_LIST_STATUS.unlisted.name)}
+                      {t(ADMIN_LIST_STATUS.unlist.name, {
+                        keyPrefix: 'btns',
+                      })}
                     </span>
                   )}
                 </td>
diff --git a/ui/src/pages/Admin/index.tsx b/ui/src/pages/Admin/index.tsx
index 2ce145f9..b527088f 100644
--- a/ui/src/pages/Admin/index.tsx
+++ b/ui/src/pages/Admin/index.tsx
@@ -22,7 +22,7 @@ import { Container, Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Outlet, useMatch } from 'react-router-dom';
 
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 import { usePageTags } from '@/hooks';
 import { AccordionNav } from '@/components';
diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
index bda9112a..2f79305b 100644
--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
@@ -46,7 +46,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                 <ListGroup.Item
                   action
                   as="a"
-                  className="link-dark text-wrap text-break"
+                  className="link-dark text-wrap text-break grid gap-0 row-gap-3"
                   key={item.id}
                   href={pathFactory.questionLanding(item.id, item.url_title)}
                   target="_blank">
@@ -56,7 +56,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     : null}
 
                   {item.accepted_answer ? (
-                    <span className="small ms-3 text-success">
+                    <span className="small ms-3 text-success d-inline-block">
                       <Icon type="bi" name="check-circle-fill" />
                       <span className="ms-1">
                         {t('x_answers', {
@@ -67,7 +67,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     </span>
                   ) : (
                     item.answer_count > 0 && (
-                      <span className="small ms-3 text-secondary">
+                      <span className="small ms-3 text-secondary d-inline-block">
                         <Icon type="bi" name="chat-square-text-fill" />
                         <span className="ms-1">
                           {t('x_answers', {
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 165e061a..9a1ff14a 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -24,7 +24,8 @@ import { useTranslation } from 'react-i18next';
 
 import dayjs from 'dayjs';
 import classNames from 'classnames';
-import { isEqual, debounce } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import debounce from 'lodash/debounce';
 
 import { usePageTags, usePromptWithUnload, useCaptchaModal } from '@/hooks';
 import { Editor, EditorRef, TagSelector } from '@/components';
diff --git a/ui/src/pages/Review/components/ApproveDropdown/index.tsx b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
new file mode 100644
index 00000000..05f92296
--- /dev/null
+++ b/ui/src/pages/Review/components/ApproveDropdown/index.tsx
@@ -0,0 +1,202 @@
+import { FC, useState } from 'react';
+import { Dropdown, Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import { Modal } from '@/components';
+import { putFlagReviewAction } from '@/services';
+import { useCaptchaModal, useReportModal, useToast } from '@/hooks';
+import type * as Type from '@/common/interface';
+import EditPostModal from '../EditPostModal';
+
+interface IProps {
+  itemData: Type.FlagReviewItem | null;
+  curFilter: string;
+  objectType: Type.FlagReviewItem['object_type'] | '';
+  approveCallback: () => void;
+}
+
+const Index: FC<IProps> = ({
+  itemData,
+  objectType,
+  curFilter,
+  approveCallback,
+}) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+
+  const [isLoading, setIsLoading] = useState(false);
+  const [showEditPostModal, setShowEditPostModal] = useState(false);
+  const closeModal = useReportModal(approveCallback);
+  const toast = useToast();
+  const dCaptcha = useCaptchaModal('delete');
+
+  const handleEditPostModalState = () => {
+    setShowEditPostModal(!showEditPostModal);
+  };
+
+  const handleDelete = () => {
+    let content = '';
+
+    setIsLoading(true);
+
+    if (objectType === 'question') {
+      content =
+        Number(itemData?.answer_count) > 0
+          ? t('question', { keyPrefix: 'delete' })
+          : t('other', { keyPrefix: 'delete' });
+    }
+    if (objectType === 'answer') {
+      content = itemData?.answer_accepted
+        ? t('answer_accepted', { keyPrefix: 'delete' })
+        : t('other', { keyPrefix: 'delete' });
+    }
+    if (objectType === 'comment') {
+      content = t('other', { keyPrefix: 'delete' });
+    }
+    Modal.confirm({
+      title: t('title', { keyPrefix: 'delete' }),
+      content,
+      cancelBtnVariant: 'link',
+      confirmBtnVariant: 'danger',
+      confirmText: t('delete', { keyPrefix: 'btns' }),
+      onConfirm: () => {
+        dCaptcha.check(() => {
+          const req: Type.PutFlagReviewParams = {
+            operation_type: 'delete_post',
+            flag_id: String(itemData?.flag_id),
+            captcha_code: undefined,
+            captcha_id: undefined,
+          };
+          dCaptcha.resolveCaptchaReq(req);
+
+          delete req.captcha_code;
+          delete req.captcha_id;
+
+          putFlagReviewAction(req)
+            .then(async () => {
+              await dCaptcha.close();
+              let msg = '';
+              if (objectType === 'question') {
+                msg = t('post_deleted', { keyPrefix: 'messages' });
+              }
+              if (objectType === 'answer') {
+                msg = t('tip_answer_deleted');
+              }
+              if (objectType === 'answer' || objectType === 'question') {
+                toast.onShow({
+                  msg,
+                  variant: 'success',
+                });
+              }
+              approveCallback();
+            })
+            .catch((ex) => {
+              if (ex.isError) {
+                dCaptcha.handleCaptchaError(ex.list);
+              }
+            })
+            .finally(() => {
+              setIsLoading(false);
+            });
+        });
+      },
+    });
+  };
+
+  const handleAction = (type) => {
+    if (type === 'delete') {
+      handleDelete();
+    }
+
+    if (type === 'close') {
+      closeModal.onShow({
+        type: 'question',
+        id: itemData?.flag_id || '',
+        action: 'close',
+        source: 'review',
+      });
+    }
+
+    if (type === 'unlist') {
+      const keyPrefix = 'question_detail.unlist';
+      Modal.confirm({
+        title: t('title', { keyPrefix }),
+        content: t('content', { keyPrefix }),
+        cancelBtnVariant: 'link',
+        confirmText: t('confirm_btn', { keyPrefix }),
+        onConfirm: () => {
+          putFlagReviewAction({
+            operation_type: 'unlist_post',
+            flag_id: itemData?.flag_id || '',
+          }).then(() => {
+            toast.onShow({
+              msg: t(`post_${type}`, { keyPrefix: 'messages' }),
+              variant: 'success',
+            });
+            approveCallback();
+          });
+        },
+      });
+    }
+  };
+
+  const handleActionEdit = () => {
+    handleEditPostModalState();
+  };
+
+  return (
+    <div>
+      <Dropdown>
+        <Dropdown.Toggle
+          as={Button}
+          disabled={isLoading}
+          variant="outline-primary"
+          id="dropdown-basic">
+          {t('approve', { keyPrefix: 'btns' })}
+        </Dropdown.Toggle>
+
+        <Dropdown.Menu>
+          <Dropdown.Item onClick={() => handleActionEdit()}>
+            {t('edit_post')}
+          </Dropdown.Item>
+          {curFilter === 'normal' && objectType === 'question' && (
+            <Dropdown.Item onClick={() => handleAction('close')}>
+              {t('close', { keyPrefix: 'btns' })}
+            </Dropdown.Item>
+          )}
+          {curFilter !== 'deleted' && (
+            <Dropdown.Item onClick={() => handleAction('delete')}>
+              {t('delete', { keyPrefix: 'btns' })}
+            </Dropdown.Item>
+          )}
+          {objectType === 'question' && (
+            <>
+              <Dropdown.Divider />
+              {itemData?.object_show_status !== 2 && (
+                <Dropdown.Item onClick={() => handleAction('unlist')}>
+                  {t('unlist_post')}
+                </Dropdown.Item>
+              )}
+            </>
+          )}
+        </Dropdown.Menu>
+      </Dropdown>
+      <EditPostModal
+        visible={showEditPostModal}
+        handleClose={handleEditPostModalState}
+        objectType={objectType}
+        originalData={{
+          flag_id: itemData?.flag_id || '',
+          id: itemData?.object_id || '',
+          title: itemData?.title || '',
+          content: itemData?.original_text || '',
+          tags: itemData?.tags || [],
+          question_id: itemData?.question_id || '',
+          answer_id: itemData?.answer_id || '',
+        }}
+        callback={approveCallback}
+      />
+    </div>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/EditPostModal/index.scss b/ui/src/pages/Review/components/EditPostModal/index.scss
new file mode 100644
index 00000000..550155b2
--- /dev/null
+++ b/ui/src/pages/Review/components/EditPostModal/index.scss
@@ -0,0 +1,4 @@
+.edit-post-modal {
+  max-width: 746px;
+  width: 58.3333% !important;
+}
diff --git a/ui/src/pages/Review/components/EditPostModal/index.tsx b/ui/src/pages/Review/components/EditPostModal/index.tsx
new file mode 100644
index 00000000..e35a82ca
--- /dev/null
+++ b/ui/src/pages/Review/components/EditPostModal/index.tsx
@@ -0,0 +1,375 @@
+import { FC, useState, useEffect } from 'react';
+import { Modal, Button, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import classNames from 'classnames';
+
+import { putFlagReviewAction } from '@/services';
+import { useCaptchaModal, usePageUsers } from '@/hooks';
+import { Editor, TagSelector, Mentions, TextArea } from '@/components';
+import {
+  // matchedUsers,
+  parseUserInfo,
+  handleFormError,
+  parseEditMentionUser,
+} from '@/utils';
+import type * as Type from '@/common/interface';
+
+import './index.scss';
+
+interface Props {
+  originalData: {
+    id: string;
+    flag_id: string;
+    question_id?: string;
+    answer_id?: string;
+    title: string;
+    content: string;
+    tags: Type.Tag[];
+  };
+  objectType: Type.FlagReviewItem['object_type'] | '';
+  visible: boolean;
+  handleClose: () => void;
+  callback?: () => void;
+}
+
+interface FormDataItem {
+  title: Type.FormValue<string>;
+  tags: Type.FormValue<Type.Tag[]>;
+  content: Type.FormValue<string>;
+}
+
+const initFormData = {
+  title: {
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  },
+  tags: {
+    value: [],
+    isInvalid: false,
+    errorMsg: '',
+  },
+  content: {
+    value: '',
+    isInvalid: false,
+    errorMsg: '',
+  },
+};
+
+const Index: FC<Props> = ({
+  originalData,
+  visible = false,
+  objectType,
+  handleClose,
+  callback,
+}) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'ask' });
+  const [formData, setFormData] = useState<FormDataItem>(initFormData);
+  const [focusEditor, setFocusEditor] = useState(false);
+  const [loaded, setLoaded] = useState(false);
+  const pageUsers = usePageUsers();
+
+  const editCaptcha = useCaptchaModal('edit');
+
+  const onClose = (bol) => {
+    if (bol) {
+      callback?.();
+    }
+    handleClose();
+    setLoaded(false);
+  };
+
+  const handleInput = (data: Partial<FormDataItem>) => {
+    if (!loaded) {
+      return;
+    }
+    setFormData({
+      ...formData,
+      ...data,
+    });
+  };
+
+  const checkValidated = (): boolean => {
+    let bol = true;
+    const { title, tags, content } = formData;
+    if (objectType === 'question') {
+      if (!title.value) {
+        bol = false;
+        formData.title = {
+          value: title.value,
+          isInvalid: true,
+          errorMsg: t('form.fields.title.msg.empty', {
+            keyPrefix: 'ask',
+          }),
+        };
+      }
+
+      if (!tags.value.length) {
+        bol = false;
+        formData.tags = {
+          value: tags.value,
+          isInvalid: true,
+          errorMsg: t('form.fields.tags.msg.empty', {
+            keyPrefix: 'ask',
+          }),
+        };
+      }
+    }
+
+    if (!content.value || Array.from(content.value.trim()).length < 6) {
+      bol = false;
+      formData.content = {
+        value: content.value,
+        isInvalid: true,
+        errorMsg: t('form.fields.answer.feedback.characters', {
+          keyPrefix: 'edit_answer',
+        }),
+      };
+    } else {
+      formData.content = {
+        value: content.value,
+        isInvalid: false,
+        errorMsg: '',
+      };
+    }
+
+    setFormData({
+      ...formData,
+    });
+    return bol;
+  };
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    if (!checkValidated()) {
+      return;
+    }
+
+    const params: Type.PutFlagReviewParams = {
+      title: formData.title.value,
+      content: formData.content.value,
+      tags: formData.tags.value,
+      operation_type: 'edit_post',
+      flag_id: originalData.flag_id,
+    };
+    if (objectType === 'answer') {
+      delete params.title;
+      delete params.tags;
+    }
+    if (objectType === 'comment') {
+      const { value } = formData.content;
+      // const users = matchedUsers(value);
+      // const userNames = unionBy(users.map((user) => user.userName));
+      const commentMarkDown = parseUserInfo(value);
+
+      // params.mention_username_list = userNames;
+      params.content = commentMarkDown;
+
+      delete params.title;
+      delete params.tags;
+    }
+
+    editCaptcha.check(() => {
+      if (objectType === 'question') {
+        const imgCode = editCaptcha.getCaptcha();
+        if (imgCode.verify) {
+          params.captcha_code = imgCode.captcha_code;
+          params.captcha_id = imgCode.captcha_id;
+        }
+      }
+      putFlagReviewAction(params)
+        .then(async () => {
+          await editCaptcha.close();
+          onClose(true);
+        })
+        .catch((err) => {
+          if (err.isError) {
+            editCaptcha.handleCaptchaError(err.list);
+            const data = handleFormError(err, formData);
+            setFormData({ ...data });
+          }
+        });
+    });
+  };
+
+  const handleSelected = (val) => {
+    if (!loaded) {
+      return;
+    }
+    setFormData({
+      ...formData,
+      content: {
+        value: val,
+        errorMsg: '',
+        isInvalid: false,
+      },
+    });
+  };
+
+  useEffect(() => {
+    if (!visible) {
+      return;
+    }
+
+    formData.title.value = originalData.title;
+    formData.content.value = originalData.content;
+    formData.tags.value = originalData.tags.map((item) => {
+      return {
+        ...item,
+        parsed_text: '',
+        original_text: '',
+      };
+    });
+    setFormData({ ...formData });
+    setLoaded(true);
+  }, [visible]);
+
+  return (
+    <Modal
+      show={visible}
+      onHide={() => onClose(false)}
+      className="w-100"
+      dialogClassName="edit-post-modal">
+      <Modal.Header closeButton>
+        <Modal.Title>
+          {t('edit_post', { keyPrefix: 'page_review' })}
+        </Modal.Title>
+      </Modal.Header>
+      <Form noValidate onSubmit={handleSubmit}>
+        <Modal.Body>
+          {objectType === 'question' && (
+            <Form.Group controlId="title" className="mb-3">
+              <Form.Label>{t('form.fields.title.label')}</Form.Label>
+              <Form.Control
+                type="text"
+                value={formData.title.value}
+                isInvalid={formData.title.isInvalid}
+                onChange={(e) => {
+                  handleInput({
+                    title: {
+                      value: e.target.value,
+                      isInvalid: false,
+                      errorMsg: '',
+                    },
+                  });
+                }}
+                placeholder={t('form.fields.title.placeholder')}
+                autoFocus
+                contentEditable
+              />
+
+              <Form.Control.Feedback type="invalid">
+                {formData.title.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
+
+          {objectType !== 'comment' && (
+            <Form.Group controlId="body">
+              <Form.Label>
+                {objectType === 'question'
+                  ? t('form.fields.body.label')
+                  : t('form.fields.answer.label')}
+              </Form.Label>
+              <Form.Control
+                defaultValue={formData.content.value}
+                isInvalid={formData.content.isInvalid}
+                hidden
+              />
+              <Editor
+                value={formData.content.value}
+                onChange={(value) => {
+                  handleInput({
+                    content: { value, errorMsg: '', isInvalid: false },
+                  });
+                }}
+                className={classNames(
+                  'form-control p-0',
+                  focusEditor ? 'focus' : '',
+                )}
+                onFocus={() => {
+                  setFocusEditor(true);
+                }}
+                onBlur={() => {
+                  setFocusEditor(false);
+                }}
+              />
+              <Form.Control.Feedback type="invalid">
+                {formData.content.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
+
+          {objectType === 'question' && (
+            <Form.Group controlId="tags" className="my-3">
+              <Form.Label>{t('form.fields.tags.label')}</Form.Label>
+              <Form.Control
+                defaultValue={JSON.stringify(formData.tags.value)}
+                isInvalid={formData.tags.isInvalid}
+                hidden
+              />
+              <TagSelector
+                value={formData.tags.value}
+                onChange={(value) => {
+                  handleInput({
+                    tags: { value, errorMsg: '', isInvalid: false },
+                  });
+                }}
+                showRequiredTag
+                maxTagLength={5}
+              />
+              <Form.Control.Feedback type="invalid">
+                {formData.tags.errorMsg}
+              </Form.Control.Feedback>
+            </Form.Group>
+          )}
+
+          {objectType === 'comment' && (
+            <div className="w-100">
+              <div
+                className={classNames('custom-form-control', {
+                  'is-invalid': formData.content.isInvalid,
+                })}>
+                <Form.Label>Comment</Form.Label>
+                <Mentions
+                  pageUsers={pageUsers.getUsers()}
+                  onSelected={handleSelected}>
+                  <TextArea
+                    size="sm"
+                    rows={4}
+                    value={parseEditMentionUser(formData.content.value)}
+                    onChange={(e) => {
+                      handleInput({
+                        content: {
+                          value: e.target.value,
+                          errorMsg: '',
+                          isInvalid: false,
+                        },
+                      });
+                    }}
+                  />
+                </Mentions>
+              </div>
+              <Form.Control.Feedback type="invalid">
+                {formData.content.errorMsg}
+              </Form.Control.Feedback>
+            </div>
+          )}
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={() => onClose(false)}>
+            {t('close', { keyPrefix: 'btns' })}
+          </Button>
+          <Button variant="primary" type="submit">
+            {t('submit', { keyPrefix: 'btns' })}
+          </Button>
+        </Modal.Footer>
+      </Form>
+    </Modal>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
new file mode 100644
index 00000000..11056c89
--- /dev/null
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -0,0 +1,210 @@
+import { FC, useEffect, useState } from 'react';
+import { Card, Alert, Stack, Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+
+import classNames from 'classnames';
+
+import { getFlagReviewPostList, putFlagReviewAction } from '@/services';
+import { BaseUserCard, Tag, FormatTime } from '@/components';
+import { scrollToDocTop } from '@/utils';
+import type * as Type from '@/common/interface';
+import { ADMIN_LIST_STATUS } from '@/common/constants';
+import ApproveDropdown from '../ApproveDropdown';
+import generateData from '../../utils/generateData';
+
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [noTasks, setNoTasks] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [page, setPage] = useState(1);
+  const [reviewResp, setReviewResp] = useState<Type.FlagReviewResp>();
+  const flagItemData = reviewResp?.list[0] as Type.FlagReviewItem;
+
+  // console.log('reviewResp', reviewResp);
+
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+
+  const queryNextOne = (pageNumber) => {
+    getFlagReviewPostList(pageNumber)
+      .then((resp) => {
+        resolveNextOne(resp, pageNumber);
+      })
+      .catch((ex) => {
+        console.error('review next error: ', ex);
+      });
+  };
+
+  useEffect(() => {
+    queryNextOne(page);
+  }, []);
+
+  const handlingApprove = () => {
+    if (!flagItemData) {
+      return;
+    }
+    refreshCount();
+    queryNextOne(page);
+  };
+
+  const handleIgnore = () => {
+    setIsLoading(true);
+    putFlagReviewAction({
+      operation_type: 'ignore_report',
+      flag_id: String(flagItemData?.flag_id),
+    })
+      .then(() => {
+        refreshCount();
+        queryNextOne(page);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const {
+    object_type,
+    submitter_user,
+    author_user_info,
+    object_status,
+    reason,
+  } = flagItemData || {
+    object_type: '',
+    submitter_user: null,
+    author_user_info: null,
+    reason: null,
+    object_status: 0,
+  };
+
+  const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);
+
+  if (noTasks) return null;
+  return (
+    <Card>
+      <Card.Header>
+        {object_type !== 'user' ? t('flag_post') : t('flag_user')}
+      </Card.Header>
+      <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <BaseUserCard data={submitter_user} avatarSize="24" />
+            {flagItemData?.submit_at && (
+              <FormatTime
+                time={flagItemData.submit_at}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">
+              {object_type !== 'user'
+                ? t('flag_post_type', { type: reason?.name })
+                : t('flag_user_type', { type: reason?.name })}
+            </p>
+          </Stack>
+        </Alert>
+        <div className="p-3">
+          <small className="d-block text-secondary mb-4">
+            <span>{t(object_type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+          {object_type === 'question' && (
+            <>
+              <h5 className="mb-3">{flagItemData?.title}</h5>
+              <div className="mb-4">
+                {flagItemData?.tags?.map((item) => {
+                  return (
+                    <Tag key={item.slug_name} className="me-1" data={item} />
+                  );
+                })}
+              </div>
+            </>
+          )}
+          <div className="small font-monospace">
+            {flagItemData?.original_text}
+          </div>
+          <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
+            <div>
+              <span
+                className={classNames(
+                  'badge',
+                  ADMIN_LIST_STATUS[object_status]?.variant,
+                )}>
+                {t(ADMIN_LIST_STATUS[object_status]?.name, {
+                  keyPrefix: 'btns',
+                })}
+              </span>
+              {flagItemData?.object_show_status === 2 && (
+                <span
+                  className={classNames(
+                    'ms-1 badge',
+                    ADMIN_LIST_STATUS.unlist.variant,
+                  )}>
+                  {t(ADMIN_LIST_STATUS.unlist.name, { keyPrefix: 'btns' })}
+                </span>
+              )}
+            </div>
+            <div className="d-flex align-items-center small">
+              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <FormatTime
+                time={Number(flagItemData?.created_at)}
+                className="text-secondary ms-1 flex-shrink-0"
+                preFix={t(itemTimePrefix, { keyPrefix: 'question_detail' })}
+              />
+            </div>
+          </div>
+        </div>
+      </Card.Body>
+
+      <Card.Footer className="p-3">
+        <p>{t('approve_flag_tip')}</p>
+        <Stack direction="horizontal" gap={2}>
+          <ApproveDropdown
+            objectType={object_type}
+            itemData={flagItemData}
+            curFilter={ADMIN_LIST_STATUS[object_status]?.name}
+            approveCallback={handlingApprove}
+          />
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={handleIgnore}>
+            {t('ignore', { keyPrefix: 'btns' })}
+          </Button>
+        </Stack>
+      </Card.Footer>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
new file mode 100644
index 00000000..bd22d297
--- /dev/null
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -0,0 +1,203 @@
+import { FC, useEffect, useState } from 'react';
+import { Card, Alert, Stack, Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import { Link, useSearchParams } from 'react-router-dom';
+
+import classNames from 'classnames';
+
+import { getPendingReviewPostList, putPendingReviewAction } from '@/services';
+import { BaseUserCard, Tag, FormatTime, Icon } from '@/components';
+import { scrollToDocTop } from '@/utils';
+import type * as Type from '@/common/interface';
+import { ADMIN_LIST_STATUS } from '@/common/constants';
+import generateData from '../../utils/generateData';
+
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
+  const [urlSearch, setUrlSearchParams] = useSearchParams();
+  const objectId = urlSearch.get('objectId') || '';
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [noTasks, setNoTasks] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [page, setPage] = useState(1);
+  const [reviewResp, setReviewResp] = useState<Type.QuestionDetailRes>();
+  const flagItemData = reviewResp?.list[0] as Type.QueuedReviewItem;
+
+  // console.log('pendingResp', reviewResp);
+
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+
+  const queryNextOne = (pageNumber, id) => {
+    getPendingReviewPostList(pageNumber, id).then((resp) => {
+      resolveNextOne(resp, pageNumber);
+    });
+  };
+
+  useEffect(() => {
+    queryNextOne(page, objectId);
+  }, []);
+
+  const handleAction = (type: 'approve' | 'reject') => {
+    if (!flagItemData) {
+      return;
+    }
+    setIsLoading(true);
+    putPendingReviewAction({
+      status: type,
+      review_id: flagItemData?.review_id,
+    })
+      .then(() => {
+        refreshCount();
+        queryNextOne(page, '');
+        if (objectId) {
+          urlSearch.delete('objectId');
+          setUrlSearchParams(urlSearch);
+        }
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const { object_type, author_user_info, object_status, reason } =
+    flagItemData || {
+      object_type: '',
+      author_user_info: null,
+      reason: null,
+      object_status: 0,
+    };
+
+  const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);
+
+  if (noTasks) return null;
+  return (
+    <Card>
+      <Card.Header>
+        {object_type !== 'user' ? t('queued_post') : t('queued_post_user')}
+      </Card.Header>
+      <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <div className="small d-flex align-items-center">
+              <Icon type="bi" name="plugin" size="24px" className="me-1" />
+              <span>{flagItemData?.submitter_display_name}</span>
+            </div>
+            {flagItemData?.submit_at && (
+              <FormatTime
+                time={flagItemData.submit_at}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">{reason}</p>
+          </Stack>
+        </Alert>
+        <div className="p-3">
+          <small className="d-block text-secondary mb-4">
+            <span>{t(object_type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+          {object_type === 'question' && (
+            <>
+              <h5 className="mb-3">{flagItemData?.title}</h5>
+              <div className="mb-4">
+                {flagItemData?.tags?.map((item) => {
+                  return (
+                    <Tag key={item.slug_name} className="me-1" data={item} />
+                  );
+                })}
+              </div>
+            </>
+          )}
+          <div className="small font-monospace">
+            {flagItemData?.original_text}
+          </div>
+          <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
+            <div>
+              <span
+                className={classNames(
+                  'badge',
+                  ADMIN_LIST_STATUS[object_status]?.variant,
+                )}>
+                {t(ADMIN_LIST_STATUS[object_status]?.name, {
+                  keyPrefix: 'btns',
+                })}
+              </span>
+              {flagItemData?.object_show_status === 2 && (
+                <span
+                  className={classNames(
+                    'ms-1 badge',
+                    ADMIN_LIST_STATUS.unlist.variant,
+                  )}>
+                  {t(ADMIN_LIST_STATUS.unlist.name, { keyPrefix: 'btns' })}
+                </span>
+              )}
+            </div>
+            <div className="d-flex align-items-center small">
+              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <FormatTime
+                time={Number(flagItemData?.created_at)}
+                className="text-secondary ms-1 flex-shrink-0"
+                preFix={t(itemTimePrefix, { keyPrefix: 'question_detail' })}
+              />
+            </div>
+          </div>
+        </div>
+      </Card.Body>
+
+      <Card.Footer className="p-3">
+        <p>
+          {object_type !== 'user'
+            ? t('approve_post_tip')
+            : t('approve_user_tip')}
+        </p>
+        <Stack direction="horizontal" gap={2}>
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={() => handleAction('approve')}>
+            {t('approve', { keyPrefix: 'btns' })}
+          </Button>
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={() => handleAction('reject')}>
+            {t('reject', { keyPrefix: 'btns' })}
+          </Button>
+        </Stack>
+      </Card.Footer>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/ReviewType/index.tsx b/ui/src/pages/Review/components/ReviewType/index.tsx
new file mode 100644
index 00000000..16a392e2
--- /dev/null
+++ b/ui/src/pages/Review/components/ReviewType/index.tsx
@@ -0,0 +1,40 @@
+import { FC } from 'react';
+import { Card, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import * as Type from '@/common/interface';
+
+interface IProps {
+  list: Type.ReviewTypeItem[] | undefined;
+  checked: string;
+  callback: (type: string) => void;
+}
+
+const Index: FC<IProps> = ({ list, checked, callback }) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  return (
+    <Card>
+      <Card.Header>{t('filter', { keyPrefix: 'btns' })}</Card.Header>
+      <Card.Body>
+        <Form.Group>
+          <Form.Label>{t('filter_label')}</Form.Label>
+          {list?.map((item) => {
+            return (
+              <Form.Check
+                key={item.name}
+                type="radio"
+                id={item.name}
+                disabled={item.todo_amount <= 0}
+                label={`${item.label} (${item.todo_amount})`}
+                checked={checked === item.name}
+                onChange={() => callback(item.name)}
+              />
+            );
+          })}
+        </Form.Group>
+      </Card.Body>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/SuggestContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsx
new file mode 100644
index 00000000..8b618a91
--- /dev/null
+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FC, useEffect, useState } from 'react';
+import { Alert, Stack, Button, Card } from 'react-bootstrap';
+import { Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+
+import { BaseUserCard, FormatTime, DiffContent } from '@/components';
+import { getSuggestReviewList, revisionAudit } from '@/services';
+import { pathFactory } from '@/router/pathFactory';
+import { scrollToDocTop } from '@/utils';
+import type * as Type from '@/common/interface';
+
+interface IProps {
+  refreshCount: () => void;
+}
+
+const Index: FC<IProps> = ({ refreshCount }) => {
+  const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const [isLoading, setIsLoading] = useState(false);
+  const [noTasks, setNoTasks] = useState(false);
+  const [page, setPage] = useState(1);
+  const [reviewResp, setReviewResp] = useState<Type.SuggestReviewResp>();
+  const ro = reviewResp?.list[0];
+  const { info, type, unreviewed_info } = ro || {
+    info: null,
+    type: '',
+    unreviewed_info: null,
+  };
+  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(() => {
+      scrollToDocTop();
+    }, 150);
+  };
+  const queryNextOne = (pageNumber) => {
+    getSuggestReviewList(pageNumber).then((resp) => {
+      resolveNextOne(resp, pageNumber);
+    });
+  };
+  const reviewInfo = unreviewed_info?.content;
+
+  const handlingApprove = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'approve')
+      .then(() => {
+        refreshCount();
+        queryNextOne(page);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  const handlingReject = () => {
+    if (!unreviewed_info) {
+      return;
+    }
+    setIsLoading(true);
+    revisionAudit(unreviewed_info.id, 'reject')
+      .then(() => {
+        refreshCount();
+        queryNextOne(page);
+      })
+      .catch((ex) => {
+        console.error('revisionAudit reject error: ', ex);
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  };
+
+  let itemLink = '';
+  let itemId = '';
+  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, info?.url_title);
+    itemId = info?.object_id;
+    editSummary ||= t('edit_question');
+  } else if (type === 'answer') {
+    itemLink = pathFactory.answerLanding({
+      // @ts-ignore
+      questionId: unreviewed_info.content.question_id,
+      slugTitle: info?.url_title,
+      answerId: unreviewed_info.object_id,
+    });
+    itemId = unreviewed_info.object_id;
+    editSummary ||= t('edit_answer');
+  } else if (type === 'tag') {
+    const tagInfo = unreviewed_info.content as Type.Tag;
+    itemLink = pathFactory.tagLanding(tagInfo.slug_name);
+    itemId = tagInfo?.tag_id || tagInfo.slug_name;
+    editSummary ||= t('edit_tag');
+  }
+  useEffect(() => {
+    queryNextOne(page);
+  }, []);
+
+  if (noTasks) return null;
+
+  let newData: Record<string, any> = {};
+  let oldData: Record<string, any> = {};
+  let diffOpts: Partial<{
+    showTitle: boolean;
+    showTagUrlSlug: boolean;
+  }> = {
+    showTitle: true,
+    showTagUrlSlug: true,
+  };
+  if (type === 'question' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      title: reviewInfo.title,
+      original_text: reviewInfo.content,
+      tags: reviewInfo.tags,
+    };
+    oldData = {
+      title: info.title,
+      original_text: info.content,
+      tags: info.tags,
+    };
+  }
+  if (type === 'answer' && info && reviewInfo && 'content' in reviewInfo) {
+    newData = {
+      original_text: reviewInfo.content,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+  }
+
+  if (type === 'tag' && info && reviewInfo) {
+    newData = {
+      original_text: reviewInfo.original_text,
+    };
+    oldData = {
+      original_text: info.content,
+    };
+    diffOpts = { showTitle: false, showTagUrlSlug: false };
+  }
+
+  return (
+    <Card>
+      <Card.Header>{t('suggest_edits')}</Card.Header>
+      <Card.Body className="p-0">
+        <Alert variant="info" className="border-0 rounded-0 mb-0">
+          <Stack
+            direction="horizontal"
+            gap={1}
+            className="align-items-center mb-2">
+            <BaseUserCard data={editor} avatarSize="24" />
+            {editTime && (
+              <FormatTime
+                time={editTime}
+                className="small text-secondary"
+                preFix={t('proposed')}
+              />
+            )}
+          </Stack>
+          <Stack className="align-items-start">
+            <p className="mb-0">{editSummary}</p>
+          </Stack>
+        </Alert>
+        <div className="p-3">
+          <small className="d-block text-secondary mb-4">
+            <span>{t(type, { keyPrefix: 'btns' })} </span>
+            <Link to={itemLink} target="_blank" className="link-secondary">
+              #{itemId}
+            </Link>
+          </small>
+
+          <DiffContent
+            className="mt-2"
+            objectType={type}
+            newData={newData}
+            oldData={oldData}
+            opts={diffOpts}
+          />
+        </div>
+      </Card.Body>
+      <Card.Footer className="p-3">
+        <p>{t('approve_revision_tip')}</p>
+        <Stack direction="horizontal" gap={2}>
+          <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>
+        </Stack>
+      </Card.Footer>
+    </Card>
+  );
+};
+
+export default Index;
diff --git a/ui/src/pages/Review/components/index.ts b/ui/src/pages/Review/components/index.ts
new file mode 100644
index 00000000..0e02a69b
--- /dev/null
+++ b/ui/src/pages/Review/components/index.ts
@@ -0,0 +1,15 @@
+import ReviewType from './ReviewType';
+import ApproveDropdown from './ApproveDropdown';
+import EditPostModal from './EditPostModal';
+import SuggestContent from './SuggestContent';
+import FlagContent from './FlagContent';
+import QueuedContent from './QueuedContent';
+
+export {
+  ReviewType,
+  ApproveDropdown,
+  EditPostModal,
+  FlagContent,
+  SuggestContent,
+  QueuedContent,
+};
diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsx
index 927e95a1..4febbb9e 100644
--- a/ui/src/pages/Review/index.tsx
+++ b/ui/src/pages/Review/index.tsx
@@ -18,235 +18,103 @@
  */
 
 import { FC, useEffect, useState } from 'react';
-import { Row, Col, Alert, Stack, Button } from 'react-bootstrap';
-import { Link } from 'react-router-dom';
+import { Row, Col } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { useSearchParams } from 'react-router-dom';
 
 import { usePageTags } from '@/hooks';
-import { BaseUserCard, FormatTime, Empty, DiffContent } from '@/components';
-import { getReviewList, revisionAudit } from '@/services';
-import { pathFactory } from '@/router/pathFactory';
-import { scrollToDocTop } from '@/utils';
+import { Empty } from '@/components';
+import { getReviewType } from '@/services';
 import type * as Type from '@/common/interface';
 
+import {
+  ReviewType,
+  FlagContent,
+  SuggestContent,
+  QueuedContent,
+} from './components';
+
 const Index: FC = () => {
+  const [urlSearch, setUrlSearchParams] = useSearchParams();
+  const searchType = urlSearch.get('type');
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
-  const [isLoading, setIsLoading] = useState(false);
-  const [noTasks, setNoTasks] = useState(false);
-  const [page, setPage] = useState(1);
-  const [reviewResp, setReviewResp] = useState<Type.ReviewResp>();
-  const ro = reviewResp?.list[0];
-  const { info, type, unreviewed_info } = ro || {
-    info: null,
-    type: '',
-    unreviewed_info: null,
-  };
-  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(() => {
-      scrollToDocTop();
-    }, 150);
-  };
-  const queryNextOne = (pageNumber) => {
-    getReviewList(pageNumber)
+  const [reviewTypeList, setReviewTypeList] = useState<Type.ReviewTypeItem[]>();
+  const [currentReviewType, setCurrentReviewType] = useState('');
+  const [isEmpty, setIsEmpty] = useState(false);
+
+  const fetchReviewType = (changeReviewType: boolean) => {
+    getReviewType()
       .then((resp) => {
-        resolveNextOne(resp, pageNumber);
+        if (searchType) {
+          const filterData = resp.find((item) => item.name === searchType);
+          if (Number(filterData?.todo_amount) > 0) {
+            setCurrentReviewType(filterData?.name || '');
+          } else {
+            setIsEmpty(true);
+          }
+        } else {
+          const filterData = resp.filter((item) => item.todo_amount > 0);
+          if (filterData.length > 0) {
+            if (changeReviewType) {
+              setCurrentReviewType(filterData[0].name);
+            } else {
+              const currentTypeItem = resp.find(
+                (item) => item.name === currentReviewType,
+              );
+              if (currentTypeItem?.todo_amount === 0) {
+                setCurrentReviewType(filterData[0].name);
+              }
+            }
+          } else {
+            setIsEmpty(true);
+          }
+        }
+        setReviewTypeList(resp);
       })
       .catch((ex) => {
-        console.error('review next error: ', ex);
-      });
-  };
-  const reviewInfo = unreviewed_info?.content;
-  const handlingSkip = () => {
-    queryNextOne(page + 1);
-  };
-  const handlingApprove = () => {
-    if (!unreviewed_info) {
-      return;
-    }
-    setIsLoading(true);
-    revisionAudit(unreviewed_info.id, 'approve')
-      .then(() => {
-        queryNextOne(page);
-      })
-      .catch((ex) => {
-        console.error('revisionAudit approve error: ', ex);
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
-  };
-  const handlingReject = () => {
-    if (!unreviewed_info) {
-      return;
-    }
-    setIsLoading(true);
-    revisionAudit(unreviewed_info.id, 'reject')
-      .then(() => {
-        queryNextOne(page);
-      })
-      .catch((ex) => {
-        console.error('revisionAudit reject error: ', ex);
-      })
-      .finally(() => {
-        setIsLoading(false);
+        console.error('getReviewType error: ', ex);
       });
   };
 
-  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, info?.url_title);
-    itemTitle = info?.title;
-    editBadge = t('question_edit');
-    editSummary ||= t('edit_question');
-  } else if (type === 'answer') {
-    itemLink = pathFactory.answerLanding({
-      // @ts-ignore
-      questionId: unreviewed_info.content.question_id,
-      slugTitle: info?.url_title,
-      answerId: 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.slug_name);
-    itemTitle = tagInfo.display_name;
-    editBadge = t('tag_edit');
-    editSummary ||= t('edit_tag');
-  }
+  const handleTypeChange = (name) => {
+    urlSearch.delete('type');
+    setUrlSearchParams(urlSearch);
+    setCurrentReviewType(name);
+  };
+
   useEffect(() => {
-    queryNextOne(page);
+    fetchReviewType(true);
   }, []);
+
   usePageTags({
     title: t('review'),
   });
+
   return (
     <Row className="pt-4 mb-5">
       <h3 className="mb-4">{t('review')}</h3>
       <Col className="page-main flex-auto">
-        {!noTasks && ro && (
-          <>
-            <Alert variant="secondary">
-              <Stack className="align-items-start">
-                <span className="badge text-bg-secondary mb-2">
-                  {editBadge}
-                </span>
-                <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>
-            {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 }}
-              />
-            )}
-            <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>
-          </>
+        {currentReviewType === 'suggested_post_edit' && (
+          <SuggestContent refreshCount={() => fetchReviewType(false)} />
         )}
-        {noTasks && <Empty>{t('empty')}</Empty>}
+
+        {currentReviewType === 'flagged_post' && (
+          <FlagContent refreshCount={() => fetchReviewType(false)} />
+        )}
+
+        {currentReviewType === 'queued_post' && (
+          <QueuedContent refreshCount={() => fetchReviewType(false)} />
+        )}
+        {isEmpty && <Empty>{t('empty')}</Empty>}
       </Col>
 
-      <Col className="page-right-side mt-4 mt-xl-0" />
+      <Col className="page-right-side mt-4 mt-xl-0">
+        <ReviewType
+          list={reviewTypeList}
+          checked={currentReviewType}
+          callback={handleTypeChange}
+        />
+      </Col>
     </Row>
   );
 };
diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
new file mode 100644
index 00000000..42d80726
--- /dev/null
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -0,0 +1,58 @@
+import { pathFactory } from '@/router/pathFactory';
+
+export default (data: any) => {
+  if (!data?.object_id) {
+    return {
+      itemLink: '',
+      itemId: '',
+      itemTimePrefix: '',
+    };
+  }
+
+  const {
+    object_type = '',
+    object_id = '',
+    question_id = '',
+    answer_id = '',
+    comment_id = '',
+    title = '',
+  } = data;
+  let itemLink = '';
+  let itemId = '';
+  let itemTimePrefix = '';
+
+  if (object_type === 'question') {
+    itemLink = pathFactory.questionLanding(String(object_id), title);
+    itemId = String(question_id);
+    itemTimePrefix = 'asked';
+  } else if (object_type === 'answer') {
+    itemLink = pathFactory.answerLanding({
+      // @ts-ignore
+      questionId: question_id,
+      slugTitle: title,
+      answerId: String(object_id),
+    });
+    itemId = String(object_id);
+    itemTimePrefix = 'answered';
+  } else if (object_type === 'comment') {
+    if (question_id && answer_id) {
+      itemLink = `${pathFactory.answerLanding({
+        questionId: question_id,
+        answerId: answer_id,
+      })}?commentId=${comment_id}`;
+    } else {
+      itemLink = `${pathFactory.questionLanding(
+        String(question_id),
+        title,
+      )}?commentId=${comment_id}`;
+    }
+    itemId = String(comment_id);
+    itemTimePrefix = 'commented';
+  }
+
+  return {
+    itemLink,
+    itemId,
+    itemTimePrefix,
+  };
+};
diff --git a/ui/src/pages/Users/Notifications/components/Achievements/index.tsx b/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
index d8a96ab3..5f2e8f58 100644
--- a/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
+++ b/ui/src/pages/Users/Notifications/components/Achievements/index.tsx
@@ -21,7 +21,7 @@ import { ListGroup } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 import { Empty } from '@/components';
 
diff --git a/ui/src/pages/Users/Notifications/components/Inbox/index.tsx b/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
index 6e6e5c2f..64a2c34b 100644
--- a/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
+++ b/ui/src/pages/Users/Notifications/components/Inbox/index.tsx
@@ -22,7 +22,7 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 import { FormatTime, Empty } from '@/components';
 
diff --git a/ui/src/pages/Users/Settings/Interface/index.tsx b/ui/src/pages/Users/Settings/Interface/index.tsx
index 575995ed..046bccd6 100644
--- a/ui/src/pages/Users/Settings/Interface/index.tsx
+++ b/ui/src/pages/Users/Settings/Interface/index.tsx
@@ -71,6 +71,7 @@ const Index = () => {
       },
     },
   };
+
   const uiSchema: UISchema = {
     language: {
       'ui:widget': 'select',
@@ -86,7 +87,7 @@ const Index = () => {
       ...formData,
       language: {
         ...formData.language,
-        value: res[0].value,
+        value: loggedUserInfo.language || res[0].value,
       },
     });
     setLangs(res);
diff --git a/ui/src/router/pathFactory.ts b/ui/src/router/pathFactory.ts
index ec326acf..ea353604 100644
--- a/ui/src/router/pathFactory.ts
+++ b/ui/src/router/pathFactory.ts
@@ -41,7 +41,7 @@ const questionLanding = (questionId: string, slugTitle: string = '') => {
   }
   // @ts-ignore
   if (/[13]/.test(seo.permalink) && slugTitle) {
-    return `/questions/${questionId}/${slugTitle}`;
+    return `/questions/${questionId}/${encodeURIComponent(slugTitle)}`;
   }
 
   return `/questions/${questionId}`;
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
index bab8b34b..5c420e36 100644
--- a/ui/src/router/routes.ts
+++ b/ui/src/router/routes.ts
@@ -219,7 +219,6 @@ const routes: RouteNode[] = [
           },
         ],
       },
-
       {
         path: 'users/login',
         page: 'pages/Users/Login',
@@ -333,10 +332,6 @@ const routes: RouteNode[] = [
             path: 'answers',
             page: 'pages/Admin/Answers',
           },
-          {
-            path: 'flags',
-            page: 'pages/Admin/Flags',
-          },
           {
             path: 'themes',
             page: 'pages/Admin/Themes',
diff --git a/ui/src/services/client/index.ts b/ui/src/services/client/index.ts
index 89d38a95..0d718423 100644
--- a/ui/src/services/client/index.ts
+++ b/ui/src/services/client/index.ts
@@ -29,3 +29,4 @@ export * from './timeline';
 export * from './revision';
 export * from './user';
 export * from './Oauth';
+export * from './review';
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
new file mode 100644
index 00000000..de289453
--- /dev/null
+++ b/ui/src/services/client/review.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// import useSWR from 'swr';
+
+import request from '@/utils/request';
+import * as Type from '@/common/interface';
+
+export const getSuggestReviewList = (page: number) => {
+  const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
+  return request.get<Type.SuggestReviewResp>(apiUrl);
+};
+
+export const getReviewType = () => {
+  return request.get<Type.ReviewTypeItem[]>('/answer/api/v1/reviewing/type');
+};
+
+export const getFlagReviewPostList = (page: number) => {
+  const apiUrl = `/answer/api/v1/report/unreviewed/post?page=${page}`;
+  return request.get<Type.FlagReviewResp>(apiUrl);
+};
+
+export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {
+  return request.put('/answer/api/v1/report/review', params);
+};
+
+export const getPendingReviewPostList = (page: number, objectId?: string) => {
+  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}&object_id=${objectId}`;
+  return request.get<Type.QueuedReviewResp>(apiUrl);
+};
+
+export const putPendingReviewAction = (params: {
+  review_id: number;
+  status: 'approve' | 'reject';
+}) => {
+  return request.put('/answer/api/v1/review/pending/post', params);
+};
diff --git a/ui/src/services/client/revision.ts b/ui/src/services/client/revision.ts
index b71d7f24..489730e4 100644
--- a/ui/src/services/client/revision.ts
+++ b/ui/src/services/client/revision.ts
@@ -18,7 +18,6 @@
  */
 
 import request from '@/utils/request';
-import * as Type from '@/common/interface';
 
 export const editCheck = (id: string, passingError: boolean = false) => {
   const apiUrl = `/answer/api/v1/revisions/edit/check?id=${id}`;
@@ -34,8 +33,3 @@ export const revisionAudit = (id: string, operation: 'approve' | 'reject') => {
     operation,
   });
 };
-
-export const getReviewList = (page: number) => {
-  const apiUrl = `/answer/api/v1/revisions/unreviewed?page=${page}`;
-  return request.get<Type.ReviewResp>(apiUrl);
-};
diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 07dc3400..13644cd0 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -108,6 +108,11 @@ function parseUserInfo(markdown) {
   return markdown.replace(globalReg, '[@$1](/u/$1)');
 }
 
+function parseEditMentionUser(markdown) {
+  const globalReg = /\[@([^\]]+)\]\([^)]+\)/g;
+  return markdown.replace(globalReg, '@$1');
+}
+
 function formatUptime(value) {
   const t = i18next.t.bind(i18next);
   const second = parseInt(value, 10);
@@ -170,8 +175,6 @@ function escapeHtml(str: string) {
   return str.replace(/[&<>"'`]/g, (tag) => tagsToReplace[tag] || tag);
 }
 
-const Diff = require('diff');
-
 function diffText(newText: string, oldText?: string): string {
   if (!newText) {
     return '';
@@ -180,28 +183,31 @@ function diffText(newText: string, oldText?: string): string {
   if (typeof oldText !== 'string') {
     return escapeHtml(newText);
   }
-  const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
-  const result = diff.map((part) => {
-    if (part.added) {
-      if (part.value.replace(/\n/g, '').length <= 0) {
-        return `<span class="review-text-add d-block">${part.value.replace(
-          /\n/g,
-          '↵\n',
-        )}</span>`;
+  let result = [];
+  import('diff').then((Diff) => {
+    const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
+    result = diff.map((part) => {
+      if (part.added) {
+        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">${part.value}</span>`;
       }
-      return `<span class="review-text-add">${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>`;
+      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 `<span class="review-text-delete">${part.value}</span>`;
-    }
 
-    return part.value;
+      return part.value;
+    });
   });
 
   return result.join('');
@@ -273,6 +279,7 @@ export {
   bgFadeOut,
   matchedUsers,
   parseUserInfo,
+  parseEditMentionUser,
   formatUptime,
   escapeRemove,
   handleFormError,
diff --git a/ui/src/utils/saveDraft.ts b/ui/src/utils/saveDraft.ts
index e2dd7c17..6d7f1814 100644
--- a/ui/src/utils/saveDraft.ts
+++ b/ui/src/utils/saveDraft.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 
 import {
   DRAFT_QUESTION_STORAGE_KEY,
diff --git a/ui/template/header.html b/ui/template/header.html
index 85425674..75c696f9 100644
--- a/ui/template/header.html
+++ b/ui/template/header.html
@@ -54,7 +54,9 @@
       href="{{.siteinfo.Branding.SquareIcon}}"
       data-rh="true"
     />
-    <script defer="defer" src="{{.scriptPath}}"></script>
+    {{range $path := .scriptPath}}
+    <script defer="defer" src="{{$path}}"></script>
+    {{end}}
     {{if $.siteinfo.JsonLD }}{{ .siteinfo.JsonLD | templateHTML}}{{end}}
   </head>
 

From 4467174f8086268e8681fffd79139cc2a3ea2c3d Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 10:31:46 +0800
Subject: [PATCH 061/114] feat(review): add review permission

---
 internal/controller/report_controller.go  |  9 +++++++--
 internal/controller/review_controller.go  | 11 +++++++++--
 internal/schema/report_schema.go          |  5 ++++-
 internal/schema/review_schema.go          |  2 ++
 internal/service/report/report_service.go |  3 +++
 internal/service/review/review_service.go |  3 +++
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
index 484c7516..75ceb823 100644
--- a/internal/controller/report_controller.go
+++ b/internal/controller/report_controller.go
@@ -120,7 +120,8 @@ func (rc *ReportController) GetUnreviewedReportPostPage(ctx *gin.Context) {
 		return
 	}
 
-	// TODO: check permission
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
 
 	resp, err := rc.reportService.GetUnreviewedReportPostPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
@@ -143,8 +144,12 @@ func (rc *ReportController) ReviewReport(ctx *gin.Context) {
 		return
 	}
 
-	// TODO: check permission
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
+	if !req.IsAdmin {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)
+		return
+	}
 
 	err := rc.reportService.ReviewReport(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
index 967a2a16..435cefa7 100644
--- a/internal/controller/review_controller.go
+++ b/internal/controller/review_controller.go
@@ -22,12 +22,14 @@ package controller
 import (
 	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/middleware"
+	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/action"
 	"github.com/apache/incubator-answer/internal/service/rank"
 	"github.com/apache/incubator-answer/internal/service/review"
 	"github.com/apache/incubator-answer/plugin"
 	"github.com/gin-gonic/gin"
+	"github.com/segmentfault/pacman/errors"
 )
 
 // ReviewController review controller
@@ -67,7 +69,8 @@ func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
 		return
 	}
 
-	// TODO: check permission
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
 
 	req.ReviewerMapping = make(map[string]string)
 	_ = plugin.CallReviewer(func(base plugin.Reviewer) error {
@@ -97,8 +100,12 @@ func (rc *ReviewController) UpdateReview(ctx *gin.Context) {
 		return
 	}
 
-	// TODO: check permission
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
+	if !req.IsAdmin {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)
+		return
+	}
 
 	err := rc.reviewService.UpdateReview(ctx, req)
 	handler.HandleResponse(ctx, err, nil)
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index 908e0451..b80e7c26 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -93,7 +93,9 @@ type GetReportListPageResp struct {
 
 // GetUnreviewedReportPostPageReq get unreviewed report post page request
 type GetUnreviewedReportPostPageReq struct {
-	Page int `json:"page" form:"page"`
+	Page    int    `json:"page" form:"page"`
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"-"`
 }
 
 // ReviewReportReq review report request
@@ -106,4 +108,5 @@ type ReviewReportReq struct {
 	Content       string     `validate:"omitempty,notblank,gte=6,lte=65535" json:"content"`
 	Tags          []*TagItem `validate:"omitempty,dive" json:"tags"`
 	UserID        string     `json:"-"`
+	IsAdmin       bool       `json:"-"`
 }
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index bda52204..556e4df3 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -10,6 +10,7 @@ type UpdateReviewReq struct {
 	ReviewID int    `validate:"required" json:"review_id"`
 	Status   string `validate:"required,oneof=approve reject" json:"status"`
 	UserID   string `json:"-"`
+	IsAdmin  bool   `json:"-"`
 }
 
 func (r *UpdateReviewReq) IsApprove() bool {
@@ -26,6 +27,7 @@ type GetUnreviewedPostPageReq struct {
 	Page            int               `validate:"omitempty" form:"page"`
 	ReviewerMapping map[string]string `json:"-"`
 	UserID          string            `json:"-"`
+	IsAdmin         bool              `json:"-"`
 }
 
 func (r *GetUnreviewedPostPageReq) Check() (errField []*validator.FormErrorField, err error) {
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index b59e762f..8b9d28f7 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -106,6 +106,9 @@ func (rs *ReportService) AddReport(ctx context.Context, req *schema.AddReportReq
 // GetUnreviewedReportPostPage get unreviewed report post page
 func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *schema.GetUnreviewedReportPostPageReq) (
 	pageModel *pager.PageModel, err error) {
+	if !req.IsAdmin {
+		return pager.NewPageModel(0, make([]*schema.GetReportListPageResp, 0)), nil
+	}
 	lang := handler.GetLangByCtx(ctx)
 	reports, total, err := rs.reportRepo.GetReportListPage(ctx, &schema.GetReportListPageDTO{
 		Page:     req.Page,
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 217a8877..bb58f011 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -326,6 +326,9 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
 // GetUnreviewedPostPage get review page
 func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
 	pageModel *pager.PageModel, err error) {
+	if !req.IsAdmin {
+		return pager.NewPageModel(0, make([]*schema.GetUnreviewedPostPageResp, 0)), nil
+	}
 	cond := &entity.Review{
 		ObjectID: req.ObjectID,
 		Status:   entity.ReviewStatusPending,

From 741591de45324c98ca62eff791eb03615dbaa899 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 10:41:09 +0800
Subject: [PATCH 062/114] fix: hide split componnets

---
 ui/config-overrides.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 0df95a9b..770d8096 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -44,14 +44,14 @@ module.exports = {
       minChunks: 2,
       cacheGroups: {
         automaticNamePrefix: 'chunk',
-        components: {
-          test: /[\\/]components[\\/]/,
-          name: 'components',
-          priority: 14,
-          reuseExistingChunk: true,
-          minChunks: 1,
-          chunks: 'initial',
-        },
+        // components: {
+        //   test: /[\\/]components[\\/]/,
+        //   name: 'components',
+        //   priority: 14,
+        //   reuseExistingChunk: true,
+        //   minChunks: 1,
+        //   chunks: 'initial',
+        // },
         i18next: {
           name: 'i18next',
           test: /[\/]node_modules[\/](i18next)[\/]/,

From 7e84689595f3d78b2ce28239696fd56286c5e80a Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 10:47:56 +0800
Subject: [PATCH 063/114] feat(plugin): add reviewer-basic plugin

---
 script/plugin_list | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/plugin_list b/script/plugin_list
index 5e6a4182..49324ca0 100644
--- a/script/plugin_list
+++ b/script/plugin_list
@@ -1 +1,2 @@
-github.com/apache/incubator-answer-plugins/connector-basic@latest
\ No newline at end of file
+github.com/apache/incubator-answer-plugins/connector-basic@latest
+github.com/apache/incubator-answer-plugins/reviewer-basic@latest
\ No newline at end of file

From aea7755eabdb6a37e952ace1f1ffeade61931c35 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 11:28:48 +0800
Subject: [PATCH 064/114] fix(review): add user repo

---
 cmd/wire_gen.go                           | 2 +-
 internal/service/review/review_service.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index af0c88c4..3c17888f 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -172,7 +172,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
 	reviewRepo := review.NewReviewRepo(dataData)
-	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService)
+	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, userRepo, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService)
 	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
 	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService, reviewService)
 	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index bb58f011..9992e59a 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -70,6 +70,7 @@ func NewReviewService(
 	reviewRepo ReviewRepo,
 	objectInfoService *object_info.ObjService,
 	userCommon *usercommon.UserCommon,
+	userRepo usercommon.UserRepo,
 	questionRepo questioncommon.QuestionRepo,
 	answerRepo answercommon.AnswerRepo,
 	userRoleService *role.UserRoleRelService,
@@ -81,6 +82,7 @@ func NewReviewService(
 		reviewRepo:                       reviewRepo,
 		objectInfoService:                objectInfoService,
 		userCommon:                       userCommon,
+		userRepo:                         userRepo,
 		questionRepo:                     questionRepo,
 		answerRepo:                       answerRepo,
 		userRoleService:                  userRoleService,

From 087f0a0d21efebfdf55f4109c7cbb7b26dc25d5e Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 12:12:47 +0800
Subject: [PATCH 065/114] feat(question): add question pending status tip

---
 i18n/en_US.yaml                              | 2 ++
 internal/base/reason/reason.go               | 1 +
 internal/schema/question_schema.go           | 7 ++++---
 internal/service/content/question_service.go | 6 ++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 2d595775..88443eac 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -201,6 +201,8 @@ backend:
     question:
       already_deleted:
         other: This post has been deleted.
+      under_review:
+        other: Your post is awaiting review. It will be visible after it has been approved.
       not_found:
         other: Question not found.
       cannot_deleted:
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 99a7a6d9..55f24322 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -45,6 +45,7 @@ const (
 	QuestionCannotClose              = "error.question.cannot_close"
 	QuestionCannotUpdate             = "error.question.cannot_update"
 	QuestionAlreadyDeleted           = "error.question.already_deleted"
+	QuestionUnderReview              = "error.question.under_review"
 	AnswerNotFound                   = "error.answer.not_found"
 	AnswerCannotDeleted              = "error.answer.cannot_deleted"
 	AnswerCannotUpdate               = "error.answer.cannot_update"
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 44ff1303..4df89cf6 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -279,9 +279,10 @@ type AdminQuestionInfo struct {
 type OperationLevel string
 
 const (
-	OperationLevelInfo    OperationLevel = "info"
-	OperationLevelDanger  OperationLevel = "danger"
-	OperationLevelWarning OperationLevel = "warning"
+	OperationLevelInfo      OperationLevel = "info"
+	OperationLevelDanger    OperationLevel = "danger"
+	OperationLevelWarning   OperationLevel = "warning"
+	OperationLevelSecondary OperationLevel = "secondary"
 )
 
 type Operation struct {
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index 58b7b931..db777eab 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -965,6 +965,12 @@ func (qs *QuestionService) GetQuestion(ctx context.Context, questionID, userID s
 		operation.Level = schema.OperationLevelDanger
 		question.Operation = operation
 	}
+	if question.Status == entity.QuestionStatusPending {
+		operation := &schema.Operation{}
+		operation.Msg = translator.Tr(handler.GetLangByCtx(ctx), reason.QuestionUnderReview)
+		operation.Level = schema.OperationLevelSecondary
+		question.Operation = operation
+	}
 
 	question.Description = htmltext.FetchExcerpt(question.HTML, "...", 240)
 	question.MemberActions = permission.GetQuestionPermission(ctx, userID, question.UserID, question.Status,

From aad6e33b483ccae05b0d694696cb44c4c680ed54 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 12:13:06 +0800
Subject: [PATCH 066/114] fix: answer add pending state

---
 i18n/en_US.yaml                                  |  1 +
 ui/config-overrides.js                           | 16 ++++++++--------
 .../Questions/Detail/components/Answer/index.tsx |  6 ++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 61af80e1..28f445f5 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1885,3 +1885,4 @@ ui:
     post_reopen: This post has been reopened.
     post_list: This post has been listed.
     post_unlist: This post has been unlisted.
+    post_pending: Your post is awaiting review. This is a preview, it will be visible after it has been approved.
diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 770d8096..11496b08 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -44,14 +44,14 @@ module.exports = {
       minChunks: 2,
       cacheGroups: {
         automaticNamePrefix: 'chunk',
-        // components: {
-        //   test: /[\\/]components[\\/]/,
-        //   name: 'components',
-        //   priority: 14,
-        //   reuseExistingChunk: true,
-        //   minChunks: 1,
-        //   chunks: 'initial',
-        // },
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 14,
+          reuseExistingChunk: true,
+          minChunks: process.env.NODE_ENV === 'production' ? 1 : 2,
+          chunks: 'initial',
+        },
         i18next: {
           name: 'i18next',
           test: /[\/]node_modules[\/](i18next)[\/]/,
diff --git a/ui/src/pages/Questions/Detail/components/Answer/index.tsx b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
index 1fc90955..474c83d6 100644
--- a/ui/src/pages/Questions/Detail/components/Answer/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
@@ -99,6 +99,12 @@ const Index: FC<Props> = ({
           {t('post_deleted', { keyPrefix: 'messages' })}
         </Alert>
       )}
+      {data.status === 11 && (
+        <Alert variant="secondary" className="mb-4">
+          {t('post_pending', { keyPrefix: 'messages' })}
+        </Alert>
+      )}
+
       {data?.accepted === 2 && (
         <div className="mb-3 lh-1">
           <Badge bg="success" pill>

From 6201a5a740908818afa24cf78fd70e087fd12ef4 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 12:13:06 +0800
Subject: [PATCH 067/114] fix: answer add pending state

---
 i18n/en_US.yaml                                  |  1 +
 ui/config-overrides.js                           | 16 ++++++++--------
 .../Questions/Detail/components/Answer/index.tsx |  6 ++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 7236e700..37a2ecdc 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1882,3 +1882,4 @@ ui:
     post_reopen: This post has been reopened.
     post_list: This post has been listed.
     post_unlist: This post has been unlisted.
+    post_pending: Your post is awaiting review. This is a preview, it will be visible after it has been approved.
diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 770d8096..11496b08 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -44,14 +44,14 @@ module.exports = {
       minChunks: 2,
       cacheGroups: {
         automaticNamePrefix: 'chunk',
-        // components: {
-        //   test: /[\\/]components[\\/]/,
-        //   name: 'components',
-        //   priority: 14,
-        //   reuseExistingChunk: true,
-        //   minChunks: 1,
-        //   chunks: 'initial',
-        // },
+        components: {
+          test: /[\\/]components[\\/]/,
+          name: 'components',
+          priority: 14,
+          reuseExistingChunk: true,
+          minChunks: process.env.NODE_ENV === 'production' ? 1 : 2,
+          chunks: 'initial',
+        },
         i18next: {
           name: 'i18next',
           test: /[\/]node_modules[\/](i18next)[\/]/,
diff --git a/ui/src/pages/Questions/Detail/components/Answer/index.tsx b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
index 1fc90955..474c83d6 100644
--- a/ui/src/pages/Questions/Detail/components/Answer/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Answer/index.tsx
@@ -99,6 +99,12 @@ const Index: FC<Props> = ({
           {t('post_deleted', { keyPrefix: 'messages' })}
         </Alert>
       )}
+      {data.status === 11 && (
+        <Alert variant="secondary" className="mb-4">
+          {t('post_pending', { keyPrefix: 'messages' })}
+        </Alert>
+      )}
+
       {data?.accepted === 2 && (
         <div className="mb-3 lh-1">
           <Badge bg="success" pill>

From 87d8d2a00825f4c2fdf917534eac1c82a4fe22ba Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 14:34:02 +0800
Subject: [PATCH 068/114] fix: diff error

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

diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 13644cd0..27d303b3 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -23,6 +23,8 @@ import pattern from '@/common/pattern';
 import { USER_AGENT_NAMES } from '@/common/constants';
 import type * as Type from '@/common/interface';
 
+const Diff = require('diff');
+
 function thousandthDivision(num) {
   const reg = /\d{1,3}(?=(\d{3})+$)/g;
   return `${num}`.replace(reg, '$&,');
@@ -184,30 +186,28 @@ function diffText(newText: string, oldText?: string): string {
     return escapeHtml(newText);
   }
   let result = [];
-  import('diff').then((Diff) => {
-    const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
-    result = diff.map((part) => {
-      if (part.added) {
-        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">${part.value}</span>`;
+  const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
+  result = diff.map((part) => {
+    if (part.added) {
+      if (part.value.replace(/\n/g, '').length <= 0) {
+        return `<span class="review-text-add d-block">${part.value.replace(
+          /\n/g,
+          '↵\n',
+        )}</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 `<span class="review-text-add">${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;
-    });
+    return part.value;
   });
 
   return result.join('');

From 24651285bd5615d65890594fd350a01a7004c95d Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 14:34:47 +0800
Subject: [PATCH 069/114] Feat/1.3.0/UI (#841)

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

diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts
index 13644cd0..27d303b3 100644
--- a/ui/src/utils/common.ts
+++ b/ui/src/utils/common.ts
@@ -23,6 +23,8 @@ import pattern from '@/common/pattern';
 import { USER_AGENT_NAMES } from '@/common/constants';
 import type * as Type from '@/common/interface';
 
+const Diff = require('diff');
+
 function thousandthDivision(num) {
   const reg = /\d{1,3}(?=(\d{3})+$)/g;
   return `${num}`.replace(reg, '$&,');
@@ -184,30 +186,28 @@ function diffText(newText: string, oldText?: string): string {
     return escapeHtml(newText);
   }
   let result = [];
-  import('diff').then((Diff) => {
-    const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
-    result = diff.map((part) => {
-      if (part.added) {
-        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">${part.value}</span>`;
+  const diff = Diff.diffChars(escapeHtml(oldText), escapeHtml(newText));
+  result = diff.map((part) => {
+    if (part.added) {
+      if (part.value.replace(/\n/g, '').length <= 0) {
+        return `<span class="review-text-add d-block">${part.value.replace(
+          /\n/g,
+          '↵\n',
+        )}</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 `<span class="review-text-add">${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;
-    });
+    return part.value;
   });
 
   return result.join('');

From ce9a34b8d5d3655221e00f8f63b4733e02465737 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 16:16:57 +0800
Subject: [PATCH 070/114] feat(question): show pending question for user

---
 internal/controller/question_controller.go   |  2 ++
 internal/entity/answer_entity.go             |  8 +++++
 internal/repo/answer/answer_repo.go          | 36 ++++++++++++++++++++
 internal/repo/question/question_repo.go      | 12 ++++---
 internal/schema/question_schema.go           |  3 ++
 internal/service/answer_common/answer.go     |  7 ++++
 internal/service/content/question_service.go | 26 ++++++++------
 internal/service/question_common/question.go |  2 +-
 8 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
index db35c83f..072ffd74 100644
--- a/internal/controller/question_controller.go
+++ b/internal/controller/question_controller.go
@@ -817,6 +817,7 @@ func (qc *QuestionController) PersonalQuestionPage(ctx *gin.Context) {
 	}
 
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
 	resp, err := qc.questionService.PersonalQuestionPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
@@ -841,6 +842,7 @@ func (qc *QuestionController) PersonalAnswerPage(ctx *gin.Context) {
 	}
 
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
 	resp, err := qc.questionService.PersonalAnswerPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
diff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.go
index ee5bbc2c..0d21f15b 100644
--- a/internal/entity/answer_entity.go
+++ b/internal/entity/answer_entity.go
@@ -63,6 +63,14 @@ type AnswerSearch struct {
 	PageSize       int    `json:"page_size" form:"page_size"` // Search page size
 }
 
+type PersonalAnswerPageQueryCond struct {
+	Page        int
+	PageSize    int
+	UserID      string
+	Order       string
+	ShowPending bool
+}
+
 // TableName answer table name
 func (Answer) TableName() string {
 	return "answer"
diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go
index aca7517c..029a1970 100644
--- a/internal/repo/answer/answer_repo.go
+++ b/internal/repo/answer/answer_repo.go
@@ -363,6 +363,42 @@ func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearc
 	return rows, count, nil
 }
 
+// GetPersonalAnswerPage personal answer page
+func (ar *answerRepo) GetPersonalAnswerPage(ctx context.Context, req *entity.PersonalAnswerPageQueryCond) (
+	resp []*entity.Answer, total int64, err error) {
+	cond := &entity.Answer{
+		UserID: req.UserID,
+	}
+	session := ar.data.DB.Context(ctx)
+	switch req.Order {
+	case entity.AnswerSearchOrderByTime:
+		session = session.OrderBy("created_at desc")
+	case entity.AnswerSearchOrderByTimeAsc:
+		session = session.OrderBy("created_at asc")
+	case entity.AnswerSearchOrderByVote:
+		session = session.OrderBy("vote_count desc")
+	default:
+		session = session.OrderBy("adopted desc,vote_count desc,created_at asc")
+	}
+	if req.ShowPending {
+		session = session.And("status != ?", entity.AnswerStatusDeleted)
+	} else {
+		session = session.And("status = ?", entity.AnswerStatusAvailable)
+	}
+	resp = make([]*entity.Answer, 0)
+	total, err = pager.Help(req.Page, req.PageSize, &resp, cond, session)
+	if err != nil {
+		return nil, 0, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	if handler.GetEnableShortID(ctx) {
+		for _, item := range resp {
+			item.ID = uid.EnShortID(item.ID)
+			item.QuestionID = uid.EnShortID(item.QuestionID)
+		}
+	}
+	return resp, total, nil
+}
+
 func (ar *answerRepo) AdminSearchList(ctx context.Context, req *schema.AdminAnswerPageReq) (
 	resp []*entity.Answer, total int64, err error) {
 	cond := &entity.Answer{}
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index ee30929f..920c0b08 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -344,12 +344,16 @@ func (qr *questionRepo) SitemapQuestions(ctx context.Context, page, pageSize int
 }
 
 // GetQuestionPage query question page
-func (qr *questionRepo) GetQuestionPage(ctx context.Context, page, pageSize int, tagIDs []string, userID, orderCond string, inDays int, showHidden bool) (
+func (qr *questionRepo) GetQuestionPage(ctx context.Context, page, pageSize int,
+	tagIDs []string, userID, orderCond string, inDays int, showHidden, showPending bool) (
 	questionList []*entity.Question, total int64, err error) {
 	questionList = make([]*entity.Question, 0)
-
-	session := qr.data.DB.Context(ctx).Where("question.status = ? OR question.status = ?",
-		entity.QuestionStatusAvailable, entity.QuestionStatusClosed)
+	session := qr.data.DB.Context(ctx)
+	status := []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed}
+	if showPending {
+		status = append(status, entity.QuestionStatusPending)
+	}
+	session.In("question.status", status)
 	if len(tagIDs) > 0 {
 		session.Join("LEFT", "tag_rel", "question.id = tag_rel.object_id")
 		session.In("tag_rel.tag_id", tagIDs)
diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
index 4df89cf6..48fd97c5 100644
--- a/internal/schema/question_schema.go
+++ b/internal/schema/question_schema.go
@@ -356,6 +356,7 @@ type QuestionPageReq struct {
 	LoginUserID      string `json:"-"`
 	UserIDBeSearched string `json:"-"`
 	TagID            string `json:"-"`
+	ShowPending      bool   `json:"-"`
 }
 
 const (
@@ -473,6 +474,7 @@ type PersonalQuestionPageReq struct {
 	OrderCond   string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
 	Username    string `validate:"omitempty,gt=0,lte=100" form:"username"`
 	LoginUserID string `json:"-"`
+	IsAdmin     bool   `json:"-"`
 }
 
 type PersonalAnswerPageReq struct {
@@ -481,6 +483,7 @@ type PersonalAnswerPageReq struct {
 	OrderCond   string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
 	Username    string `validate:"omitempty,gt=0,lte=100" form:"username"`
 	LoginUserID string `json:"-"`
+	IsAdmin     bool   `json:"-"`
 }
 
 type PersonalCollectionPageReq struct {
diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.go
index 4d8959fe..af2be2f0 100644
--- a/internal/service/answer_common/answer.go
+++ b/internal/service/answer_common/answer.go
@@ -43,6 +43,8 @@ type AnswerRepo interface {
 	GetCountByUserID(ctx context.Context, userID string) (int64, error)
 	GetIDsByUserIDAndQuestionID(ctx context.Context, userID string, questionID string) ([]string, error)
 	SearchList(ctx context.Context, search *entity.AnswerSearch) ([]*entity.Answer, int64, error)
+	GetPersonalAnswerPage(ctx context.Context, cond *entity.PersonalAnswerPageQueryCond) (
+		resp []*entity.Answer, total int64, err error)
 	AdminSearchList(ctx context.Context, search *schema.AdminAnswerPageReq) ([]*entity.Answer, int64, error)
 	UpdateAnswerStatus(ctx context.Context, answerID string, status int) (err error)
 	GetAnswerCount(ctx context.Context) (count int64, err error)
@@ -88,6 +90,11 @@ func (as *AnswerCommon) Search(ctx context.Context, search *entity.AnswerSearch)
 	return list, count, err
 }
 
+func (as *AnswerCommon) PersonalAnswerPage(ctx context.Context,
+	cond *entity.PersonalAnswerPageQueryCond) ([]*entity.Answer, int64, error) {
+	return as.answerRepo.GetPersonalAnswerPage(ctx, cond)
+}
+
 func (as *AnswerCommon) ShowFormat(ctx context.Context, data *entity.Answer) *schema.AnswerInfo {
 	info := schema.AnswerInfo{}
 	info.ID = data.ID
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index db777eab..c5a172e0 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -934,8 +934,9 @@ func (qs *QuestionService) GetQuestion(ctx context.Context, questionID, userID s
 	if err != nil {
 		return
 	}
-	// If the question is deleted, only the administrator and the author can view it
-	if question.Status == entity.QuestionStatusDeleted && !per.CanReopen && question.UserID != userID {
+	// If the question is deleted or pending, only the administrator and the author can view it
+	if (question.Status == entity.QuestionStatusDeleted ||
+		question.Status == entity.QuestionStatusPending) && !per.CanReopen && question.UserID != userID {
 		return nil, errors.NotFound(reason.QuestionNotFound)
 	}
 	if question.Status != entity.QuestionStatusClosed {
@@ -1021,6 +1022,10 @@ func (qs *QuestionService) PersonalQuestionPage(ctx context.Context, req *schema
 	search.PageSize = req.PageSize
 	search.UserIDBeSearched = userinfo.ID
 	search.LoginUserID = req.LoginUserID
+	// Only author and administrator can view the pending question
+	if req.LoginUserID == userinfo.ID || req.IsAdmin {
+		search.ShowPending = true
+	}
 	questionList, total, err := qs.GetQuestionPage(ctx, search)
 	if err != nil {
 		return nil, err
@@ -1047,17 +1052,18 @@ func (qs *QuestionService) PersonalAnswerPage(ctx context.Context, req *schema.P
 	if !exist {
 		return nil, errors.BadRequest(reason.UserNotFound)
 	}
-	answersearch := &entity.AnswerSearch{}
-	answersearch.UserID = userinfo.ID
-	answersearch.PageSize = req.PageSize
-	answersearch.Page = req.Page
+	cond := &entity.PersonalAnswerPageQueryCond{}
+	cond.UserID = userinfo.ID
+	cond.Page = req.Page
+	cond.PageSize = req.PageSize
+	cond.ShowPending = req.IsAdmin || req.LoginUserID == cond.UserID
 	if req.OrderCond == "newest" {
-		answersearch.Order = entity.AnswerSearchOrderByTime
+		cond.Order = entity.AnswerSearchOrderByTime
 	} else {
-		answersearch.Order = entity.AnswerSearchOrderByDefault
+		cond.Order = entity.AnswerSearchOrderByDefault
 	}
 	questionIDs := make([]string, 0)
-	answerList, total, err := qs.questioncommon.AnswerCommon.Search(ctx, answersearch)
+	answerList, total, err := qs.questioncommon.AnswerCommon.PersonalAnswerPage(ctx, cond)
 	if err != nil {
 		return nil, err
 	}
@@ -1301,7 +1307,7 @@ func (qs *QuestionService) GetQuestionPage(ctx context.Context, req *schema.Ques
 	}
 
 	questionList, total, err := qs.questionRepo.GetQuestionPage(ctx, req.Page, req.PageSize,
-		tagIDs, req.UserIDBeSearched, req.OrderCond, req.InDays, showHidden)
+		tagIDs, req.UserIDBeSearched, req.OrderCond, req.InDays, showHidden, req.ShowPending)
 	if err != nil {
 		return nil, 0, err
 	}
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 29b2a0c6..9f845c95 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -55,7 +55,7 @@ type QuestionRepo interface {
 	UpdateQuestion(ctx context.Context, question *entity.Question, Cols []string) (err error)
 	GetQuestion(ctx context.Context, id string) (question *entity.Question, exist bool, err error)
 	GetQuestionList(ctx context.Context, question *entity.Question) (questions []*entity.Question, err error)
-	GetQuestionPage(ctx context.Context, page, pageSize int, tagIDs []string, userID, orderCond string, inDays int, showHidden bool) (
+	GetQuestionPage(ctx context.Context, page, pageSize int, tagIDs []string, userID, orderCond string, inDays int, showHidden, showPending bool) (
 		questionList []*entity.Question, total int64, err error)
 	UpdateQuestionStatus(ctx context.Context, questionID string, status int) (err error)
 	UpdateQuestionStatusWithOutUpdateTime(ctx context.Context, question *entity.Question) (err error)

From 7e147874ac5a3eb1ad99f0b037edac1b65971f33 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 16:51:38 +0800
Subject: [PATCH 071/114] fix(review): get review flag comment without status

---
 internal/repo/comment/comment_repo.go              | 12 ++++++++++++
 internal/service/comment_common/comment_service.go |  1 +
 internal/service/object_info/object_info.go        |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/internal/repo/comment/comment_repo.go b/internal/repo/comment/comment_repo.go
index 0969ee47..79f0eaa9 100644
--- a/internal/repo/comment/comment_repo.go
+++ b/internal/repo/comment/comment_repo.go
@@ -21,6 +21,7 @@ package comment
 
 import (
 	"context"
+
 	"github.com/segmentfault/pacman/log"
 
 	"github.com/apache/incubator-answer/internal/base/data"
@@ -102,6 +103,17 @@ func (cr *commentRepo) GetComment(ctx context.Context, commentID string) (
 	return
 }
 
+// GetCommentWithoutStatus get comment one without status
+func (cr *commentRepo) GetCommentWithoutStatus(ctx context.Context, commentID string) (
+	comment *entity.Comment, exist bool, err error) {
+	comment = &entity.Comment{}
+	exist, err = cr.data.DB.Context(ctx).ID(commentID).Get(comment)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
 func (cr *commentRepo) GetCommentCount(ctx context.Context) (count int64, err error) {
 	list := make([]*entity.Comment, 0)
 	count, err = cr.data.DB.Context(ctx).Where("status = ?", entity.CommentStatusAvailable).FindAndCount(&list)
diff --git a/internal/service/comment_common/comment_service.go b/internal/service/comment_common/comment_service.go
index eea32e6c..3554a358 100644
--- a/internal/service/comment_common/comment_service.go
+++ b/internal/service/comment_common/comment_service.go
@@ -31,6 +31,7 @@ import (
 // CommentCommonRepo comment repository
 type CommentCommonRepo interface {
 	GetComment(ctx context.Context, commentID string) (comment *entity.Comment, exist bool, err error)
+	GetCommentWithoutStatus(ctx context.Context, commentID string) (comment *entity.Comment, exist bool, err error)
 	GetCommentCount(ctx context.Context) (count int64, err error)
 	RemoveAllUserComment(ctx context.Context, userID string) (err error)
 }
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index e20d24b7..4f000900 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -152,7 +152,7 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 			Status:     tagInfo.Status,
 		}
 	case constant.CommentObjectType:
-		commentInfo, exist, err := os.commentRepo.GetComment(ctx, objectID)
+		commentInfo, exist, err := os.commentRepo.GetCommentWithoutStatus(ctx, objectID)
 		if err != nil {
 			return nil, err
 		}

From 8a29dca1cd069887683cdc4455d87be775c14d0d Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 14 Mar 2024 17:07:13 +0800
Subject: [PATCH 072/114] fix: i18n update

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

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 37a2ecdc..1d6d3dd8 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1062,6 +1062,7 @@ ui:
     asked: asked
     update: Modified
     edit: edited
+    commented: commented
     Views: Viewed
     Follow: Follow
     Following: Following

From 03b3555ddf0ceb12f322594b8854c2af3fbf8c0b Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 14 Mar 2024 17:32:28 +0800
Subject: [PATCH 073/114] fix(review): add translation for review

---
 i18n/en_US.yaml                              | 7 +++++++
 internal/base/constant/revision.go           | 6 ++++++
 internal/service/content/revision_service.go | 8 +++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index c1c64a01..d70850e6 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -492,6 +492,13 @@ backend:
       other: accept
     accepted:
       other: accepted
+  review:
+    queued_post:
+      other: Queued post
+    flagged_post:
+      other: Flagged post
+    suggested_post_edit:
+      other: Suggested edits
 
 # The following fields are used for interface presentation(Front-end)
 ui:
diff --git a/internal/base/constant/revision.go b/internal/base/constant/revision.go
index 93ccf2ec..0d7dc586 100644
--- a/internal/base/constant/revision.go
+++ b/internal/base/constant/revision.go
@@ -17,3 +17,9 @@ const (
 	ReportOperationUnlistPost   = "unlist_post"
 	ReportOperationIgnoreReport = "ignore_report"
 )
+
+const (
+	ReviewQueuedPostLabel        = "review.queued_post"
+	ReviewFlaggedPostLabel       = "review.flagged_post"
+	ReviewSuggestedPostEditLabel = "review.suggested_post_edit"
+)
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index e004ad07..f39e055a 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -25,8 +25,10 @@ import (
 	"time"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
+	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/pager"
 	"github.com/apache/incubator-answer/internal/base/reason"
+	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
@@ -463,7 +465,7 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 		} else {
 			resp = append(resp, &schema.GetReviewingTypeResp{
 				Name:       string(constant.QueuedPost),
-				Label:      "Queued post",
+				Label:      translator.Tr(handler.GetLangByCtx(ctx), constant.ReviewQueuedPostLabel),
 				TodoAmount: reviewCount,
 			})
 		}
@@ -477,7 +479,7 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 		} else {
 			resp = append(resp, &schema.GetReviewingTypeResp{
 				Name:       string(constant.FlaggedPost),
-				Label:      "Flagged post",
+				Label:      translator.Tr(handler.GetLangByCtx(ctx), constant.ReviewFlaggedPostLabel),
 				TodoAmount: reportCount,
 			})
 		}
@@ -490,7 +492,7 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
 	} else {
 		resp = append(resp, &schema.GetReviewingTypeResp{
 			Name:       string(constant.SuggestedPostEdit),
-			Label:      "Suggested edits",
+			Label:      translator.Tr(handler.GetLangByCtx(ctx), constant.ReviewSuggestedPostEditLabel),
 			TodoAmount: countUnreviewedRevision,
 		})
 	}

From 64381f16823d278eb8e6c317228669a1774221b5 Mon Sep 17 00:00:00 2001
From: Akhil <surapuramakhil@gmail.com>
Date: Thu, 14 Mar 2024 06:42:02 -0400
Subject: [PATCH 074/114] refactor Changes - moved legal clicks outside of
 signup (#835)

To enhance reusability - moved this behavior outside so that other
components can reuse this.

Testing Everything is running smooth after changes.

---------

Co-authored-by: LinkinStars <linkinstar@foxmail.com>
---
 ui/src/behaviour/clicks.tsx                   | 32 +++++++++++++++++++
 .../Register/components/SignUpForm/index.tsx  | 30 ++++-------------
 2 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 ui/src/behaviour/clicks.tsx

diff --git a/ui/src/behaviour/clicks.tsx b/ui/src/behaviour/clicks.tsx
new file mode 100644
index 00000000..a098b3e8
--- /dev/null
+++ b/ui/src/behaviour/clicks.tsx
@@ -0,0 +1,32 @@
+import { MouseEvent, useCallback } from 'react';
+
+import { useLegalPrivacy, useLegalTos } from '@/services/client/legal';
+
+export const useLegalClick = () => {
+  const { data: tos } = useLegalTos();
+  const { data: privacy } = useLegalPrivacy();
+
+  const legalClick = useCallback(
+    (evt: MouseEvent, type: 'tos' | 'privacy') => {
+      evt.stopPropagation();
+      const contentText =
+        type === 'tos'
+          ? tos?.terms_of_service_original_text
+          : privacy?.privacy_policy_original_text;
+      let matchUrl: URL | undefined;
+      try {
+        if (contentText) {
+          matchUrl = new URL(contentText);
+        }
+        // eslint-disable-next-line no-empty
+      } catch (ex) {}
+      if (matchUrl) {
+        evt.preventDefault();
+        window.open(matchUrl.toString());
+      }
+    },
+    [tos, privacy],
+  );
+
+  return legalClick;
+};
diff --git a/ui/src/pages/Users/Register/components/SignUpForm/index.tsx b/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
index 9e322df0..c865f048 100644
--- a/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
+++ b/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
@@ -17,16 +17,17 @@
  * under the License.
  */
 
-import React, { FormEvent, MouseEvent, useState } from 'react';
+import React, { FormEvent, useState } from 'react';
 import { Form, Button } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { useCaptchaModal } from '@/hooks';
 import type { FormDataType, RegisterReqParams } from '@/common/interface';
-import { register, useLegalTos, useLegalPrivacy } from '@/services';
+import { register } from '@/services';
 import userStore from '@/stores/loggedUserInfo';
 import { handleFormError } from '@/utils';
+import { useLegalClick } from '@/behaviour/clicks';
 
 interface Props {
   callback: () => void;
@@ -86,26 +87,7 @@ const Index: React.FC<Props> = ({ callback }) => {
     return bol;
   };
 
-  const { data: tos } = useLegalTos();
-  const { data: privacy } = useLegalPrivacy();
-  const argumentClick = (evt: MouseEvent, type: 'tos' | 'privacy') => {
-    evt.stopPropagation();
-    const contentText =
-      type === 'tos'
-        ? tos?.terms_of_service_original_text
-        : privacy?.privacy_policy_original_text;
-    let matchUrl: URL | undefined;
-    try {
-      if (contentText) {
-        matchUrl = new URL(contentText);
-      }
-      // eslint-disable-next-line no-empty
-    } catch (ex) {}
-    if (matchUrl) {
-      evt.preventDefault();
-      window.open(matchUrl.toString());
-    }
-  };
+  const legalClick = useLegalClick();
 
   const handleRegister = (event?: any) => {
     if (event) {
@@ -232,7 +214,7 @@ const Index: React.FC<Props> = ({ callback }) => {
           <Link
             to="/privacy"
             onClick={(evt) => {
-              argumentClick(evt, 'privacy');
+              legalClick(evt, 'privacy');
             }}
             target="_blank">
             privacy policy
@@ -241,7 +223,7 @@ const Index: React.FC<Props> = ({ callback }) => {
           <Link
             to="/tos"
             onClick={(evt) => {
-              argumentClick(evt, 'tos');
+              legalClick(evt, 'tos');
             }}
             target="_blank">
             terms of service

From 6df4d7926015796c8251b10408aa967f665c0ff7 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 10:19:57 +0800
Subject: [PATCH 075/114] fix: ui adjustment

---
 ui/src/pages/Admin/Answers/index.tsx          | 48 +++++++++----------
 .../Ask/components/SearchQuestion/index.tsx   | 21 +++++---
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index a653f7f5..091fe2db 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -110,32 +110,28 @@ const Answers: FC = () => {
             return (
               <tr key={li.id}>
                 <td>
-                  <Stack>
-                    <Stack direction="horizontal" gap={2}>
-                      <a
-                        href={pathFactory.answerLanding({
-                          questionId: li.question_id,
-                          slugTitle: li.question_info.url_title,
-                          answerId: li.id,
-                        })}
-                        target="_blank"
-                        className="text-break text-wrap"
-                        rel="noreferrer">
-                        {li.question_info.title}
-                        {li.accepted === 2 && (
-                          <Icon
-                            name="check-circle-fill"
-                            className="ms-2 text-success"
-                          />
-                        )}
-                      </a>
-                    </Stack>
-                    <div
-                      className="text-truncate-2 small"
-                      style={{ maxWidth: '30rem' }}>
-                      {escapeRemove(li.description)}
-                    </div>
-                  </Stack>
+                  <a
+                    href={pathFactory.answerLanding({
+                      questionId: li.question_id,
+                      slugTitle: li.question_info.url_title,
+                      answerId: li.id,
+                    })}
+                    target="_blank"
+                    className="text-break text-wrap"
+                    rel="noreferrer">
+                    {li.question_info.title}
+                  </a>
+                  {li.accepted === 2 && (
+                    <Icon
+                      name="check-circle-fill"
+                      className="ms-2 text-success"
+                    />
+                  )}
+                  <div
+                    className="text-truncate-2 small"
+                    style={{ maxWidth: '30rem' }}>
+                    {escapeRemove(li.description)}
+                  </div>
                 </td>
                 <td>{li.vote_count}</td>
                 <td>
diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
index 2f79305b..96b2b0ac 100644
--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
@@ -46,17 +46,24 @@ const SearchQuestion = ({ similarQuestions }) => {
                 <ListGroup.Item
                   action
                   as="a"
-                  className="link-dark text-wrap text-break grid gap-0 row-gap-3"
+                  className="link-dark text-wrap text-break"
                   key={item.id}
                   href={pathFactory.questionLanding(item.id, item.url_title)}
                   target="_blank">
-                  {item.title}
-                  {item.status === 'closed'
-                    ? ` [${t('closed', { keyPrefix: 'question' })}]`
-                    : null}
+                  <span
+                    className={`${
+                      item.accepted_answer || item.answer_count > 0
+                        ? 'me-3'
+                        : ''
+                    }`}>
+                    {item.title}
+                    {item.status === 'closed'
+                      ? ` [${t('closed', { keyPrefix: 'question' })}] `
+                      : null}
+                  </span>
 
                   {item.accepted_answer ? (
-                    <span className="small ms-3 text-success d-inline-block">
+                    <span className="small text-success d-inline-block">
                       <Icon type="bi" name="check-circle-fill" />
                       <span className="ms-1">
                         {t('x_answers', {
@@ -67,7 +74,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     </span>
                   ) : (
                     item.answer_count > 0 && (
-                      <span className="small ms-3 text-secondary d-inline-block">
+                      <span className="small text-secondary d-inline-block">
                         <Icon type="bi" name="chat-square-text-fill" />
                         <span className="ms-1">
                           {t('x_answers', {

From a309f9f897e31efc646a796beb33daa71aa7597c Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 10:40:19 +0800
Subject: [PATCH 076/114] Feat/1.3.0/UI (#848)

---
 i18n/en_US.yaml                               |  1 +
 ui/src/pages/Admin/Answers/index.tsx          | 48 +++++++++----------
 .../Ask/components/SearchQuestion/index.tsx   | 21 +++++---
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index debe3dbc..7bbbe748 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1071,6 +1071,7 @@ ui:
     asked: asked
     update: Modified
     edit: edited
+    commented: commented
     Views: Viewed
     Follow: Follow
     Following: Following
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index a653f7f5..091fe2db 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -110,32 +110,28 @@ const Answers: FC = () => {
             return (
               <tr key={li.id}>
                 <td>
-                  <Stack>
-                    <Stack direction="horizontal" gap={2}>
-                      <a
-                        href={pathFactory.answerLanding({
-                          questionId: li.question_id,
-                          slugTitle: li.question_info.url_title,
-                          answerId: li.id,
-                        })}
-                        target="_blank"
-                        className="text-break text-wrap"
-                        rel="noreferrer">
-                        {li.question_info.title}
-                        {li.accepted === 2 && (
-                          <Icon
-                            name="check-circle-fill"
-                            className="ms-2 text-success"
-                          />
-                        )}
-                      </a>
-                    </Stack>
-                    <div
-                      className="text-truncate-2 small"
-                      style={{ maxWidth: '30rem' }}>
-                      {escapeRemove(li.description)}
-                    </div>
-                  </Stack>
+                  <a
+                    href={pathFactory.answerLanding({
+                      questionId: li.question_id,
+                      slugTitle: li.question_info.url_title,
+                      answerId: li.id,
+                    })}
+                    target="_blank"
+                    className="text-break text-wrap"
+                    rel="noreferrer">
+                    {li.question_info.title}
+                  </a>
+                  {li.accepted === 2 && (
+                    <Icon
+                      name="check-circle-fill"
+                      className="ms-2 text-success"
+                    />
+                  )}
+                  <div
+                    className="text-truncate-2 small"
+                    style={{ maxWidth: '30rem' }}>
+                    {escapeRemove(li.description)}
+                  </div>
                 </td>
                 <td>{li.vote_count}</td>
                 <td>
diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
index 2f79305b..96b2b0ac 100644
--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
@@ -46,17 +46,24 @@ const SearchQuestion = ({ similarQuestions }) => {
                 <ListGroup.Item
                   action
                   as="a"
-                  className="link-dark text-wrap text-break grid gap-0 row-gap-3"
+                  className="link-dark text-wrap text-break"
                   key={item.id}
                   href={pathFactory.questionLanding(item.id, item.url_title)}
                   target="_blank">
-                  {item.title}
-                  {item.status === 'closed'
-                    ? ` [${t('closed', { keyPrefix: 'question' })}]`
-                    : null}
+                  <span
+                    className={`${
+                      item.accepted_answer || item.answer_count > 0
+                        ? 'me-3'
+                        : ''
+                    }`}>
+                    {item.title}
+                    {item.status === 'closed'
+                      ? ` [${t('closed', { keyPrefix: 'question' })}] `
+                      : null}
+                  </span>
 
                   {item.accepted_answer ? (
-                    <span className="small ms-3 text-success d-inline-block">
+                    <span className="small text-success d-inline-block">
                       <Icon type="bi" name="check-circle-fill" />
                       <span className="ms-1">
                         {t('x_answers', {
@@ -67,7 +74,7 @@ const SearchQuestion = ({ similarQuestions }) => {
                     </span>
                   ) : (
                     item.answer_count > 0 && (
-                      <span className="small ms-3 text-secondary d-inline-block">
+                      <span className="small text-secondary d-inline-block">
                         <Icon type="bi" name="chat-square-text-fill" />
                         <span className="ms-1">
                           {t('x_answers', {

From 168a998ac4fb8bba1d3ff44a71eb733dc3b906c5 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 10:50:27 +0800
Subject: [PATCH 077/114] fix(question): when recovering the question, retrieve
 the tag relationship

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

diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index 966bbf0d..d38251d9 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -628,7 +628,7 @@ func (qs *QuestionService) RecoverQuestion(ctx context.Context, req *schema.Ques
 	}
 
 	// update tag's question count
-	if err = qs.tagCommon.RemoveTagRelListByObjectID(ctx, questionInfo.ID); err != nil {
+	if err = qs.tagCommon.RecoverTagRelListByObjectID(ctx, questionInfo.ID); err != nil {
 		log.Errorf("remove tag rel list by object id error %v", err)
 	}
 

From 7e1d03e2cf146fe8b56fcb9f3a693bc2c9af4974 Mon Sep 17 00:00:00 2001
From: Shaobiao Lin <whalevocal@gmail.com>
Date: Fri, 15 Mar 2024 10:51:58 +0800
Subject: [PATCH 078/114] fix(toast): align to the center with actual element
 width (#847)

close #843

---------

Co-authored-by: LinkinStars <linkinstar@foxmail.com>
---
 ui/src/hooks/useToast/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/hooks/useToast/index.tsx b/ui/src/hooks/useToast/index.tsx
index 3541ff94..ae91a444 100644
--- a/ui/src/hooks/useToast/index.tsx
+++ b/ui/src/hooks/useToast/index.tsx
@@ -25,9 +25,9 @@ import ReactDOM from 'react-dom/client';
 const toastPortal = document.createElement('div');
 toastPortal.style.position = 'fixed';
 toastPortal.style.top = '90px';
-toastPortal.style.left = '0';
-toastPortal.style.right = '0';
-toastPortal.style.margin = 'auto';
+toastPortal.style.left = '50%';
+toastPortal.style.transform = 'translate(-50%, 0)';
+toastPortal.style.maxWidth = '100%';
 toastPortal.style.zIndex = '1001';
 
 const setPortalPosition = () => {

From 14b9cb70d32b61113573aa34f23152c041eea9b2 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 10:57:04 +0800
Subject: [PATCH 079/114] fix: rename click file

---
 ui/src/behaviour/{clicks.tsx => useLegalClick.tsx}          | 0
 ui/src/pages/Users/Register/components/SignUpForm/index.tsx | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ui/src/behaviour/{clicks.tsx => useLegalClick.tsx} (100%)

diff --git a/ui/src/behaviour/clicks.tsx b/ui/src/behaviour/useLegalClick.tsx
similarity index 100%
rename from ui/src/behaviour/clicks.tsx
rename to ui/src/behaviour/useLegalClick.tsx
diff --git a/ui/src/pages/Users/Register/components/SignUpForm/index.tsx b/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
index c865f048..0a04c550 100644
--- a/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
+++ b/ui/src/pages/Users/Register/components/SignUpForm/index.tsx
@@ -27,7 +27,7 @@ import type { FormDataType, RegisterReqParams } from '@/common/interface';
 import { register } from '@/services';
 import userStore from '@/stores/loggedUserInfo';
 import { handleFormError } from '@/utils';
-import { useLegalClick } from '@/behaviour/clicks';
+import { useLegalClick } from '@/behaviour/useLegalClick';
 
 interface Props {
   callback: () => void;

From b74f7813ac6d9df1ad16dcf09efe77243454f155 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 12:02:13 +0800
Subject: [PATCH 080/114] feat(question): count question with show status

---
 cmd/wire_gen.go                               | 30 +++++++++----------
 .../controller/template_render/userinfo.go    |  2 +-
 internal/controller/user_controller.go        |  5 +++-
 internal/repo/question/question_repo.go       |  4 +--
 internal/schema/user_schema.go                |  2 ++
 internal/service/content/user_service.go      | 15 ++++++++--
 internal/service/question_common/question.go  | 12 ++++++--
 internal/service/review/review_service.go     |  4 +--
 8 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 3c17888f..a06d93eb 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -134,14 +134,10 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	userNotificationConfigRepo := user_notification_config.NewUserNotificationConfigRepo(dataData)
 	userNotificationConfigService := user_notification_config2.NewUserNotificationConfigService(userRepo, userNotificationConfigRepo)
 	userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo, userNotificationConfigService)
-	userService := content.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService)
-	captchaRepo := captcha.NewCaptchaRepo(dataData)
-	captchaService := action.NewCaptchaService(captchaRepo)
-	userController := controller.NewUserController(authService, userService, captchaService, emailService, siteInfoCommonService, userNotificationConfigService)
-	commentRepo := comment.NewCommentRepo(dataData, uniqueIDRepo)
-	commentCommonRepo := comment.NewCommentCommonRepo(dataData, uniqueIDRepo)
-	answerRepo := answer.NewAnswerRepo(dataData, uniqueIDRepo, userRankRepo, activityRepo)
 	questionRepo := question.NewQuestionRepo(dataData, uniqueIDRepo)
+	answerRepo := answer.NewAnswerRepo(dataData, uniqueIDRepo, userRankRepo, activityRepo)
+	voteRepo := activity_common.NewVoteRepo(dataData, activityRepo)
+	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
 	tagCommonRepo := tag_common.NewTagCommonRepo(dataData, uniqueIDRepo)
 	tagRelRepo := tag.NewTagRelRepo(dataData, uniqueIDRepo)
 	tagRepo := tag.NewTagRepo(dataData, uniqueIDRepo)
@@ -149,8 +145,19 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	revisionService := revision_common.NewRevisionService(revisionRepo, userRepo)
 	activityQueueService := activity_queue.NewActivityQueueService()
 	tagCommonService := tag_common2.NewTagCommonService(tagCommonRepo, tagRelRepo, tagRepo, revisionService, siteInfoCommonService, activityQueueService)
+	collectionRepo := collection.NewCollectionRepo(dataData, uniqueIDRepo)
+	collectionCommon := collectioncommon.NewCollectionCommon(collectionRepo)
+	answerCommon := answercommon.NewAnswerCommon(answerRepo)
+	metaRepo := meta.NewMetaRepo(dataData)
+	metaService := meta2.NewMetaService(metaRepo)
+	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, revisionRepo, dataData)
+	userService := content.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService, questionCommon)
+	captchaRepo := captcha.NewCaptchaRepo(dataData)
+	captchaService := action.NewCaptchaService(captchaRepo)
+	userController := controller.NewUserController(authService, userService, captchaService, emailService, siteInfoCommonService, userNotificationConfigService)
+	commentRepo := comment.NewCommentRepo(dataData, uniqueIDRepo)
+	commentCommonRepo := comment.NewCommentCommonRepo(dataData, uniqueIDRepo)
 	objService := object_info.NewObjService(answerRepo, questionRepo, commentCommonRepo, tagCommonRepo, tagCommonService)
-	voteRepo := activity_common.NewVoteRepo(dataData, activityRepo)
 	notificationQueueService := notice_queue.NewNotificationQueueService()
 	externalNotificationQueueService := notice_queue.NewNewQuestionNotificationQueueService()
 	commentService := comment2.NewCommentService(commentRepo, commentCommonRepo, userCommon, objService, voteRepo, emailService, userRepo, notificationQueueService, externalNotificationQueueService, activityQueueService)
@@ -161,13 +168,6 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	rateLimitMiddleware := middleware.NewRateLimitMiddleware(limitRepo)
 	commentController := controller.NewCommentController(commentService, rankService, captchaService, rateLimitMiddleware)
 	reportRepo := report.NewReportRepo(dataData, uniqueIDRepo)
-	followRepo := activity_common.NewFollowRepo(dataData, uniqueIDRepo, activityRepo)
-	collectionRepo := collection.NewCollectionRepo(dataData, uniqueIDRepo)
-	collectionCommon := collectioncommon.NewCollectionCommon(collectionRepo)
-	answerCommon := answercommon.NewAnswerCommon(answerRepo)
-	metaRepo := meta.NewMetaRepo(dataData)
-	metaService := meta2.NewMetaService(metaRepo)
-	questionCommon := questioncommon.NewQuestionCommon(questionRepo, answerRepo, voteRepo, followRepo, tagCommonService, userCommon, collectionCommon, answerCommon, metaService, configService, activityQueueService, revisionRepo, dataData)
 	answerActivityRepo := activity.NewAnswerActivityRepo(dataData, activityRepo, userRankRepo, notificationQueueService)
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
diff --git a/internal/controller/template_render/userinfo.go b/internal/controller/template_render/userinfo.go
index 731f6e8e..d2c222c1 100644
--- a/internal/controller/template_render/userinfo.go
+++ b/internal/controller/template_render/userinfo.go
@@ -25,5 +25,5 @@ import (
 )
 
 func (q *TemplateRenderController) UserInfo(ctx context.Context, req *schema.GetOtherUserInfoByUsernameReq) (resp *schema.GetOtherUserInfoByUsernameResp, err error) {
-	return q.userService.GetOtherUserInfoByUsername(ctx, req.Username)
+	return q.userService.GetOtherUserInfoByUsername(ctx, req)
 }
diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go
index b95e86bd..f0e70cfe 100644
--- a/internal/controller/user_controller.go
+++ b/internal/controller/user_controller.go
@@ -115,7 +115,10 @@ func (uc *UserController) GetOtherUserInfoByUsername(ctx *gin.Context) {
 		return
 	}
 
-	resp, err := uc.userService.GetOtherUserInfoByUsername(ctx, req.Username)
+	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.IsAdmin = middleware.GetUserIsAdminModerator(ctx)
+
+	resp, err := uc.userService.GetOtherUserInfoByUsername(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }
 
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
index 920c0b08..29ab9c5d 100644
--- a/internal/repo/question/question_repo.go
+++ b/internal/repo/question/question_repo.go
@@ -284,10 +284,10 @@ func (qr *questionRepo) GetQuestionCount(ctx context.Context) (count int64, err
 	return count, nil
 }
 
-func (qr *questionRepo) GetUserQuestionCount(ctx context.Context, userID string) (count int64, err error) {
+func (qr *questionRepo) GetUserQuestionCount(ctx context.Context, userID string, show int) (count int64, err error) {
 	session := qr.data.DB.Context(ctx)
 	session.Where(builder.Lt{"status": entity.QuestionStatusDeleted})
-	count, err = session.Count(&entity.Question{UserID: userID})
+	count, err = session.Count(&entity.Question{UserID: userID, Show: show})
 	if err != nil {
 		return count, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go
index 53909066..7915e40c 100644
--- a/internal/schema/user_schema.go
+++ b/internal/schema/user_schema.go
@@ -21,6 +21,7 @@ package schema
 
 import (
 	"encoding/json"
+
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/segmentfault/pacman/errors"
@@ -355,6 +356,7 @@ type UserBasicInfo struct {
 type GetOtherUserInfoByUsernameReq struct {
 	Username string `validate:"required,gt=0,lte=500" form:"username"`
 	UserID   string `json:"-"`
+	IsAdmin  bool   `json:"-"`
 }
 
 type GetOtherUserInfoResp struct {
diff --git a/internal/service/content/user_service.go b/internal/service/content/user_service.go
index 6c822c71..4c9843a3 100644
--- a/internal/service/content/user_service.go
+++ b/internal/service/content/user_service.go
@@ -26,6 +26,7 @@ import (
 	"time"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
+	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/user_notification_config"
 
 	"github.com/apache/incubator-answer/internal/base/handler"
@@ -63,6 +64,7 @@ type UserService struct {
 	userExternalLoginService      *user_external_login.UserExternalLoginService
 	userNotificationConfigRepo    user_notification_config.UserNotificationConfigRepo
 	userNotificationConfigService *user_notification_config.UserNotificationConfigService
+	questionService               *questioncommon.QuestionCommon
 }
 
 func NewUserService(userRepo usercommon.UserRepo,
@@ -76,6 +78,7 @@ func NewUserService(userRepo usercommon.UserRepo,
 	userExternalLoginService *user_external_login.UserExternalLoginService,
 	userNotificationConfigRepo user_notification_config.UserNotificationConfigRepo,
 	userNotificationConfigService *user_notification_config.UserNotificationConfigService,
+	questionService *questioncommon.QuestionCommon,
 ) *UserService {
 	return &UserService{
 		userCommonService:             userCommonService,
@@ -89,6 +92,7 @@ func NewUserService(userRepo usercommon.UserRepo,
 		userExternalLoginService:      userExternalLoginService,
 		userNotificationConfigRepo:    userNotificationConfigRepo,
 		userNotificationConfigService: userNotificationConfigService,
+		questionService:               questionService,
 	}
 }
 
@@ -118,9 +122,9 @@ func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID st
 	return resp, nil
 }
 
-func (us *UserService) GetOtherUserInfoByUsername(ctx context.Context, username string) (
+func (us *UserService) GetOtherUserInfoByUsername(ctx context.Context, req *schema.GetOtherUserInfoByUsernameReq) (
 	resp *schema.GetOtherUserInfoByUsernameResp, err error) {
-	userInfo, exist, err := us.userRepo.GetByUsername(ctx, username)
+	userInfo, exist, err := us.userRepo.GetByUsername(ctx, req.Username)
 	if err != nil {
 		return nil, err
 	}
@@ -130,6 +134,13 @@ func (us *UserService) GetOtherUserInfoByUsername(ctx context.Context, username
 	resp = &schema.GetOtherUserInfoByUsernameResp{}
 	resp.ConvertFromUserEntity(userInfo)
 	resp.Avatar = us.siteInfoService.FormatAvatar(ctx, userInfo.Avatar, userInfo.EMail, userInfo.Status).GetURL()
+
+	// Only the user himself and the administrator can see the hidden questions
+	questionCount, err := us.questionService.GetPersonalUserQuestionCount(ctx, req.UserID, userInfo.ID, req.IsAdmin)
+	if err != nil {
+		return nil, err
+	}
+	resp.QuestionCount = int(questionCount)
 	return resp, nil
 }
 
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
index 9f845c95..ff0b9da5 100644
--- a/internal/service/question_common/question.go
+++ b/internal/service/question_common/question.go
@@ -70,7 +70,7 @@ type QuestionRepo interface {
 	FindByID(ctx context.Context, id []string) (questionList []*entity.Question, err error)
 	AdminQuestionPage(ctx context.Context, search *schema.AdminQuestionPageReq) ([]*entity.Question, int64, error)
 	GetQuestionCount(ctx context.Context) (count int64, err error)
-	GetUserQuestionCount(ctx context.Context, userID string) (count int64, err error)
+	GetUserQuestionCount(ctx context.Context, userID string, show int) (count int64, err error)
 	SitemapQuestions(ctx context.Context, page, pageSize int) (questionIDList []*schema.SiteMapQuestionInfo, err error)
 	RemoveAllUserQuestion(ctx context.Context, userID string) (err error)
 	UpdateSearch(ctx context.Context, questionID string) (err error)
@@ -125,7 +125,15 @@ func NewQuestionCommon(questionRepo QuestionRepo,
 }
 
 func (qs *QuestionCommon) GetUserQuestionCount(ctx context.Context, userID string) (count int64, err error) {
-	return qs.questionRepo.GetUserQuestionCount(ctx, userID)
+	return qs.questionRepo.GetUserQuestionCount(ctx, userID, 0)
+}
+
+func (qs *QuestionCommon) GetPersonalUserQuestionCount(ctx context.Context, loginUserID, userID string, isAdmin bool) (count int64, err error) {
+	show := entity.QuestionShow
+	if loginUserID == userID || isAdmin {
+		show = 0
+	}
+	return qs.questionRepo.GetUserQuestionCount(ctx, userID, show)
 }
 
 func (qs *QuestionCommon) UpdatePv(ctx context.Context, questionID string) error {
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 9992e59a..788de64c 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -130,7 +130,7 @@ func (cs *ReviewService) getReviewContentAuthorInfo(ctx context.Context, userID
 		return
 	}
 	author.Rank = user.Rank
-	author.ApprovedQuestionAmount, _ = cs.questionRepo.GetUserQuestionCount(ctx, userID)
+	author.ApprovedQuestionAmount, _ = cs.questionRepo.GetUserQuestionCount(ctx, userID, 0)
 	author.ApprovedAnswerAmount, _ = cs.answerRepo.GetCountByUserID(ctx, userID)
 	author.Role, _ = cs.userRoleService.GetUserRole(ctx, userID)
 	return
@@ -225,7 +225,7 @@ func (cs *ReviewService) updateObjectStatus(ctx context.Context, review *entity.
 			cs.externalNotificationQueueService.Send(ctx,
 				schema.CreateNewQuestionNotificationMsg(questionInfo.ID, questionInfo.Title, questionInfo.UserID, tags))
 		}
-		userQuestionCount, err := cs.questionRepo.GetUserQuestionCount(ctx, questionInfo.UserID)
+		userQuestionCount, err := cs.questionRepo.GetUserQuestionCount(ctx, questionInfo.UserID, 0)
 		if err != nil {
 			log.Errorf("get user question count failed, err: %v", err)
 		} else {

From b8ea6f1f0b16187f239ea4522f6ee66eb252f64f Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 13:58:40 +0800
Subject: [PATCH 081/114] fix: change support link

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

diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
index 39a803b0..ecaa777e 100644
--- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
@@ -46,7 +46,7 @@ const AnswerLinks = () => {
           </Col>
           <Col xs={6}>
             <a
-              href="https://answer.apache.org/community"
+              href="https://answer.apache.org/community/support"
               target="_blank"
               rel="noreferrer">
               {t('support')}

From 33ffb594e568d0c0db7a7e5dbe3b9a233454fa68 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 14:22:18 +0800
Subject: [PATCH 082/114] fix: change support link (#850)

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

diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
index 39a803b0..ecaa777e 100644
--- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
+++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx
@@ -46,7 +46,7 @@ const AnswerLinks = () => {
           </Col>
           <Col xs={6}>
             <a
-              href="https://answer.apache.org/community"
+              href="https://answer.apache.org/community/support"
               target="_blank"
               rel="noreferrer">
               {t('support')}

From 0030fda2cfcd0d36a498acf96b0ea504243e3782 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 15:45:00 +0800
Subject: [PATCH 083/114] fix: review ui update

---
 ui/config-overrides.js                             |  4 ++--
 .../pages/Review/components/FlagContent/index.tsx  | 14 +++++++++++---
 .../Review/components/QueuedContent/index.tsx      |  8 ++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 11496b08..b3ff6e8a 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -118,8 +118,8 @@ module.exports = {
           test: /[\/]node_modules[\/]/,
           priority: 2,
           minChunks: 2,
-          chunks: 'async', // 仅打包异步引用的依赖
-          reuseExistingChunk: true, // 重复使用已经存在的块
+          chunks: 'async', // only package dependencies that are referenced asynchronously
+          reuseExistingChunk: true, // reuse an existing block
         },
         nodesInitial: {
           name: 'chunk-nodesInitial',
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 11056c89..ed98e5b6 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -112,9 +112,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
         <Alert variant="info" className="border-0 rounded-0 mb-0">
           <Stack
             direction="horizontal"
-            gap={1}
+            gap={0.5}
             className="align-items-center mb-2">
-            <BaseUserCard data={submitter_user} avatarSize="24" />
+            <BaseUserCard
+              data={submitter_user}
+              avatarSize="24px"
+              avatarClass="me-2"
+            />
             {flagItemData?.submit_at && (
               <FormatTime
                 time={flagItemData.submit_at}
@@ -175,7 +179,11 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               )}
             </div>
             <div className="d-flex align-items-center small">
-              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <BaseUserCard
+                data={author_user_info}
+                avatarSize="24px"
+                avatarClass="me-2"
+              />
               <FormatTime
                 time={Number(flagItemData?.created_at)}
                 className="text-secondary ms-1 flex-shrink-0"
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index bd22d297..3f4b3fe5 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -105,7 +105,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             gap={1}
             className="align-items-center mb-2">
             <div className="small d-flex align-items-center">
-              <Icon type="bi" name="plugin" size="24px" className="me-1" />
+              <Icon type="bi" name="plugin" size="24px" className="me-2 lh-1" />
               <span>{flagItemData?.submitter_display_name}</span>
             </div>
             {flagItemData?.submit_at && (
@@ -164,7 +164,11 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               )}
             </div>
             <div className="d-flex align-items-center small">
-              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <BaseUserCard
+                data={author_user_info}
+                avatarSize="24"
+                avatarClass="me-2"
+              />
               <FormatTime
                 time={Number(flagItemData?.created_at)}
                 className="text-secondary ms-1 flex-shrink-0"

From 11006c684b22dd9525e45e40efcc010a66b92f92 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 15:49:42 +0800
Subject: [PATCH 084/114] Feat/1.3.0/UI (#851)

---
 ui/config-overrides.js                             |  4 ++--
 .../pages/Review/components/FlagContent/index.tsx  | 14 +++++++++++---
 .../Review/components/QueuedContent/index.tsx      |  8 ++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ui/config-overrides.js b/ui/config-overrides.js
index 11496b08..b3ff6e8a 100644
--- a/ui/config-overrides.js
+++ b/ui/config-overrides.js
@@ -118,8 +118,8 @@ module.exports = {
           test: /[\/]node_modules[\/]/,
           priority: 2,
           minChunks: 2,
-          chunks: 'async', // 仅打包异步引用的依赖
-          reuseExistingChunk: true, // 重复使用已经存在的块
+          chunks: 'async', // only package dependencies that are referenced asynchronously
+          reuseExistingChunk: true, // reuse an existing block
         },
         nodesInitial: {
           name: 'chunk-nodesInitial',
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 11056c89..ed98e5b6 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -112,9 +112,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
         <Alert variant="info" className="border-0 rounded-0 mb-0">
           <Stack
             direction="horizontal"
-            gap={1}
+            gap={0.5}
             className="align-items-center mb-2">
-            <BaseUserCard data={submitter_user} avatarSize="24" />
+            <BaseUserCard
+              data={submitter_user}
+              avatarSize="24px"
+              avatarClass="me-2"
+            />
             {flagItemData?.submit_at && (
               <FormatTime
                 time={flagItemData.submit_at}
@@ -175,7 +179,11 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               )}
             </div>
             <div className="d-flex align-items-center small">
-              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <BaseUserCard
+                data={author_user_info}
+                avatarSize="24px"
+                avatarClass="me-2"
+              />
               <FormatTime
                 time={Number(flagItemData?.created_at)}
                 className="text-secondary ms-1 flex-shrink-0"
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index bd22d297..3f4b3fe5 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -105,7 +105,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             gap={1}
             className="align-items-center mb-2">
             <div className="small d-flex align-items-center">
-              <Icon type="bi" name="plugin" size="24px" className="me-1" />
+              <Icon type="bi" name="plugin" size="24px" className="me-2 lh-1" />
               <span>{flagItemData?.submitter_display_name}</span>
             </div>
             {flagItemData?.submit_at && (
@@ -164,7 +164,11 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               )}
             </div>
             <div className="d-flex align-items-center small">
-              <BaseUserCard data={author_user_info} avatarSize="24" />
+              <BaseUserCard
+                data={author_user_info}
+                avatarSize="24"
+                avatarClass="me-2"
+              />
               <FormatTime
                 time={Number(flagItemData?.created_at)}
                 className="text-secondary ms-1 flex-shrink-0"

From 758f79b7dde82a8ff07118f983e55ccd8a37cd76 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 16:22:08 +0800
Subject: [PATCH 085/114] fix(review): change revision to short id if needed

---
 internal/service/content/revision_service.go | 12 ++++++++++++
 internal/service/object_info/object_info.go  |  8 --------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index f39e055a..efea1ce1 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -44,6 +44,7 @@ import (
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
 	"github.com/apache/incubator-answer/pkg/converter"
 	"github.com/apache/incubator-answer/pkg/obj"
+	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
 	"github.com/segmentfault/pacman/log"
@@ -397,6 +398,10 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 		tagInfo      *schema.GetTagResp
 	)
 
+	shortID := handler.GetEnableShortID(ctx)
+	if shortID {
+		item.ObjectID = uid.EnShortID(item.ObjectID)
+	}
 	switch item.ObjectType {
 	case constant.ObjectTypeStrMapping["question"]:
 		err = json.Unmarshal([]byte(item.Content), &question)
@@ -404,6 +409,9 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 			break
 		}
 		questionInfo = rs.questionCommon.ShowFormatWithTag(ctx, &question)
+		if shortID {
+			questionInfo.ID = uid.EnShortID(questionInfo.ID)
+		}
 		item.ContentParsed = questionInfo
 	case constant.ObjectTypeStrMapping["answer"]:
 		err = json.Unmarshal([]byte(item.Content), &answer)
@@ -411,6 +419,10 @@ func (rs *RevisionService) parseItem(ctx context.Context, item *schema.GetRevisi
 			break
 		}
 		answerInfo = rs.answerService.ShowFormat(ctx, &answer)
+		if shortID {
+			answerInfo.ID = uid.EnShortID(answerInfo.ID)
+			answerInfo.QuestionID = uid.EnShortID(answerInfo.QuestionID)
+		}
 		item.ContentParsed = answerInfo
 	case constant.ObjectTypeStrMapping["tag"]:
 		err = json.Unmarshal([]byte(item.Content), &tag)
diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go
index 4f000900..0e1dbdc2 100644
--- a/internal/service/object_info/object_info.go
+++ b/internal/service/object_info/object_info.go
@@ -23,7 +23,6 @@ import (
 	"context"
 
 	"github.com/apache/incubator-answer/internal/base/constant"
-	"github.com/apache/incubator-answer/internal/base/handler"
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/schema"
 	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
@@ -32,7 +31,6 @@ import (
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
 	"github.com/apache/incubator-answer/pkg/checker"
 	"github.com/apache/incubator-answer/pkg/obj"
-	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/segmentfault/pacman/errors"
 )
 
@@ -72,9 +70,6 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		if err != nil {
 			return nil, err
 		}
-		if handler.GetEnableShortID(ctx) {
-			questionInfo.ID = uid.EnShortID(questionInfo.ID)
-		}
 		if !exist {
 			break
 		}
@@ -118,9 +113,6 @@ func (os *ObjService) GetUnreviewedRevisionInfo(ctx context.Context, objectID st
 		if !exist {
 			break
 		}
-		if handler.GetEnableShortID(ctx) {
-			questionInfo.ID = uid.EnShortID(questionInfo.ID)
-		}
 		objInfo = &schema.UnreviewedRevisionInfoInfo{
 			CreatedAt:           answerInfo.CreatedAt.Unix(),
 			ObjectID:            answerInfo.ID,

From 34660ee161d54cdb11f4655b77aa74c920602aff Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 16:26:51 +0800
Subject: [PATCH 086/114] feat(review): add url title for review page

---
 internal/schema/report_schema.go          | 1 +
 internal/schema/review_schema.go          | 1 +
 internal/service/report/report_service.go | 2 ++
 internal/service/review/review_service.go | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index b80e7c26..233ac058 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -79,6 +79,7 @@ type GetReportListPageResp struct {
 	CommentID        string        `json:"comment_id"`
 	ObjectType       string        `json:"object_type" enums:"question,answer,comment"`
 	Title            string        `json:"title"`
+	UrlTitle         string        `json:"url_title"`
 	OriginalText     string        `json:"original_text"`
 	AnswerCount      int           `json:"answer_count"`
 	AnswerAccepted   bool          `json:"answer_accepted"`
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index 556e4df3..d9a78624 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -48,6 +48,7 @@ type GetUnreviewedPostPageResp struct {
 	CommentID            string        `json:"comment_id"`
 	ObjectType           string        `json:"object_type" enums:"question,answer,comment"`
 	Title                string        `json:"title"`
+	UrlTitle             string        `json:"url_title"`
 	OriginalText         string        `json:"original_text"`
 	Tags                 []*TagResp    `json:"tags"`
 	ObjectStatus         int           `json:"object_status"`
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index 8b9d28f7..e91217e9 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -36,6 +36,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/report_common"
 	"github.com/apache/incubator-answer/internal/service/report_handle"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/obj"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
@@ -136,6 +137,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 			AnswerID:         info.AnswerID,
 			CommentID:        info.CommentID,
 			Title:            info.Title,
+			UrlTitle:         htmltext.UrlTitle(info.Title),
 			OriginalText:     info.Content,
 			AnswerCount:      info.AnswerCount,
 			AnswerAccepted:   info.AnswerAccepted,
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 788de64c..1c235a1a 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -34,6 +34,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/role"
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/token"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/apache/incubator-answer/plugin"
@@ -357,6 +358,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 			CommentID:            info.CommentID,
 			ObjectType:           info.ObjectType,
 			Title:                info.Title,
+			UrlTitle:             htmltext.UrlTitle(info.Title),
 			OriginalText:         info.Content,
 			Tags:                 info.Tags,
 			ObjectStatus:         info.Status,

From 3f2a617bbc4abfd5b62997abcc6bba3686f8a60f Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 16:50:00 +0800
Subject: [PATCH 087/114] feat(review): add parsed text for review page

---
 docs/docs.go                              | 18 ++++++++++++++++++
 docs/swagger.json                         | 18 ++++++++++++++++++
 docs/swagger.yaml                         | 12 ++++++++++++
 internal/schema/report_schema.go          |  1 +
 internal/schema/review_schema.go          |  1 +
 internal/service/report/report_service.go |  1 +
 internal/service/review/review_service.go |  1 +
 7 files changed, 52 insertions(+)

diff --git a/docs/docs.go b/docs/docs.go
index 44320f78..086d660e 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7869,6 +7869,9 @@ const docTemplate = `{
                 "original_text": {
                     "type": "string"
                 },
+                "parsed_text": {
+                    "type": "string"
+                },
                 "question_id": {
                     "type": "string"
                 },
@@ -7889,6 +7892,9 @@ const docTemplate = `{
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
@@ -8177,6 +8183,9 @@ const docTemplate = `{
                 "original_text": {
                     "type": "string"
                 },
+                "parsed_text": {
+                    "type": "string"
+                },
                 "question_id": {
                     "type": "string"
                 },
@@ -8200,6 +8209,9 @@ const docTemplate = `{
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
@@ -9159,6 +9171,9 @@ const docTemplate = `{
                 "site_url"
             ],
             "properties": {
+                "check_update": {
+                    "type": "boolean"
+                },
                 "contact_email": {
                     "type": "string",
                     "maxLength": 512
@@ -9189,6 +9204,9 @@ const docTemplate = `{
                 "site_url"
             ],
             "properties": {
+                "check_update": {
+                    "type": "boolean"
+                },
                 "contact_email": {
                     "type": "string",
                     "maxLength": 512
diff --git a/docs/swagger.json b/docs/swagger.json
index e96e622a..4c7663de 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7857,6 +7857,9 @@
                 "original_text": {
                     "type": "string"
                 },
+                "parsed_text": {
+                    "type": "string"
+                },
                 "question_id": {
                     "type": "string"
                 },
@@ -7877,6 +7880,9 @@
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
@@ -8165,6 +8171,9 @@
                 "original_text": {
                     "type": "string"
                 },
+                "parsed_text": {
+                    "type": "string"
+                },
                 "question_id": {
                     "type": "string"
                 },
@@ -8188,6 +8197,9 @@
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
@@ -9147,6 +9159,9 @@
                 "site_url"
             ],
             "properties": {
+                "check_update": {
+                    "type": "boolean"
+                },
                 "contact_email": {
                     "type": "string",
                     "maxLength": 512
@@ -9177,6 +9192,9 @@
                 "site_url"
             ],
             "properties": {
+                "check_update": {
+                    "type": "boolean"
+                },
                 "contact_email": {
                     "type": "string",
                     "maxLength": 512
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 6a794feb..204c5bce 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -849,6 +849,8 @@ definitions:
         type: string
       original_text:
         type: string
+      parsed_text:
+        type: string
       question_id:
         type: string
       reason:
@@ -863,6 +865,8 @@ definitions:
         type: array
       title:
         type: string
+      url_title:
+        type: string
     type: object
   schema.GetReviewingTypeResp:
     properties:
@@ -1060,6 +1064,8 @@ definitions:
         type: string
       original_text:
         type: string
+      parsed_text:
+        type: string
       question_id:
         type: string
       reason:
@@ -1076,6 +1082,8 @@ definitions:
         type: array
       title:
         type: string
+      url_title:
+        type: string
     type: object
   schema.GetUnreviewedRevisionResp:
     properties:
@@ -1735,6 +1743,8 @@ definitions:
     type: object
   schema.SiteGeneralReq:
     properties:
+      check_update:
+        type: boolean
       contact_email:
         maxLength: 512
         type: string
@@ -1757,6 +1767,8 @@ definitions:
     type: object
   schema.SiteGeneralResp:
     properties:
+      check_update:
+        type: boolean
       contact_email:
         maxLength: 512
         type: string
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index 233ac058..a1574722 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -81,6 +81,7 @@ type GetReportListPageResp struct {
 	Title            string        `json:"title"`
 	UrlTitle         string        `json:"url_title"`
 	OriginalText     string        `json:"original_text"`
+	ParsedText       string        `json:"parsed_text"`
 	AnswerCount      int           `json:"answer_count"`
 	AnswerAccepted   bool          `json:"answer_accepted"`
 	Tags             []*TagResp    `json:"tags"`
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index d9a78624..8c5ba0d6 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -50,6 +50,7 @@ type GetUnreviewedPostPageResp struct {
 	Title                string        `json:"title"`
 	UrlTitle             string        `json:"url_title"`
 	OriginalText         string        `json:"original_text"`
+	ParsedText           string        `json:"parsed_text"`
 	Tags                 []*TagResp    `json:"tags"`
 	ObjectStatus         int           `json:"object_status"`
 	ObjectShowStatus     int           `json:"object_show_status"`
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index e91217e9..a494be9d 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -139,6 +139,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 			Title:            info.Title,
 			UrlTitle:         htmltext.UrlTitle(info.Title),
 			OriginalText:     info.Content,
+			ParsedText:       info.Html,
 			AnswerCount:      info.AnswerCount,
 			AnswerAccepted:   info.AnswerAccepted,
 			Tags:             info.Tags,
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 1c235a1a..2cd49997 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -360,6 +360,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
 			Title:                info.Title,
 			UrlTitle:             htmltext.UrlTitle(info.Title),
 			OriginalText:         info.Content,
+			ParsedText:           info.Html,
 			Tags:                 info.Tags,
 			ObjectStatus:         info.Status,
 			ObjectShowStatus:     info.ShowStatus,

From bd053d9b27ac0d741024aab7d09c4b2de672e8d3 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 17:23:13 +0800
Subject: [PATCH 088/114] fix: pending review and flag review show parsed_text

---
 ui/src/common/interface.ts                    |  2 ++
 .../Review/components/FlagContent/index.tsx   | 27 ++++++++++++++++--
 .../Review/components/QueuedContent/index.tsx | 28 +++++++++++++++++--
 ui/src/pages/Review/utils/generateData.ts     |  8 +++---
 4 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 86c87798..af81d9e6 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -620,6 +620,8 @@ export interface BaseReviewItem {
   answer_count: number;
   answer_accepted?: boolean;
   flag_id: string;
+  url_title: string;
+  parsed_text: string;
 }
 
 export interface FlagReviewItem extends BaseReviewItem {
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index ed98e5b6..06a08b61 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState, useRef } from 'react';
 import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -6,7 +6,13 @@ import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 
 import { getFlagReviewPostList, putFlagReviewAction } from '@/services';
-import { BaseUserCard, Tag, FormatTime } from '@/components';
+import {
+  BaseUserCard,
+  Tag,
+  FormatTime,
+  ImgViewer,
+  htmlRender,
+} from '@/components';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 import { ADMIN_LIST_STATUS } from '@/common/constants';
@@ -19,6 +25,7 @@ interface IProps {
 
 const Index: FC<IProps> = ({ refreshCount }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const ref = useRef<HTMLDivElement>(null);
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -86,6 +93,14 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       });
   };
 
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    htmlRender(ref.current);
+  }, [ref.current]);
+
   const {
     object_type,
     submitter_user,
@@ -155,7 +170,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             </>
           )}
           <div className="small font-monospace">
-            {flagItemData?.original_text}
+            <ImgViewer>
+              <article
+                ref={ref}
+                className="fmt text-break text-wrap"
+                dangerouslySetInnerHTML={{ __html: flagItemData?.parsed_text }}
+              />
+            </ImgViewer>
           </div>
           <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
             <div>
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index 3f4b3fe5..c5252130 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState, useRef } from 'react';
 import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link, useSearchParams } from 'react-router-dom';
@@ -6,7 +6,14 @@ import { Link, useSearchParams } from 'react-router-dom';
 import classNames from 'classnames';
 
 import { getPendingReviewPostList, putPendingReviewAction } from '@/services';
-import { BaseUserCard, Tag, FormatTime, Icon } from '@/components';
+import {
+  BaseUserCard,
+  Tag,
+  FormatTime,
+  Icon,
+  ImgViewer,
+  htmlRender,
+} from '@/components';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 import { ADMIN_LIST_STATUS } from '@/common/constants';
@@ -20,6 +27,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
   const [urlSearch, setUrlSearchParams] = useSearchParams();
   const objectId = urlSearch.get('objectId') || '';
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const ref = useRef<HTMLDivElement>(null);
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -56,6 +64,14 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     });
   };
 
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    htmlRender(ref.current);
+  }, [ref.current]);
+
   useEffect(() => {
     queryNextOne(page, objectId);
   }, []);
@@ -140,7 +156,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             </>
           )}
           <div className="small font-monospace">
-            {flagItemData?.original_text}
+            <ImgViewer>
+              <article
+                ref={ref}
+                className="fmt text-break text-wrap"
+                dangerouslySetInnerHTML={{ __html: flagItemData?.parsed_text }}
+              />
+            </ImgViewer>
           </div>
           <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
             <div>
diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
index 42d80726..e02bcd4f 100644
--- a/ui/src/pages/Review/utils/generateData.ts
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -15,21 +15,21 @@ export default (data: any) => {
     question_id = '',
     answer_id = '',
     comment_id = '',
-    title = '',
+    url_title = '',
   } = data;
   let itemLink = '';
   let itemId = '';
   let itemTimePrefix = '';
 
   if (object_type === 'question') {
-    itemLink = pathFactory.questionLanding(String(object_id), title);
+    itemLink = pathFactory.questionLanding(String(object_id), url_title);
     itemId = String(question_id);
     itemTimePrefix = 'asked';
   } else if (object_type === 'answer') {
     itemLink = pathFactory.answerLanding({
       // @ts-ignore
       questionId: question_id,
-      slugTitle: title,
+      slugTitle: url_title,
       answerId: String(object_id),
     });
     itemId = String(object_id);
@@ -43,7 +43,7 @@ export default (data: any) => {
     } else {
       itemLink = `${pathFactory.questionLanding(
         String(question_id),
-        title,
+        url_title,
       )}?commentId=${comment_id}`;
     }
     itemId = String(comment_id);

From c25dad69b043d0f87caa5b6f6048bffb74a6917b Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Fri, 15 Mar 2024 17:23:13 +0800
Subject: [PATCH 089/114] feat(plugin): add language for review plugin

---
 cmd/wire_gen.go                           | 2 +-
 internal/service/review/review_service.go | 7 +++++++
 plugin/reviewer.go                        | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index a06d93eb..816d05f2 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -172,7 +172,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	answerActivityService := activity2.NewAnswerActivityService(answerActivityRepo, configService)
 	externalNotificationService := notification.NewExternalNotificationService(dataData, userNotificationConfigRepo, followRepo, emailService, userRepo, externalNotificationQueueService, userExternalLoginRepo, siteInfoCommonService)
 	reviewRepo := review.NewReviewRepo(dataData)
-	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, userRepo, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService)
+	reviewService := review2.NewReviewService(reviewRepo, objService, userCommon, userRepo, questionRepo, answerRepo, userRoleRelService, externalNotificationQueueService, tagCommonService, notificationQueueService, siteInfoCommonService)
 	questionService := content.NewQuestionService(questionRepo, tagCommonService, questionCommon, userCommon, userRepo, userRoleRelService, revisionService, metaService, collectionCommon, answerActivityService, emailService, notificationQueueService, externalNotificationQueueService, activityQueueService, siteInfoCommonService, externalNotificationService, reviewService)
 	answerService := content.NewAnswerService(answerRepo, questionRepo, questionCommon, userCommon, collectionCommon, userRepo, revisionService, answerActivityService, answerCommon, voteRepo, emailService, userRoleRelService, notificationQueueService, externalNotificationQueueService, activityQueueService, reviewService)
 	reportHandle := report_handle.NewReportHandle(questionService, answerService, commentService)
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 2cd49997..80c318b1 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -32,6 +32,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/object_info"
 	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/role"
+	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
 	"github.com/apache/incubator-answer/pkg/htmltext"
@@ -64,6 +65,7 @@ type ReviewService struct {
 	tagCommon                        *tagcommon.TagCommonService
 	externalNotificationQueueService notice_queue.ExternalNotificationQueueService
 	notificationQueueService         notice_queue.NotificationQueueService
+	siteInfoService                  siteinfo_common.SiteInfoCommonService
 }
 
 // NewReviewService new review service
@@ -78,6 +80,7 @@ func NewReviewService(
 	externalNotificationQueueService notice_queue.ExternalNotificationQueueService,
 	tagCommon *tagcommon.TagCommonService,
 	notificationQueueService notice_queue.NotificationQueueService,
+	siteInfoService siteinfo_common.SiteInfoCommonService,
 ) *ReviewService {
 	return &ReviewService{
 		reviewRepo:                       reviewRepo,
@@ -90,6 +93,7 @@ func NewReviewService(
 		externalNotificationQueueService: externalNotificationQueueService,
 		tagCommon:                        tagCommon,
 		notificationQueueService:         notificationQueueService,
+		siteInfoService:                  siteInfoService,
 	}
 }
 
@@ -151,6 +155,9 @@ func (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectI
 		ReviewerUserID: "0",
 		Status:         entity.ReviewStatusPending,
 	}
+	if siteInterface, _ := cs.siteInfoService.GetSiteInterface(ctx); siteInterface != nil {
+		reviewContent.Language = siteInterface.Language
+	}
 
 	_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
 		// If one of the reviewer plugin return false, then the review is not approved
diff --git a/plugin/reviewer.go b/plugin/reviewer.go
index f109b146..95569d39 100644
--- a/plugin/reviewer.go
+++ b/plugin/reviewer.go
@@ -17,6 +17,9 @@ type ReviewContent struct {
 	Tags []string
 	// The author of the content
 	Author ReviewContentAuthor
+	// Review Language, the site language. e.g. en_US
+	// The plugin may reply the review result according to the language
+	Language string
 }
 
 type ReviewContentAuthor struct {

From c15736d2d608b3a3e162c841bea41e376bd213ef Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 17:36:14 +0800
Subject: [PATCH 090/114] fix: article style format

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

diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 06a08b61..87309c73 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -98,7 +98,9 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       return;
     }
 
-    htmlRender(ref.current);
+    setTimeout(() => {
+      htmlRender(ref.current);
+    }, 60);
   }, [ref.current]);
 
   const {

From 5ff9a14d4159934916b3c8650e6112cb63fa1962 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Fri, 15 Mar 2024 17:39:14 +0800
Subject: [PATCH 091/114] Feat/1.3.0/UI (#852)

---
 ui/src/common/interface.ts                    |  2 ++
 .../Review/components/FlagContent/index.tsx   | 29 +++++++++++++++++--
 .../Review/components/QueuedContent/index.tsx | 28 ++++++++++++++++--
 ui/src/pages/Review/utils/generateData.ts     |  8 ++---
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index 86c87798..af81d9e6 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -620,6 +620,8 @@ export interface BaseReviewItem {
   answer_count: number;
   answer_accepted?: boolean;
   flag_id: string;
+  url_title: string;
+  parsed_text: string;
 }
 
 export interface FlagReviewItem extends BaseReviewItem {
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index ed98e5b6..87309c73 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState, useRef } from 'react';
 import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -6,7 +6,13 @@ import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 
 import { getFlagReviewPostList, putFlagReviewAction } from '@/services';
-import { BaseUserCard, Tag, FormatTime } from '@/components';
+import {
+  BaseUserCard,
+  Tag,
+  FormatTime,
+  ImgViewer,
+  htmlRender,
+} from '@/components';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 import { ADMIN_LIST_STATUS } from '@/common/constants';
@@ -19,6 +25,7 @@ interface IProps {
 
 const Index: FC<IProps> = ({ refreshCount }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const ref = useRef<HTMLDivElement>(null);
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -86,6 +93,16 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       });
   };
 
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    setTimeout(() => {
+      htmlRender(ref.current);
+    }, 60);
+  }, [ref.current]);
+
   const {
     object_type,
     submitter_user,
@@ -155,7 +172,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             </>
           )}
           <div className="small font-monospace">
-            {flagItemData?.original_text}
+            <ImgViewer>
+              <article
+                ref={ref}
+                className="fmt text-break text-wrap"
+                dangerouslySetInnerHTML={{ __html: flagItemData?.parsed_text }}
+              />
+            </ImgViewer>
           </div>
           <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
             <div>
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index 3f4b3fe5..c5252130 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, useEffect, useState, useRef } from 'react';
 import { Card, Alert, Stack, Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { Link, useSearchParams } from 'react-router-dom';
@@ -6,7 +6,14 @@ import { Link, useSearchParams } from 'react-router-dom';
 import classNames from 'classnames';
 
 import { getPendingReviewPostList, putPendingReviewAction } from '@/services';
-import { BaseUserCard, Tag, FormatTime, Icon } from '@/components';
+import {
+  BaseUserCard,
+  Tag,
+  FormatTime,
+  Icon,
+  ImgViewer,
+  htmlRender,
+} from '@/components';
 import { scrollToDocTop } from '@/utils';
 import type * as Type from '@/common/interface';
 import { ADMIN_LIST_STATUS } from '@/common/constants';
@@ -20,6 +27,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
   const [urlSearch, setUrlSearchParams] = useSearchParams();
   const objectId = urlSearch.get('objectId') || '';
   const { t } = useTranslation('translation', { keyPrefix: 'page_review' });
+  const ref = useRef<HTMLDivElement>(null);
   const [noTasks, setNoTasks] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [page, setPage] = useState(1);
@@ -56,6 +64,14 @@ const Index: FC<IProps> = ({ refreshCount }) => {
     });
   };
 
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    htmlRender(ref.current);
+  }, [ref.current]);
+
   useEffect(() => {
     queryNextOne(page, objectId);
   }, []);
@@ -140,7 +156,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             </>
           )}
           <div className="small font-monospace">
-            {flagItemData?.original_text}
+            <ImgViewer>
+              <article
+                ref={ref}
+                className="fmt text-break text-wrap"
+                dangerouslySetInnerHTML={{ __html: flagItemData?.parsed_text }}
+              />
+            </ImgViewer>
           </div>
           <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">
             <div>
diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
index 42d80726..e02bcd4f 100644
--- a/ui/src/pages/Review/utils/generateData.ts
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -15,21 +15,21 @@ export default (data: any) => {
     question_id = '',
     answer_id = '',
     comment_id = '',
-    title = '',
+    url_title = '',
   } = data;
   let itemLink = '';
   let itemId = '';
   let itemTimePrefix = '';
 
   if (object_type === 'question') {
-    itemLink = pathFactory.questionLanding(String(object_id), title);
+    itemLink = pathFactory.questionLanding(String(object_id), url_title);
     itemId = String(question_id);
     itemTimePrefix = 'asked';
   } else if (object_type === 'answer') {
     itemLink = pathFactory.answerLanding({
       // @ts-ignore
       questionId: question_id,
-      slugTitle: title,
+      slugTitle: url_title,
       answerId: String(object_id),
     });
     itemId = String(object_id);
@@ -43,7 +43,7 @@ export default (data: any) => {
     } else {
       itemLink = `${pathFactory.questionLanding(
         String(question_id),
-        title,
+        url_title,
       )}?commentId=${comment_id}`;
     }
     itemId = String(comment_id);

From be1d5fb44566c469033ca2d93a6d2a08170f8dbe Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 11:02:51 +0800
Subject: [PATCH 092/114] fix: editor fixes the issue where some line breaks
 are missing when the pasted content contains images

---
 ui/src/components/Editor/ToolBars/image.tsx   | 20 +++++++++++++++----
 ui/src/i18n/init.ts                           |  8 ++++----
 .../Review/components/EditPostModal/index.tsx |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ui/src/components/Editor/ToolBars/image.tsx b/ui/src/components/Editor/ToolBars/image.tsx
index 95737db6..1bc429a0 100644
--- a/ui/src/components/Editor/ToolBars/image.tsx
+++ b/ui/src/components/Editor/ToolBars/image.tsx
@@ -167,17 +167,29 @@ const Image = ({ editorInstance }) => {
     }
     event.preventDefault();
 
-    const newHtml = new DOMParser()
+    let innerText = '';
+    const allPTag = new DOMParser()
       .parseFromString(
         htmlStr.replace(
           /<img([\s\S]*?) src\s*=\s*(['"])([\s\S]*?)\2([^>]*)>/gi,
-          `<p>\n![${t('image.text')}]($3)\n</p>`,
+          `<p>![${t('image.text')}]($3)\n\n</p>`,
         ),
         'text/html',
       )
-      .querySelector('body')?.innerText as string;
+      .querySelectorAll('body p');
 
-    editor.replaceSelection(newHtml);
+    allPTag.forEach((p, index) => {
+      const text = p.textContent || '';
+      if (text !== '') {
+        if (index === allPTag.length - 1) {
+          innerText += `${p.textContent}`;
+        } else {
+          innerText += `${p.textContent}${text.endsWith('\n') ? '' : '\n\n'}`;
+        }
+      }
+    });
+
+    editor.replaceSelection(innerText);
   };
   const handleClick = () => {
     if (!link.value) {
diff --git a/ui/src/i18n/init.ts b/ui/src/i18n/init.ts
index 66d9576e..03f775cb 100644
--- a/ui/src/i18n/init.ts
+++ b/ui/src/i18n/init.ts
@@ -21,7 +21,7 @@ import { initReactI18next } from 'react-i18next';
 
 import i18next from 'i18next';
 import en_US from '@i18n/en_US.yaml';
-// import zh_CN from '@i18n/zh_CN.yaml';
+import zh_CN from '@i18n/zh_CN.yaml';
 
 import { DEFAULT_LANG, LANG_RESOURCE_STORAGE_KEY } from '@/common/constants';
 import Storage from '@/utils/storage';
@@ -34,9 +34,9 @@ const initResources = {
   en_US: {
     translation: en_US.ui,
   },
-  // zh_CN: {
-  //   translation: zh_CN.ui,
-  // },
+  zh_CN: {
+    translation: zh_CN.ui,
+  },
 };
 
 const storageLang = Storage.get(LANG_RESOURCE_STORAGE_KEY);
diff --git a/ui/src/pages/Review/components/EditPostModal/index.tsx b/ui/src/pages/Review/components/EditPostModal/index.tsx
index e35a82ca..4190240c 100644
--- a/ui/src/pages/Review/components/EditPostModal/index.tsx
+++ b/ui/src/pages/Review/components/EditPostModal/index.tsx
@@ -76,6 +76,7 @@ const Index: FC<Props> = ({
     if (bol) {
       callback?.();
     }
+    setFormData(initFormData);
     handleClose();
     setLoaded(false);
   };

From 212a59a1128be8d02b29e8da66b2b7b57c1d6069 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 11:03:32 +0800
Subject: [PATCH 093/114] Feat/1.3.0/UI (#856)

---
 ui/src/components/Editor/ToolBars/image.tsx   | 20 +++++++++++++++----
 ui/src/i18n/init.ts                           |  8 ++++----
 .../Review/components/EditPostModal/index.tsx |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ui/src/components/Editor/ToolBars/image.tsx b/ui/src/components/Editor/ToolBars/image.tsx
index 95737db6..1bc429a0 100644
--- a/ui/src/components/Editor/ToolBars/image.tsx
+++ b/ui/src/components/Editor/ToolBars/image.tsx
@@ -167,17 +167,29 @@ const Image = ({ editorInstance }) => {
     }
     event.preventDefault();
 
-    const newHtml = new DOMParser()
+    let innerText = '';
+    const allPTag = new DOMParser()
       .parseFromString(
         htmlStr.replace(
           /<img([\s\S]*?) src\s*=\s*(['"])([\s\S]*?)\2([^>]*)>/gi,
-          `<p>\n![${t('image.text')}]($3)\n</p>`,
+          `<p>![${t('image.text')}]($3)\n\n</p>`,
         ),
         'text/html',
       )
-      .querySelector('body')?.innerText as string;
+      .querySelectorAll('body p');
 
-    editor.replaceSelection(newHtml);
+    allPTag.forEach((p, index) => {
+      const text = p.textContent || '';
+      if (text !== '') {
+        if (index === allPTag.length - 1) {
+          innerText += `${p.textContent}`;
+        } else {
+          innerText += `${p.textContent}${text.endsWith('\n') ? '' : '\n\n'}`;
+        }
+      }
+    });
+
+    editor.replaceSelection(innerText);
   };
   const handleClick = () => {
     if (!link.value) {
diff --git a/ui/src/i18n/init.ts b/ui/src/i18n/init.ts
index 66d9576e..03f775cb 100644
--- a/ui/src/i18n/init.ts
+++ b/ui/src/i18n/init.ts
@@ -21,7 +21,7 @@ import { initReactI18next } from 'react-i18next';
 
 import i18next from 'i18next';
 import en_US from '@i18n/en_US.yaml';
-// import zh_CN from '@i18n/zh_CN.yaml';
+import zh_CN from '@i18n/zh_CN.yaml';
 
 import { DEFAULT_LANG, LANG_RESOURCE_STORAGE_KEY } from '@/common/constants';
 import Storage from '@/utils/storage';
@@ -34,9 +34,9 @@ const initResources = {
   en_US: {
     translation: en_US.ui,
   },
-  // zh_CN: {
-  //   translation: zh_CN.ui,
-  // },
+  zh_CN: {
+    translation: zh_CN.ui,
+  },
 };
 
 const storageLang = Storage.get(LANG_RESOURCE_STORAGE_KEY);
diff --git a/ui/src/pages/Review/components/EditPostModal/index.tsx b/ui/src/pages/Review/components/EditPostModal/index.tsx
index e35a82ca..4190240c 100644
--- a/ui/src/pages/Review/components/EditPostModal/index.tsx
+++ b/ui/src/pages/Review/components/EditPostModal/index.tsx
@@ -76,6 +76,7 @@ const Index: FC<Props> = ({
     if (bol) {
       callback?.();
     }
+    setFormData(initFormData);
     handleClose();
     setLoaded(false);
   };

From a65417b0ba0b2f13fae9f25cd2c3de8559748a8c Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 11:29:30 +0800
Subject: [PATCH 094/114] fix: add renderhtml format

---
 ui/src/pages/Review/components/FlagContent/index.tsx   | 2 +-
 ui/src/pages/Review/components/QueuedContent/index.tsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 87309c73..0224e2de 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -100,7 +100,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
 
     setTimeout(() => {
       htmlRender(ref.current);
-    }, 60);
+    }, 70);
   }, [ref.current]);
 
   const {
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index c5252130..74f956ba 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -69,7 +69,9 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       return;
     }
 
-    htmlRender(ref.current);
+    setTimeout(() => {
+      htmlRender(ref.current);
+    }, 70);
   }, [ref.current]);
 
   useEffect(() => {

From 3691e61d56ac3eb02d550f35a06b97ad067a6860 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 14:22:14 +0800
Subject: [PATCH 095/114] fix: review add skip btn

---
 .../pages/Review/components/FlagContent/index.tsx | 11 +++++++++++
 .../Review/components/QueuedContent/index.tsx     | 15 +++++++++++++++
 .../Review/components/SuggestContent/index.tsx    | 12 +++++++++++-
 ui/src/services/client/review.ts                  |  3 ++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 0224e2de..17c3b7da 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -93,6 +93,10 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       });
   };
 
+  const handlingSkip = () => {
+    queryNextOne(page + 1);
+  };
+
   useEffect(() => {
     if (!ref.current) {
       return;
@@ -232,6 +236,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             onClick={handleIgnore}>
             {t('ignore', { keyPrefix: 'btns' })}
           </Button>
+
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={handlingSkip}>
+            {t('skip', { keyPrefix: 'btns' })}
+          </Button>
         </Stack>
       </Card.Footer>
     </Card>
diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsx
index 74f956ba..5d134249 100644
--- a/ui/src/pages/Review/components/QueuedContent/index.tsx
+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx
@@ -100,6 +100,14 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       });
   };
 
+  const handlingSkip = () => {
+    queryNextOne(page + 1, '');
+    if (objectId) {
+      urlSearch.delete('objectId');
+      setUrlSearchParams(urlSearch);
+    }
+  };
+
   const { object_type, author_user_info, object_status, reason } =
     flagItemData || {
       object_type: '',
@@ -222,6 +230,13 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             onClick={() => handleAction('reject')}>
             {t('reject', { keyPrefix: 'btns' })}
           </Button>
+
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={handlingSkip}>
+            {t('skip', { keyPrefix: 'btns' })}
+          </Button>
         </Stack>
       </Card.Footer>
     </Card>
diff --git a/ui/src/pages/Review/components/SuggestContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsx
index 8b618a91..4871bc22 100644
--- a/ui/src/pages/Review/components/SuggestContent/index.tsx
+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx
@@ -105,6 +105,10 @@ const Index: FC<IProps> = ({ refreshCount }) => {
       });
   };
 
+  const handlingSkip = () => {
+    queryNextOne(page + 1);
+  };
+
   let itemLink = '';
   let itemId = '';
   let editSummary = unreviewed_info?.reason;
@@ -184,7 +188,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             direction="horizontal"
             gap={1}
             className="align-items-center mb-2">
-            <BaseUserCard data={editor} avatarSize="24" />
+            <BaseUserCard data={editor} avatarSize="24" avatarClass="me-2" />
             {editTime && (
               <FormatTime
                 time={editTime}
@@ -229,6 +233,12 @@ const Index: FC<IProps> = ({ refreshCount }) => {
             onClick={handlingReject}>
             {t('reject', { keyPrefix: 'btns' })}
           </Button>
+          <Button
+            variant="outline-primary"
+            disabled={isLoading}
+            onClick={handlingSkip}>
+            {t('skip', { keyPrefix: 'btns' })}
+          </Button>
         </Stack>
       </Card.Footer>
     </Card>
diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.ts
index de289453..303b029c 100644
--- a/ui/src/services/client/review.ts
+++ b/ui/src/services/client/review.ts
@@ -40,7 +40,8 @@ export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {
 };
 
 export const getPendingReviewPostList = (page: number, objectId?: string) => {
-  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}&object_id=${objectId}`;
+  const search = objectId ? `&object_id=${objectId}` : '';
+  const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}${search}`;
   return request.get<Type.QueuedReviewResp>(apiUrl);
 };
 

From 5e477482982c1274cc1ac6a0f886336c929ddc0a Mon Sep 17 00:00:00 2001
From: Octobug <whalevocal@gmail.com>
Date: Sun, 17 Mar 2024 02:24:13 +0800
Subject: [PATCH 096/114] feat(search): highlight search results

---
 internal/repo/search_common/search_repo.go    |  19 +--
 internal/service/search_common/search.go      |   3 +-
 internal/service/search_service.go            |   3 +-
 pkg/htmltext/htmltext.go                      |  98 ++++++++++++++-
 pkg/htmltext/htmltext_test.go                 | 119 ++++++++++++++++++
 ui/src/common/pattern.ts                      |   2 +
 ui/src/components/HighlightText/index.scss    |  22 ++++
 ui/src/components/HighlightText/index.tsx     |  46 +++++++
 ui/src/components/index.ts                    |   2 +
 .../Search/components/SearchItem/index.tsx    |  22 +++-
 10 files changed, 319 insertions(+), 17 deletions(-)
 create mode 100644 ui/src/components/HighlightText/index.scss
 create mode 100644 ui/src/components/HighlightText/index.tsx

diff --git a/internal/repo/search_common/search_repo.go b/internal/repo/search_common/search_repo.go
index 0443bfe9..cd7de696 100644
--- a/internal/repo/search_common/search_repo.go
+++ b/internal/repo/search_common/search_repo.go
@@ -22,12 +22,13 @@ package search_common
 import (
 	"context"
 	"fmt"
-	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
-	"github.com/apache/incubator-answer/plugin"
 	"strconv"
 	"strings"
 	"time"
 
+	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
+	"github.com/apache/incubator-answer/plugin"
+
 	"github.com/apache/incubator-answer/pkg/htmltext"
 
 	"github.com/apache/incubator-answer/internal/base/data"
@@ -234,7 +235,7 @@ func (sr *searchRepo) SearchContents(ctx context.Context, words []string, tagIDs
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 		return
 	} else {
-		resp, err = sr.parseResult(ctx, res)
+		resp, err = sr.parseResult(ctx, res, words)
 		return
 	}
 }
@@ -342,7 +343,7 @@ func (sr *searchRepo) SearchQuestions(ctx context.Context, words []string, tagID
 	if len(tr) != 0 {
 		total = converter.StringToInt64(string(tr[0]["total"]))
 	}
-	resp, err = sr.parseResult(ctx, res)
+	resp, err = sr.parseResult(ctx, res, words)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -436,7 +437,7 @@ func (sr *searchRepo) SearchAnswers(ctx context.Context, words []string, tagIDs
 	}
 
 	total = converter.StringToInt64(string(tr[0]["total"]))
-	resp, err = sr.parseResult(ctx, res)
+	resp, err = sr.parseResult(ctx, res, words)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
 	}
@@ -460,7 +461,7 @@ func (sr *searchRepo) parseOrder(ctx context.Context, order string) (res string)
 }
 
 // ParseSearchPluginResult parse search plugin result
-func (sr *searchRepo) ParseSearchPluginResult(ctx context.Context, sres []plugin.SearchResult) (resp []*schema.SearchResult, err error) {
+func (sr *searchRepo) ParseSearchPluginResult(ctx context.Context, sres []plugin.SearchResult, words []string) (resp []*schema.SearchResult, err error) {
 	var (
 		qres []map[string][]byte
 		res  = make([]map[string][]byte, 0)
@@ -483,11 +484,11 @@ func (sr *searchRepo) ParseSearchPluginResult(ctx context.Context, sres []plugin
 		}
 		res = append(res, qres[0])
 	}
-	return sr.parseResult(ctx, res)
+	return sr.parseResult(ctx, res, words)
 }
 
 // parseResult parse search result, return the data structure
-func (sr *searchRepo) parseResult(ctx context.Context, res []map[string][]byte) (resp []*schema.SearchResult, err error) {
+func (sr *searchRepo) parseResult(ctx context.Context, res []map[string][]byte, words []string) (resp []*schema.SearchResult, err error) {
 	questionIDs := make([]string, 0)
 	userIDs := make([]string, 0)
 	resultList := make([]*schema.SearchResult, 0)
@@ -508,7 +509,7 @@ func (sr *searchRepo) parseResult(ctx context.Context, res []map[string][]byte)
 			QuestionID:      QuestionID,
 			Title:           string(r["title"]),
 			UrlTitle:        htmltext.UrlTitle(string(r["title"])),
-			Excerpt:         htmltext.FetchExcerpt(string(r["parsed_text"]), "...", 240),
+			Excerpt:         htmltext.FetchMatchedExcerpt(string(r["parsed_text"]), words, "...", 100),
 			CreatedAtParsed: tp.Unix(),
 			UserInfo: &schema.SearchObjectUser{
 				ID: string(r["user_id"]),
diff --git a/internal/service/search_common/search.go b/internal/service/search_common/search.go
index c19fdc49..ba6f6295 100644
--- a/internal/service/search_common/search.go
+++ b/internal/service/search_common/search.go
@@ -21,6 +21,7 @@ package search_common
 
 import (
 	"context"
+
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/plugin"
 )
@@ -29,5 +30,5 @@ type SearchRepo interface {
 	SearchContents(ctx context.Context, words []string, tagIDs [][]string, userID string, votes, page, size int, order string) (resp []*schema.SearchResult, total int64, err error)
 	SearchQuestions(ctx context.Context, words []string, tagIDs [][]string, notAccepted bool, views, answers int, page, size int, order string) (resp []*schema.SearchResult, total int64, err error)
 	SearchAnswers(ctx context.Context, words []string, tagIDs [][]string, accepted bool, questionID string, page, size int, order string) (resp []*schema.SearchResult, total int64, err error)
-	ParseSearchPluginResult(ctx context.Context, sres []plugin.SearchResult) (resp []*schema.SearchResult, err error)
+	ParseSearchPluginResult(ctx context.Context, sres []plugin.SearchResult, words []string) (resp []*schema.SearchResult, err error)
 }
diff --git a/internal/service/search_service.go b/internal/service/search_service.go
index 46d71374..430fa6cf 100644
--- a/internal/service/search_service.go
+++ b/internal/service/search_service.go
@@ -21,6 +21,7 @@ package service
 
 import (
 	"context"
+
 	"github.com/apache/incubator-answer/internal/schema"
 	"github.com/apache/incubator-answer/internal/service/search_common"
 	"github.com/apache/incubator-answer/internal/service/search_parser"
@@ -93,6 +94,6 @@ func (ss *SearchService) searchByPlugin(ctx context.Context, finder plugin.Searc
 		res, resp.Total, err = finder.SearchAnswers(ctx, cond.Convert2PluginSearchCond(dto.Page, dto.Size, dto.Order))
 	}
 
-	resp.SearchResults, err = ss.searchRepo.ParseSearchPluginResult(ctx, res)
+	resp.SearchResults, err = ss.searchRepo.ParseSearchPluginResult(ctx, res, cond.Words)
 	return resp, err
 }
diff --git a/pkg/htmltext/htmltext.go b/pkg/htmltext/htmltext.go
index 792063f4..df8866ca 100644
--- a/pkg/htmltext/htmltext.go
+++ b/pkg/htmltext/htmltext.go
@@ -20,18 +20,36 @@
 package htmltext
 
 import (
-	"github.com/Chain-Zhang/pinyin"
-	"github.com/apache/incubator-answer/pkg/checker"
 	"io"
 	"net/http"
 	"net/url"
 	"regexp"
 	"strings"
+	"unicode/utf8"
 
+	"github.com/Chain-Zhang/pinyin"
 	"github.com/Machiel/slugify"
 	strip "github.com/grokify/html-strip-tags-go"
+
+	"github.com/apache/incubator-answer/pkg/checker"
+	"github.com/apache/incubator-answer/pkg/converter"
 )
 
+// min() and max() can be removed starting from Go1.21
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
 // ClearText clear HTML, get the clear text
 func ClearText(html string) (text string) {
 	if len(html) == 0 {
@@ -123,6 +141,82 @@ func FetchExcerpt(html, trimMarker string, limit int) (text string) {
 	return
 }
 
+// findFirstMatchedWord returns the first matched word and its index
+func findFirstMatchedWord(text string, words []string) (string, int) {
+	if len(text) == 0 || len(words) == 0 {
+		return "", 0
+	}
+
+	words = converter.UniqueArray(words)
+	firstWord := ""
+	firstIndex := len(text)
+
+	for _, word := range words {
+		if idx := strings.Index(text, word); idx != -1 && idx < firstIndex {
+			firstIndex = idx
+			firstWord = word
+		}
+	}
+
+	if firstIndex != len(text) {
+		return firstWord, firstIndex
+	}
+
+	return "", 0
+}
+
+// getRuneRange returns the valid begin and end indexes of the runeText
+func getRuneRange(runeText []rune, offset, limit int) (begin, end int) {
+	runeLen := len(runeText)
+
+	limit = min(runeLen, max(0, limit))
+	begin = min(runeLen, max(0, offset))
+	end = min(runeLen, begin+limit)
+
+	return
+}
+
+// FetchRangedExcerpt returns a ranged excerpt from the HTML string.
+// Note: offset is a rune index, not a byte index
+func FetchRangedExcerpt(html, trimMarker string, offset int, limit int) (text string) {
+	if len(html) == 0 {
+		text = html
+		return
+	}
+
+	runeText := []rune(ClearText(html))
+	begin, end := getRuneRange(runeText, offset, limit)
+	text = string(runeText[begin:end])
+
+	if begin > 0 {
+		text = trimMarker + text
+	}
+	if end < len(runeText) {
+		text = text + trimMarker
+	}
+
+	return
+}
+
+// FetchMatchedExcerpt returns the matched excerpt according to the words
+func FetchMatchedExcerpt(html string, words []string, trimMarker string, trimLength int) string {
+	text := ClearText(html)
+	matchedWord, matchedIndex := findFirstMatchedWord(text, words)
+	runeIndex := utf8.RuneCountInString(text[0:matchedIndex])
+
+	trimLength = max(0, trimLength)
+	runeOffset := runeIndex - trimLength
+	runeLimit := trimLength + trimLength + utf8.RuneCountInString(matchedWord)
+
+	textRuneCount := utf8.RuneCountInString(text)
+	if runeOffset+runeLimit > textRuneCount {
+		// Reserved extra chars before the matched word
+		runeOffset = textRuneCount - runeLimit
+	}
+
+	return FetchRangedExcerpt(html, trimMarker, runeOffset, runeLimit)
+}
+
 func GetPicByUrl(Url string) string {
 	res, err := http.Get(Url)
 	if err != nil {
diff --git a/pkg/htmltext/htmltext_test.go b/pkg/htmltext/htmltext_test.go
index 4c520d7a..d549d887 100644
--- a/pkg/htmltext/htmltext_test.go
+++ b/pkg/htmltext/htmltext_test.go
@@ -85,3 +85,122 @@ func TestUrlTitle(t *testing.T) {
 		fmt.Println(formatTitle)
 	}
 }
+
+func TestFindFirstMatchedWord(t *testing.T) {
+	var (
+		expectedWord,
+		actualWord string
+		expectedIndex,
+		actualIndex int
+	)
+
+	text := "Hello, I have 中文 and 😂 and I am supposed to work fine."
+
+	// test find nothing
+	expectedWord, expectedIndex = "", 0
+	actualWord, actualIndex = findFirstMatchedWord(text, []string{"youcantfindme"})
+	assert.Equal(t, expectedWord, actualWord)
+	assert.Equal(t, expectedIndex, actualIndex)
+
+	// test find one word
+	expectedWord, expectedIndex = "文", 17
+	actualWord, actualIndex = findFirstMatchedWord(text, []string{"文"})
+	assert.Equal(t, expectedWord, actualWord)
+	assert.Equal(t, expectedIndex, actualIndex)
+
+	// test find multiple matched words
+	expectedWord, expectedIndex = "Hello", 0
+	actualWord, actualIndex = findFirstMatchedWord(text, []string{"Hello", "文"})
+	assert.Equal(t, expectedWord, actualWord)
+	assert.Equal(t, expectedIndex, actualIndex)
+}
+
+func TestGetRuneRange(t *testing.T) {
+	var (
+		expectedBegin,
+		expectedEnd,
+		actualBegin,
+		actualEnd int
+	)
+
+	runeText := []rune("Hello, I have 中文 and 😂.")
+	runeLen := len(runeText)
+
+	// test get range of negative offset and negative limit
+	expectedBegin, expectedEnd = 0, 0
+	actualBegin, actualEnd = getRuneRange(runeText, -1, -1)
+	assert.Equal(t, expectedBegin, actualBegin)
+	assert.Equal(t, expectedEnd, actualEnd)
+
+	// test get range of exceeding offset and exceeding limit
+	expectedBegin, expectedEnd = runeLen, runeLen
+	actualBegin, actualEnd = getRuneRange(runeText, runeLen+1, runeLen+1)
+	assert.Equal(t, expectedBegin, actualBegin)
+	assert.Equal(t, expectedEnd, actualEnd)
+
+	// test get range of normal offset and exceeding limit
+	expectedBegin, expectedEnd = 3, runeLen
+	actualBegin, actualEnd = getRuneRange(runeText, 3, runeLen)
+	assert.Equal(t, expectedBegin, actualBegin)
+	assert.Equal(t, expectedEnd, actualEnd)
+
+	// test get range of normal offset and normal limit
+	expectedBegin, expectedEnd = 3, 10
+	actualBegin, actualEnd = getRuneRange(runeText, 3, 7)
+	assert.Equal(t, expectedBegin, actualBegin)
+	assert.Equal(t, expectedEnd, actualEnd)
+}
+
+func TestFetchRangedExcerpt(t *testing.T) {
+	var (
+		expected,
+		actual string
+	)
+
+	// test english string
+	expected = "hello..."
+	actual = FetchRangedExcerpt("<p>hello world</p>", "...", 0, 5)
+	assert.Equal(t, expected, actual)
+
+	// test string with offset
+	expected = "...llo你好..."
+	actual = FetchRangedExcerpt("<p>hello你好world</p>", "...", 2, 5)
+	assert.Equal(t, expected, actual)
+
+	// test mixed string with emoticon with offset
+	expected = "...你好😂..."
+	actual = FetchRangedExcerpt("<p>hello你好😂world</p>", "...", 5, 3)
+	assert.Equal(t, expected, actual)
+
+	// test mixed string with offset and exceeding limit
+	expected = "...你好😂world"
+	actual = FetchRangedExcerpt("<p>hello你好😂world</p>", "...", 5, 100)
+	assert.Equal(t, expected, actual)
+}
+
+func TestFetchMatchedExcerpt(t *testing.T) {
+	var (
+		expected,
+		actual string
+	)
+
+	html := "<p>Hello, I have 中文 and 😂 and I am supposed to work fine</p>"
+
+	// test find nothing
+	// it should return from the begin with double trimLength text
+	expected = "Hello, I h..."
+	actual = FetchMatchedExcerpt(html, []string{"youcantfindme"}, "...", 5)
+	assert.Equal(t, expected, actual)
+
+	// test find the word at the end
+	// it should return the word beginning with double trimLenth plus len(word)
+	expected = "... work fine"
+	actual = FetchMatchedExcerpt(html, []string{"youcant", "fine"}, "...", 3)
+	assert.Equal(t, expected, actual)
+
+	// test find multiple words
+	// it should return the first matched word with trimmedText
+	expected = "... have 中文 and 😂..."
+	actual = FetchMatchedExcerpt(html, []string{"中文", "😂"}, "...", 6)
+	assert.Equal(t, expected, actual)
+}
diff --git a/ui/src/common/pattern.ts b/ui/src/common/pattern.ts
index 847c6d76..133228b1 100644
--- a/ui/src/common/pattern.ts
+++ b/ui/src/common/pattern.ts
@@ -20,6 +20,8 @@
 const pattern = {
   email:
     /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+\.)+[a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{2,}))$/,
+  search:
+    /(\[.*\])|(is:answer)|(is:question)|(score:\d*)|(user:\S*)|(answers:\d*)/g,
   uaWeChat: /micromessenger/i,
   uaWeCom: /wxwork/i,
   uaDingTalk: /dingtalk/i,
diff --git a/ui/src/components/HighlightText/index.scss b/ui/src/components/HighlightText/index.scss
new file mode 100644
index 00000000..da0468e6
--- /dev/null
+++ b/ui/src/components/HighlightText/index.scss
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.highlight-text > mark {
+  padding: 0;
+}
diff --git a/ui/src/components/HighlightText/index.tsx b/ui/src/components/HighlightText/index.tsx
new file mode 100644
index 00000000..b5acacc1
--- /dev/null
+++ b/ui/src/components/HighlightText/index.tsx
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { memo, FC } from 'react';
+
+import './index.scss';
+
+interface IProps {
+  text: string;
+  keywords: string[];
+}
+
+const Index: FC<IProps> = ({ text = '', keywords = [] }) => {
+  const regex = new RegExp(`(${keywords.join('|')})`, 'gi');
+
+  return (
+    <span className="highlight-text">
+      {text.split(regex).map((piece: string, index: number) => {
+        const key = `${piece.substring(0, 6)}_${index}`;
+        return keywords.find((kw: string) => kw === piece) ? (
+          <mark key={key}>{piece}</mark>
+        ) : (
+          piece
+        );
+      })}
+    </span>
+  );
+};
+
+export default memo(Index);
diff --git a/ui/src/components/index.ts b/ui/src/components/index.ts
index 7725cf43..fdf052d3 100644
--- a/ui/src/components/index.ts
+++ b/ui/src/components/index.ts
@@ -59,6 +59,7 @@ import CustomSidebar from './CustomSidebar';
 import ImgViewer from './ImgViewer';
 import SideNav from './SideNav';
 import PluginRender from './PluginRender';
+import HighlightText from './HighlightText';
 
 export {
   Avatar,
@@ -105,5 +106,6 @@ export {
   ImgViewer,
   SideNav,
   PluginRender,
+  HighlightText,
 };
 export type { EditorRef, JSONSchema, UISchema };
diff --git a/ui/src/pages/Search/components/SearchItem/index.tsx b/ui/src/pages/Search/components/SearchItem/index.tsx
index b1ebca56..a31dab56 100644
--- a/ui/src/pages/Search/components/SearchItem/index.tsx
+++ b/ui/src/pages/Search/components/SearchItem/index.tsx
@@ -18,12 +18,19 @@
  */
 
 import { memo, FC } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
 import { ListGroupItem } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 
 import { pathFactory } from '@/router/pathFactory';
-import { Tag, FormatTime, BaseUserCard, Counts } from '@/components';
+import {
+  Tag,
+  FormatTime,
+  BaseUserCard,
+  Counts,
+  HighlightText,
+} from '@/components';
+import Pattern from '@/common/pattern';
 import type { SearchResItem } from '@/common/interface';
 import { escapeRemove } from '@/utils';
 
@@ -47,6 +54,10 @@ const Index: FC<Props> = ({ data }) => {
     });
   }
 
+  const [searchParams] = useSearchParams();
+  const q = searchParams.get('q');
+  const keywords = q?.replace(Pattern.search, '').split(' ') || [];
+
   return (
     <ListGroupItem className="py-3 px-0 border-start-0 border-end-0 bg-transparent">
       <div className="mb-2 clearfix">
@@ -56,7 +67,7 @@ const Index: FC<Props> = ({ data }) => {
           {data.object_type === 'question' ? 'Q' : 'A'}
         </span>
         <Link className="h5 mb-0 link-dark text-break" to={itemUrl}>
-          {data.object.title}
+          <HighlightText text={data.object.title} keywords={keywords} />
           {data.object.status === 'closed'
             ? ` [${t('closed', { keyPrefix: 'question' })}]`
             : null}
@@ -88,7 +99,10 @@ const Index: FC<Props> = ({ data }) => {
 
       {data.object?.excerpt && (
         <p className="small text-truncate-2 mb-2 last-p text-break">
-          {escapeRemove(data.object.excerpt)}
+          <HighlightText
+            text={escapeRemove(data.object.excerpt) || ''}
+            keywords={keywords}
+          />
         </p>
       )}
 

From 45b1c397800805d8976bf7a8589fdd203984e682 Mon Sep 17 00:00:00 2001
From: Octobug <whalevocal@gmail.com>
Date: Sun, 17 Mar 2024 14:30:56 +0800
Subject: [PATCH 097/114] refactor(head): use search regex in common pattern

---
 ui/src/pages/Search/components/Head/index.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/src/pages/Search/components/Head/index.tsx b/ui/src/pages/Search/components/Head/index.tsx
index ff9a552c..cbb19283 100644
--- a/ui/src/pages/Search/components/Head/index.tsx
+++ b/ui/src/pages/Search/components/Head/index.tsx
@@ -27,18 +27,17 @@ import { tryNormalLogged } from '@/utils/guard';
 import { escapeRemove } from '@/utils';
 import { pathFactory } from '@/router/pathFactory';
 import { PluginRender } from '@/components';
+import Pattern from '@/common/pattern';
 
 interface Props {
   data;
 }
 
-const reg =
-  /(\[.*\])|(is:answer)|(is:question)|(score:\d*)|(user:\S*)|(answers:\d*)/g;
 const Index: FC<Props> = ({ data }) => {
   const { t } = useTranslation('translation', { keyPrefix: 'search' });
   const [searchParams] = useSearchParams();
   const q = searchParams.get('q');
-  const options = q?.match(reg);
+  const options = q?.match(Pattern.search);
   const [followed, setFollowed] = useState(data?.is_follower);
 
   const follow = () => {
@@ -62,7 +61,7 @@ const Index: FC<Props> = ({ data }) => {
       </div>
       <p>
         <span className="text-secondary me-1">{t('keywords')}</span>
-        {q?.replace(reg, '')}
+        {q?.replace(Pattern.search, '')}
         <br />
         {options?.length && (
           <>

From d8ab71fd0fcb4827846d304baa749ed8ae4e7324 Mon Sep 17 00:00:00 2001
From: Octobug <whalevocal@gmail.com>
Date: Sun, 17 Mar 2024 14:35:45 +0800
Subject: [PATCH 098/114] refactor(htmltext): FetchExcerpt delegates to
 FetchRangedExcerpt

---
 pkg/htmltext/htmltext.go | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkg/htmltext/htmltext.go b/pkg/htmltext/htmltext.go
index df8866ca..459f7a13 100644
--- a/pkg/htmltext/htmltext.go
+++ b/pkg/htmltext/htmltext.go
@@ -125,20 +125,7 @@ func cutLongTitle(title string) string {
 
 // FetchExcerpt return the excerpt from the HTML string
 func FetchExcerpt(html, trimMarker string, limit int) (text string) {
-	if len(html) == 0 {
-		text = html
-		return
-	}
-
-	text = ClearText(html)
-	runeText := []rune(text)
-	if len(runeText) <= limit {
-		text = string(runeText)
-		return
-	}
-
-	text = string(runeText[0:limit]) + trimMarker
-	return
+	return FetchRangedExcerpt(html, trimMarker, 0, limit)
 }
 
 // findFirstMatchedWord returns the first matched word and its index

From 3bce8e3418efb119e1eaf1c47ceae2d325cf387c Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Mon, 18 Mar 2024 15:49:29 +0800
Subject: [PATCH 099/114] feat(review): add url title for review page

---
 internal/schema/revision_schema.go           | 26 +++++++-------------
 internal/schema/simple_obj_info_schema.go    |  1 +
 internal/service/content/revision_service.go |  3 +++
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go
index 04b3439f..f1b11688 100644
--- a/internal/schema/revision_schema.go
+++ b/internal/schema/revision_schema.go
@@ -90,23 +90,15 @@ type GetUnreviewedRevisionResp struct {
 
 // GetRevisionResp get revision response
 type GetRevisionResp struct {
-	// id
-	ID string `json:"id"`
-	// user id
-	UserID string `json:"use_id"`
-	// object id
-	ObjectID string `json:"object_id"`
-	// object type
-	ObjectType int `json:"-"`
-	// title
-	Title string `json:"title"`
-	// content
-	Content string `json:"-"`
-	// content parsed
-	ContentParsed interface{} `json:"content"`
-	// revision status(normal: 1; delete 2)
-	Status int `json:"status"`
-	// create time
+	ID              string        `json:"id"`
+	UserID          string        `json:"use_id"`
+	ObjectID        string        `json:"object_id"`
+	ObjectType      int           `json:"-"`
+	Title           string        `json:"title"`
+	UrlTitle        string        `json:"url_title"`
+	Content         string        `json:"-"`
+	ContentParsed   interface{}   `json:"content"`
+	Status          int           `json:"status"`
 	CreatedAt       time.Time     `json:"-"`
 	CreatedAtParsed int64         `json:"create_at"`
 	UserInfo        UserBasicInfo `json:"user_info"`
diff --git a/internal/schema/simple_obj_info_schema.go b/internal/schema/simple_obj_info_schema.go
index 9dbf0d79..7c4fa9af 100644
--- a/internal/schema/simple_obj_info_schema.go
+++ b/internal/schema/simple_obj_info_schema.go
@@ -42,6 +42,7 @@ type UnreviewedRevisionInfoInfo struct {
 	ObjectType          string     `json:"object_type"`
 	ObjectCreatorUserID string     `json:"object_creator_user_id"`
 	Title               string     `json:"title"`
+	UrlTitle            string     `json:"url_title"`
 	Content             string     `json:"content"`
 	Html                string     `json:"html"`
 	AnswerCount         int        `json:"answer_count"`
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index efea1ce1..715d30cc 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -43,6 +43,7 @@ import (
 	tagcommon "github.com/apache/incubator-answer/internal/service/tag_common"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
 	"github.com/apache/incubator-answer/pkg/converter"
+	"github.com/apache/incubator-answer/pkg/htmltext"
 	"github.com/apache/incubator-answer/pkg/obj"
 	"github.com/apache/incubator-answer/pkg/uid"
 	"github.com/jinzhu/copier"
@@ -344,6 +345,8 @@ func (rs *RevisionService) GetUnreviewedRevisionPage(ctx context.Context, req *s
 			_ = copier.Copy(&uinfo, userInfo)
 			item.UnreviewedInfo.UserInfo = uinfo
 		}
+		item.Info.UrlTitle = htmltext.UrlTitle(item.Info.Title)
+		item.UnreviewedInfo.UrlTitle = htmltext.UrlTitle(item.UnreviewedInfo.Title)
 		revisionResp = append(revisionResp, item)
 	}
 	return pager.NewPageModel(total, revisionResp), nil

From 68c5173f1b40345a07210094e8f613a18b89010a Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 16:25:31 +0800
Subject: [PATCH 100/114] fix: review content url format

---
 ui/src/pages/Review/utils/generateData.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
index e02bcd4f..d086ff63 100644
--- a/ui/src/pages/Review/utils/generateData.ts
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -38,6 +38,7 @@ export default (data: any) => {
     if (question_id && answer_id) {
       itemLink = `${pathFactory.answerLanding({
         questionId: question_id,
+        slugTitle: url_title,
         answerId: answer_id,
       })}?commentId=${comment_id}`;
     } else {

From a871fe1ea3929b76ce4c0951e3edba0688741c01 Mon Sep 17 00:00:00 2001
From: dashuai <lishuailing@sifou.com>
Date: Mon, 18 Mar 2024 16:26:08 +0800
Subject: [PATCH 101/114] fix: review content url format (#859)

---
 ui/src/pages/Review/utils/generateData.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.ts
index e02bcd4f..d086ff63 100644
--- a/ui/src/pages/Review/utils/generateData.ts
+++ b/ui/src/pages/Review/utils/generateData.ts
@@ -38,6 +38,7 @@ export default (data: any) => {
     if (question_id && answer_id) {
       itemLink = `${pathFactory.answerLanding({
         questionId: question_id,
+        slugTitle: url_title,
         answerId: answer_id,
       })}?commentId=${comment_id}`;
     } else {

From e274fd27d6f5b5b3852a685e1b5b579d36073b13 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 19 Mar 2024 10:37:39 +0800
Subject: [PATCH 102/114] fix: search highlighting ignores case

---
 ui/src/components/HighlightText/index.tsx           | 4 +++-
 ui/src/pages/Search/components/SearchItem/index.tsx | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/HighlightText/index.tsx b/ui/src/components/HighlightText/index.tsx
index b5acacc1..0a56865b 100644
--- a/ui/src/components/HighlightText/index.tsx
+++ b/ui/src/components/HighlightText/index.tsx
@@ -33,7 +33,9 @@ const Index: FC<IProps> = ({ text = '', keywords = [] }) => {
     <span className="highlight-text">
       {text.split(regex).map((piece: string, index: number) => {
         const key = `${piece.substring(0, 6)}_${index}`;
-        return keywords.find((kw: string) => kw === piece) ? (
+        return keywords.find(
+          (kw: string) => kw.toLocaleLowerCase() === piece.toLocaleLowerCase(),
+        ) ? (
           <mark key={key}>{piece}</mark>
         ) : (
           piece
diff --git a/ui/src/pages/Search/components/SearchItem/index.tsx b/ui/src/pages/Search/components/SearchItem/index.tsx
index a31dab56..2b0f002b 100644
--- a/ui/src/pages/Search/components/SearchItem/index.tsx
+++ b/ui/src/pages/Search/components/SearchItem/index.tsx
@@ -56,7 +56,11 @@ const Index: FC<Props> = ({ data }) => {
 
   const [searchParams] = useSearchParams();
   const q = searchParams.get('q');
-  const keywords = q?.replace(Pattern.search, '').split(' ') || [];
+  const keywords =
+    q
+      ?.replace(Pattern.search, '')
+      ?.split(' ')
+      ?.filter((v) => v !== '') || [];
 
   return (
     <ListGroupItem className="py-3 px-0 border-start-0 border-end-0 bg-transparent">

From c440b1201b9ed2b761ebeef125b4a166e9fec574 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Tue, 19 Mar 2024 18:39:45 +0800
Subject: [PATCH 103/114] feat(review): add reason key and content for review
 page

---
 docs/docs.go                              | 21 ++++++++++++--------
 docs/swagger.json                         | 21 ++++++++++++--------
 docs/swagger.yaml                         | 16 ++++++++-------
 i18n/en_US.yaml                           |  4 ++++
 internal/base/reason/reason.go            |  6 +++---
 internal/schema/reason_schema.go          |  4 +++-
 internal/schema/report_schema.go          |  1 +
 internal/schema/user_schema.go            |  6 ++++++
 internal/service/report/report_service.go |  1 +
 pkg/checker/url.go                        | 24 +++++++++++++++++++++++
 10 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 pkg/checker/url.go

diff --git a/docs/docs.go b/docs/docs.go
index 086d660e..30a8e1bc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7878,6 +7878,9 @@ const docTemplate = `{
                 "reason": {
                     "$ref": "#/definitions/schema.ReasonItem"
                 },
+                "reason_content": {
+                    "type": "string"
+                },
                 "submit_at": {
                     "type": "integer"
                 },
@@ -7915,33 +7918,29 @@ const docTemplate = `{
         "schema.GetRevisionResp": {
             "type": "object",
             "properties": {
-                "content": {
-                    "description": "content parsed"
-                },
+                "content": {},
                 "create_at": {
                     "type": "integer"
                 },
                 "id": {
-                    "description": "id",
                     "type": "string"
                 },
                 "object_id": {
-                    "description": "object id",
                     "type": "string"
                 },
                 "reason": {
                     "type": "string"
                 },
                 "status": {
-                    "description": "revision status(normal: 1; delete 2)",
                     "type": "integer"
                 },
                 "title": {
-                    "description": "title",
+                    "type": "string"
+                },
+                "url_title": {
                     "type": "string"
                 },
                 "use_id": {
-                    "description": "user id",
                     "type": "string"
                 },
                 "user_info": {
@@ -8794,6 +8793,9 @@ const docTemplate = `{
                 "placeholder": {
                     "type": "string"
                 },
+                "reason_key": {
+                    "type": "string"
+                },
                 "reason_type": {
                     "type": "integer"
                 }
@@ -9713,6 +9715,9 @@ const docTemplate = `{
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.json b/docs/swagger.json
index 4c7663de..00b06d9a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7866,6 +7866,9 @@
                 "reason": {
                     "$ref": "#/definitions/schema.ReasonItem"
                 },
+                "reason_content": {
+                    "type": "string"
+                },
                 "submit_at": {
                     "type": "integer"
                 },
@@ -7903,33 +7906,29 @@
         "schema.GetRevisionResp": {
             "type": "object",
             "properties": {
-                "content": {
-                    "description": "content parsed"
-                },
+                "content": {},
                 "create_at": {
                     "type": "integer"
                 },
                 "id": {
-                    "description": "id",
                     "type": "string"
                 },
                 "object_id": {
-                    "description": "object id",
                     "type": "string"
                 },
                 "reason": {
                     "type": "string"
                 },
                 "status": {
-                    "description": "revision status(normal: 1; delete 2)",
                     "type": "integer"
                 },
                 "title": {
-                    "description": "title",
+                    "type": "string"
+                },
+                "url_title": {
                     "type": "string"
                 },
                 "use_id": {
-                    "description": "user id",
                     "type": "string"
                 },
                 "user_info": {
@@ -8782,6 +8781,9 @@
                 "placeholder": {
                     "type": "string"
                 },
+                "reason_key": {
+                    "type": "string"
+                },
                 "reason_type": {
                     "type": "integer"
                 }
@@ -9701,6 +9703,9 @@
                 },
                 "title": {
                     "type": "string"
+                },
+                "url_title": {
+                    "type": "string"
                 }
             }
         },
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 204c5bce..e9bb895e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -855,6 +855,8 @@ definitions:
         type: string
       reason:
         $ref: '#/definitions/schema.ReasonItem'
+      reason_content:
+        type: string
       submit_at:
         type: integer
       submitter_user:
@@ -879,26 +881,22 @@ definitions:
     type: object
   schema.GetRevisionResp:
     properties:
-      content:
-        description: content parsed
+      content: {}
       create_at:
         type: integer
       id:
-        description: id
         type: string
       object_id:
-        description: object id
         type: string
       reason:
         type: string
       status:
-        description: 'revision status(normal: 1; delete 2)'
         type: integer
       title:
-        description: title
+        type: string
+      url_title:
         type: string
       use_id:
-        description: user id
         type: string
       user_info:
         $ref: '#/definitions/schema.UserBasicInfo'
@@ -1491,6 +1489,8 @@ definitions:
         type: string
       placeholder:
         type: string
+      reason_key:
+        type: string
       reason_type:
         type: integer
     type: object
@@ -2117,6 +2117,8 @@ definitions:
         type: array
       title:
         type: string
+      url_title:
+        type: string
     type: object
   schema.UpdateCommentReq:
     properties:
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index d70850e6..0feac0b8 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -18,6 +18,7 @@
 # The following fields are used for back-end
 
 backend:
+
   base:
     success:
       other: Success.
@@ -141,6 +142,9 @@ backend:
   email_or_password_wrong_error:
     other: Email and password do not match.
   error:
+    common:
+      invalid_url:
+        other: Invalid URL.
     password:
       space_invalid:
         other: Password cannot contain spaces.
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index 55f24322..0dbf73ac 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -100,9 +100,9 @@ const (
 	AdminCannotModifySelfStatus      = "error.admin.cannot_modify_self_status"
 	UserAccessDenied                 = "error.user.access_denied"
 	UserPageAccessDenied             = "error.user.page_access_denied"
-
-	AddBulkUsersFormatError = "error.user.add_bulk_users_format_error"
-	AddBulkUsersAmountError = "error.user.add_bulk_users_amount_error"
+	AddBulkUsersFormatError          = "error.user.add_bulk_users_format_error"
+	AddBulkUsersAmountError          = "error.user.add_bulk_users_amount_error"
+	InvalidURLError                  = "error.common.invalid_url"
 )
 
 // user external login reasons
diff --git a/internal/schema/reason_schema.go b/internal/schema/reason_schema.go
index 82d62743..b408ce9b 100644
--- a/internal/schema/reason_schema.go
+++ b/internal/schema/reason_schema.go
@@ -25,6 +25,7 @@ import (
 )
 
 type ReasonItem struct {
+	ReasonKey   string `json:"reason_key"`
 	ReasonType  int    `json:"reason_type"`
 	Name        string `json:"name"`
 	Description string `json:"description"`
@@ -52,9 +53,10 @@ func (r *ReasonItem) Translate(keyPrefix string, lang i18n.Language) {
 			return fieldTr
 		}
 		// If i18n key not exists, return fieldData original value
-		return fieldData + "没翻译"
+		return fieldData
 	}
 
+	r.ReasonKey = keyPrefix
 	r.Name = trField("name", r.Name)
 	r.Description = trField("desc", r.Description)
 	r.Placeholder = trField("placeholder", r.Placeholder)
diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go
index a1574722..1f702df4 100644
--- a/internal/schema/report_schema.go
+++ b/internal/schema/report_schema.go
@@ -91,6 +91,7 @@ type GetReportListPageResp struct {
 	SubmitAt         int64         `json:"submit_at"`
 	SubmitterUser    UserBasicInfo `json:"submitter_user"`
 	Reason           *ReasonItem   `json:"reason"`
+	ReasonContent    string        `json:"reason_content"`
 }
 
 // GetUnreviewedReportPostPageReq get unreviewed report post page request
diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go
index 7915e40c..a95acfc7 100644
--- a/internal/schema/user_schema.go
+++ b/internal/schema/user_schema.go
@@ -280,6 +280,12 @@ func CustomAvatar(url string) *AvatarInfo {
 
 func (req *UpdateInfoRequest) Check() (errFields []*validator.FormErrorField, err error) {
 	req.BioHTML = converter.Markdown2BasicHTML(req.Bio)
+	if len(req.Website) > 0 && !checker.IsURL(req.Website) {
+		return append(errFields, &validator.FormErrorField{
+			ErrorField: "website",
+			ErrorMsg:   reason.InvalidURLError,
+		}), errors.BadRequest(reason.InvalidURLError)
+	}
 	return nil, nil
 }
 
diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go
index a494be9d..a3e07f47 100644
--- a/internal/service/report/report_service.go
+++ b/internal/service/report/report_service.go
@@ -146,6 +146,7 @@ func (rs *ReportService) GetUnreviewedReportPostPage(ctx context.Context, req *s
 			SubmitAt:         report.CreatedAt.Unix(),
 			ObjectStatus:     info.Status,
 			ObjectShowStatus: info.ShowStatus,
+			ReasonContent:    report.Content,
 		}
 
 		// get user info
diff --git a/pkg/checker/url.go b/pkg/checker/url.go
new file mode 100644
index 00000000..1ec97a59
--- /dev/null
+++ b/pkg/checker/url.go
@@ -0,0 +1,24 @@
+package checker
+
+import (
+	"net/url"
+	"strings"
+)
+
+func IsURL(str string) bool {
+	s := strings.ToLower(str)
+
+	if len(s) == 0 {
+		return false
+	}
+
+	u, err := url.Parse(s)
+	if err != nil || u.Scheme == "" {
+		return false
+	}
+
+	if u.Host == "" && u.Fragment == "" && u.Opaque == "" {
+		return false
+	}
+	return u.Scheme == "http" || u.Scheme == "https"
+}

From f89e946d1ddd0e7cdfbcfaaea2da294807538e72 Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Wed, 20 Mar 2024 11:53:22 +0800
Subject: [PATCH 104/114] feat(migration): update clarity description config

---
 internal/migrations/v20.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/internal/migrations/v20.go b/internal/migrations/v20.go
index 84c9c045..a2349787 100644
--- a/internal/migrations/v20.go
+++ b/internal/migrations/v20.go
@@ -21,11 +21,18 @@ package migrations
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/apache/incubator-answer/internal/entity"
+	"github.com/segmentfault/pacman/log"
 	"xorm.io/xorm"
 )
 
 func addReview(ctx context.Context, x *xorm.Engine) error {
+	c := &entity.Config{Key: "reason.not_clarity", Value: `{"name":"needs details or clarity","description":"This question currently includes multiple questions in one. It should focus on one problem only."}`}
+	if _, err := x.Context(ctx).Update(c, &entity.Config{Key: "reason.not_clarity"}); err != nil {
+		log.Errorf("update %+v config failed: %s", c, err)
+		return fmt.Errorf("update config failed: %w", err)
+	}
 	return x.Context(ctx).Sync(new(entity.Review))
 }

From 520f089f7d2d6acb7b3135e7f28ccfc515952d8a Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 20 Mar 2024 14:55:41 +0800
Subject: [PATCH 105/114] fix: add verification for reporting operations

---
 i18n/en_US.yaml                               |  6 ++-
 ui/src/common/interface.ts                    |  1 +
 ui/src/hooks/useReportModal/index.tsx         | 45 ++++++++++++++++---
 ui/src/index.scss                             |  4 ++
 ui/src/pages/Questions/Detail/index.scss      |  3 --
 ui/src/pages/Questions/Detail/index.tsx       | 11 +++--
 .../Review/components/FlagContent/index.tsx   | 15 ++++++-
 ui/src/pages/Tags/Info/index.tsx              | 11 +++--
 8 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 7bbbe748..473286cd 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -689,6 +689,8 @@ ui:
       empty: Cannot be empty.
     msg:
       empty: Please select a reason.
+      not_a_url: URL format is incorrect.
+      url_not_match: URL origin does not match the current website.
   tag_modal:
     title: Create new tag
     form:
@@ -1838,8 +1840,8 @@ ui:
     queued_user: Queued user
     filter_label: Type
     reputation: reputation
-    flag_post_type: Flagged this post as {{ type }}
-    flag_user_type: Flagged this user as {{ type }}
+    flag_post_type: Flagged this post as {{ type }}.
+    flag_user_type: Flagged this user as {{ type }}.
     edit_post: Edit post
     list_post: List post
     unlist_post: Unlist post
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index af81d9e6..53f8eef5 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -626,6 +626,7 @@ export interface BaseReviewItem {
 
 export interface FlagReviewItem extends BaseReviewItem {
   reason: ReasonItem;
+  reason_content: string;
   submitter_user: UserInfoBase;
 }
 
diff --git a/ui/src/hooks/useReportModal/index.tsx b/ui/src/hooks/useReportModal/index.tsx
index 88cd2442..27101c59 100644
--- a/ui/src/hooks/useReportModal/index.tsx
+++ b/ui/src/hooks/useReportModal/index.tsx
@@ -107,6 +107,43 @@ const useReportModal = (callback?: () => void) => {
     setShow(false);
   };
 
+  const checkValidate = () => {
+    if (reportType.haveContent && !content.value) {
+      setContent({
+        value: content.value,
+        isInvalid: true,
+        errorMsg: t('remark.empty'),
+      });
+      return false;
+    }
+
+    if (reportType.type === 60) {
+      // a duplicate
+      let url: URL | undefined;
+      try {
+        url = new URL(content.value);
+      } catch {
+        setContent({
+          value: content.value,
+          isInvalid: true,
+          errorMsg: t('msg.not_a_url'),
+        });
+      }
+      if (!url) return false;
+
+      if (url.origin !== window.location.origin) {
+        setContent({
+          value: content.value,
+          isInvalid: true,
+          errorMsg: t('msg.url_not_match'),
+        });
+        return false;
+      }
+    }
+
+    return true;
+  };
+
   const handleSubmit = () => {
     if (!params) {
       return;
@@ -116,14 +153,10 @@ const useReportModal = (callback?: () => void) => {
       return;
     }
 
-    if (reportType.haveContent && !content.value) {
-      setContent({
-        value: content.value,
-        isInvalid: true,
-        errorMsg: t('remark.empty'),
-      });
+    if (!checkValidate()) {
       return;
     }
+
     if (params.type === 'question' && params.action === 'close') {
       if (params?.source === 'review') {
         putFlagReviewAction({
diff --git a/ui/src/index.scss b/ui/src/index.scss
index 8dd77087..b174fbc5 100644
--- a/ui/src/index.scss
+++ b/ui/src/index.scss
@@ -348,3 +348,7 @@ img[src=""] {
 .max-width-200 {
   max-width: 200px;
 }
+
+.alert-exist {
+  color: var(--an-alert-exist-color);
+}
diff --git a/ui/src/pages/Questions/Detail/index.scss b/ui/src/pages/Questions/Detail/index.scss
index 5db9050b..b2327d79 100644
--- a/ui/src/pages/Questions/Detail/index.scss
+++ b/ui/src/pages/Questions/Detail/index.scss
@@ -20,9 +20,6 @@
 .answer-item {
   border-top: 1px solid var(--an-answer-item-border-top);
 }
-.alert-exist {
-  color: var(--an-alert-exist-color);
-}
 
 @media screen and (max-width: 768px) {
   .questionDetailPage {
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index b289ac68..2130ddf7 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -80,16 +80,21 @@ const Index = () => {
   const isModerator = userInfo?.role_id === 3;
   const isLogged = Boolean(userInfo?.access_token);
   const loggedUserRank = userInfo?.rank;
-  const { state: locationState } = useLocation();
+  const location = useLocation();
 
   useEffect(() => {
-    if (locationState?.isReview) {
+    if (location.state?.isReview) {
       toastStore.getState().show({
         msg: t('review', { keyPrefix: 'toast' }),
         variant: 'warning',
       });
+
+      // remove state isReview
+      const newLocation = { ...location };
+      delete newLocation.state;
+      window.history.replaceState(null, '', newLocation.pathname);
     }
-  }, [locationState]);
+  }, [location.state]);
 
   const requestAnswers = async () => {
     const res = await getAnswers({
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 17c3b7da..43f3bbfc 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -133,7 +133,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
         <Alert variant="info" className="border-0 rounded-0 mb-0">
           <Stack
             direction="horizontal"
-            gap={0.5}
+            gap={1}
             className="align-items-center mb-2">
             <BaseUserCard
               data={submitter_user}
@@ -153,6 +153,19 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               {object_type !== 'user'
                 ? t('flag_post_type', { type: reason?.name })
                 : t('flag_user_type', { type: reason?.name })}
+
+              {flagItemData?.reason_content &&
+                reason?.content_type &&
+                (reason?.reason_type !== 60 ? (
+                  <span> {flagItemData?.reason_content}</span>
+                ) : (
+                  <a href={flagItemData.reason_content} className="alert-exist">
+                    <strong>
+                      {' '}
+                      {t('show_exist', { keyPrefix: 'question_detail' })}
+                    </strong>
+                  </a>
+                ))}
             </p>
           </Stack>
         </Alert>
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index ce09c997..7c620715 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -39,7 +39,7 @@ import { loggedUserInfoStore, toastStore } from '@/stores';
 
 const TagIntroduction = () => {
   const userInfo = loggedUserInfoStore((state) => state.user);
-  const { state: locationState } = useLocation();
+  const location = useLocation();
   const isLogged = Boolean(userInfo?.access_token);
   const [isEdit, setEditState] = useState(false);
   const { tagName } = useParams();
@@ -62,13 +62,18 @@ const TagIntroduction = () => {
     title: pageTitle,
   });
   useEffect(() => {
-    if (locationState?.isReview) {
+    if (location.state?.isReview) {
       toastStore.getState().show({
         msg: t('review', { keyPrefix: 'toast' }),
         variant: 'warning',
       });
+
+      // remove state isReview
+      const newLocation = { ...location };
+      delete newLocation.state;
+      window.history.replaceState(null, '', newLocation.pathname);
     }
-  }, [locationState]);
+  }, [location.state]);
 
   useEffect(() => {
     const fmt = document.querySelector('.content.fmt') as HTMLElement;

From e7fb6192910bb398deb10df3ba26d389d09d3fd7 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Wed, 20 Mar 2024 14:55:41 +0800
Subject: [PATCH 106/114] fix: add verification for reporting operations

---
 i18n/en_US.yaml                               |  6 ++-
 ui/src/common/interface.ts                    |  1 +
 ui/src/hooks/useReportModal/index.tsx         | 45 ++++++++++++++++---
 ui/src/index.scss                             |  4 ++
 ui/src/pages/Questions/Detail/index.scss      |  3 --
 ui/src/pages/Questions/Detail/index.tsx       | 11 +++--
 .../Review/components/FlagContent/index.tsx   | 15 ++++++-
 ui/src/pages/Tags/Info/index.tsx              | 11 +++--
 8 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index bb038dfd..2d703838 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -680,6 +680,8 @@ ui:
       empty: Cannot be empty.
     msg:
       empty: Please select a reason.
+      not_a_url: URL format is incorrect.
+      url_not_match: URL origin does not match the current website.
   tag_modal:
     title: Create new tag
     form:
@@ -1829,8 +1831,8 @@ ui:
     queued_user: Queued user
     filter_label: Type
     reputation: reputation
-    flag_post_type: Flagged this post as {{ type }}
-    flag_user_type: Flagged this user as {{ type }}
+    flag_post_type: Flagged this post as {{ type }}.
+    flag_user_type: Flagged this user as {{ type }}.
     edit_post: Edit post
     list_post: List post
     unlist_post: Unlist post
diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.ts
index af81d9e6..53f8eef5 100644
--- a/ui/src/common/interface.ts
+++ b/ui/src/common/interface.ts
@@ -626,6 +626,7 @@ export interface BaseReviewItem {
 
 export interface FlagReviewItem extends BaseReviewItem {
   reason: ReasonItem;
+  reason_content: string;
   submitter_user: UserInfoBase;
 }
 
diff --git a/ui/src/hooks/useReportModal/index.tsx b/ui/src/hooks/useReportModal/index.tsx
index 88cd2442..27101c59 100644
--- a/ui/src/hooks/useReportModal/index.tsx
+++ b/ui/src/hooks/useReportModal/index.tsx
@@ -107,6 +107,43 @@ const useReportModal = (callback?: () => void) => {
     setShow(false);
   };
 
+  const checkValidate = () => {
+    if (reportType.haveContent && !content.value) {
+      setContent({
+        value: content.value,
+        isInvalid: true,
+        errorMsg: t('remark.empty'),
+      });
+      return false;
+    }
+
+    if (reportType.type === 60) {
+      // a duplicate
+      let url: URL | undefined;
+      try {
+        url = new URL(content.value);
+      } catch {
+        setContent({
+          value: content.value,
+          isInvalid: true,
+          errorMsg: t('msg.not_a_url'),
+        });
+      }
+      if (!url) return false;
+
+      if (url.origin !== window.location.origin) {
+        setContent({
+          value: content.value,
+          isInvalid: true,
+          errorMsg: t('msg.url_not_match'),
+        });
+        return false;
+      }
+    }
+
+    return true;
+  };
+
   const handleSubmit = () => {
     if (!params) {
       return;
@@ -116,14 +153,10 @@ const useReportModal = (callback?: () => void) => {
       return;
     }
 
-    if (reportType.haveContent && !content.value) {
-      setContent({
-        value: content.value,
-        isInvalid: true,
-        errorMsg: t('remark.empty'),
-      });
+    if (!checkValidate()) {
       return;
     }
+
     if (params.type === 'question' && params.action === 'close') {
       if (params?.source === 'review') {
         putFlagReviewAction({
diff --git a/ui/src/index.scss b/ui/src/index.scss
index 8dd77087..b174fbc5 100644
--- a/ui/src/index.scss
+++ b/ui/src/index.scss
@@ -348,3 +348,7 @@ img[src=""] {
 .max-width-200 {
   max-width: 200px;
 }
+
+.alert-exist {
+  color: var(--an-alert-exist-color);
+}
diff --git a/ui/src/pages/Questions/Detail/index.scss b/ui/src/pages/Questions/Detail/index.scss
index 5db9050b..b2327d79 100644
--- a/ui/src/pages/Questions/Detail/index.scss
+++ b/ui/src/pages/Questions/Detail/index.scss
@@ -20,9 +20,6 @@
 .answer-item {
   border-top: 1px solid var(--an-answer-item-border-top);
 }
-.alert-exist {
-  color: var(--an-alert-exist-color);
-}
 
 @media screen and (max-width: 768px) {
   .questionDetailPage {
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index b289ac68..2130ddf7 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -80,16 +80,21 @@ const Index = () => {
   const isModerator = userInfo?.role_id === 3;
   const isLogged = Boolean(userInfo?.access_token);
   const loggedUserRank = userInfo?.rank;
-  const { state: locationState } = useLocation();
+  const location = useLocation();
 
   useEffect(() => {
-    if (locationState?.isReview) {
+    if (location.state?.isReview) {
       toastStore.getState().show({
         msg: t('review', { keyPrefix: 'toast' }),
         variant: 'warning',
       });
+
+      // remove state isReview
+      const newLocation = { ...location };
+      delete newLocation.state;
+      window.history.replaceState(null, '', newLocation.pathname);
     }
-  }, [locationState]);
+  }, [location.state]);
 
   const requestAnswers = async () => {
     const res = await getAnswers({
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 17c3b7da..43f3bbfc 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -133,7 +133,7 @@ const Index: FC<IProps> = ({ refreshCount }) => {
         <Alert variant="info" className="border-0 rounded-0 mb-0">
           <Stack
             direction="horizontal"
-            gap={0.5}
+            gap={1}
             className="align-items-center mb-2">
             <BaseUserCard
               data={submitter_user}
@@ -153,6 +153,19 @@ const Index: FC<IProps> = ({ refreshCount }) => {
               {object_type !== 'user'
                 ? t('flag_post_type', { type: reason?.name })
                 : t('flag_user_type', { type: reason?.name })}
+
+              {flagItemData?.reason_content &&
+                reason?.content_type &&
+                (reason?.reason_type !== 60 ? (
+                  <span> {flagItemData?.reason_content}</span>
+                ) : (
+                  <a href={flagItemData.reason_content} className="alert-exist">
+                    <strong>
+                      {' '}
+                      {t('show_exist', { keyPrefix: 'question_detail' })}
+                    </strong>
+                  </a>
+                ))}
             </p>
           </Stack>
         </Alert>
diff --git a/ui/src/pages/Tags/Info/index.tsx b/ui/src/pages/Tags/Info/index.tsx
index ce09c997..7c620715 100644
--- a/ui/src/pages/Tags/Info/index.tsx
+++ b/ui/src/pages/Tags/Info/index.tsx
@@ -39,7 +39,7 @@ import { loggedUserInfoStore, toastStore } from '@/stores';
 
 const TagIntroduction = () => {
   const userInfo = loggedUserInfoStore((state) => state.user);
-  const { state: locationState } = useLocation();
+  const location = useLocation();
   const isLogged = Boolean(userInfo?.access_token);
   const [isEdit, setEditState] = useState(false);
   const { tagName } = useParams();
@@ -62,13 +62,18 @@ const TagIntroduction = () => {
     title: pageTitle,
   });
   useEffect(() => {
-    if (locationState?.isReview) {
+    if (location.state?.isReview) {
       toastStore.getState().show({
         msg: t('review', { keyPrefix: 'toast' }),
         variant: 'warning',
       });
+
+      // remove state isReview
+      const newLocation = { ...location };
+      delete newLocation.state;
+      window.history.replaceState(null, '', newLocation.pathname);
     }
-  }, [locationState]);
+  }, [location.state]);
 
   useEffect(() => {
     const fmt = document.querySelector('.content.fmt') as HTMLElement;

From 63a233401005e8a9ba866717ef98f254951ccc8a Mon Sep 17 00:00:00 2001
From: LinkinStars <linkinstar@foxmail.com>
Date: Thu, 21 Mar 2024 10:13:39 +0800
Subject: [PATCH 107/114] feat(review): add rank for reviewed user

---
 cmd/wire_gen.go                               |   3 +-
 i18n/en_US.yaml                               |   2 +
 internal/repo/activity/review_repo.go         | 125 ++++++++++++++++++
 internal/repo/provider.go                     |   1 +
 internal/schema/activity.go                   |   9 ++
 internal/service/activity/review_active.go    |  31 +++++
 .../service/activity_type/activity_type.go    |   2 +
 internal/service/content/revision_service.go  |  26 ++++
 8 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 internal/repo/activity/review_repo.go
 create mode 100644 internal/service/activity/review_active.go

diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
index 816d05f2..0bf0eb42 100644
--- a/cmd/wire_gen.go
+++ b/cmd/wire_gen.go
@@ -195,7 +195,8 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,
 	searchRepo := search_common.NewSearchRepo(dataData, uniqueIDRepo, userCommon, tagCommonService)
 	searchService := content.NewSearchService(searchParser, searchRepo)
 	searchController := controller.NewSearchController(searchService, captchaService)
-	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo, reviewService)
+	reviewActivityRepo := activity.NewReviewActivityRepo(dataData, activityRepo, userRankRepo, configService)
+	contentRevisionService := content.NewRevisionService(revisionRepo, userCommon, questionCommon, answerService, objService, questionRepo, answerRepo, tagRepo, tagCommonService, notificationQueueService, activityQueueService, reportRepo, reviewService, reviewActivityRepo)
 	revisionController := controller.NewRevisionController(contentRevisionService, rankService)
 	rankController := controller.NewRankController(rankService)
 	userAdminRepo := user.NewUserAdminRepo(dataData, authRepo)
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 0feac0b8..2c578418 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -496,6 +496,8 @@ backend:
       other: accept
     accepted:
       other: accepted
+    edit:
+      other: edit
   review:
     queued_post:
       other: Queued post
diff --git a/internal/repo/activity/review_repo.go b/internal/repo/activity/review_repo.go
new file mode 100644
index 00000000..3325a762
--- /dev/null
+++ b/internal/repo/activity/review_repo.go
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package activity
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/apache/incubator-answer/internal/schema"
+	"github.com/apache/incubator-answer/pkg/converter"
+	"xorm.io/builder"
+
+	"github.com/apache/incubator-answer/internal/base/data"
+	"github.com/apache/incubator-answer/internal/base/reason"
+	"github.com/apache/incubator-answer/internal/entity"
+	"github.com/apache/incubator-answer/internal/service/activity"
+	"github.com/apache/incubator-answer/internal/service/activity_common"
+	"github.com/apache/incubator-answer/internal/service/config"
+	"github.com/apache/incubator-answer/internal/service/rank"
+	"github.com/segmentfault/pacman/errors"
+	"xorm.io/xorm"
+)
+
+// ReviewActivityRepo answer accepted
+type ReviewActivityRepo struct {
+	data          *data.Data
+	activityRepo  activity_common.ActivityRepo
+	userRankRepo  rank.UserRankRepo
+	configService *config.ConfigService
+}
+
+const (
+	EditAccepted = "edit.accepted"
+)
+
+// NewReviewActivityRepo new repository
+func NewReviewActivityRepo(
+	data *data.Data,
+	activityRepo activity_common.ActivityRepo,
+	userRankRepo rank.UserRankRepo,
+	configService *config.ConfigService,
+) activity.ReviewActivityRepo {
+	return &ReviewActivityRepo{
+		data:          data,
+		activityRepo:  activityRepo,
+		userRankRepo:  userRankRepo,
+		configService: configService,
+	}
+}
+
+// Review user active
+func (ar *ReviewActivityRepo) Review(ctx context.Context, act *schema.PassReviewActivity) (err error) {
+	cfg, err := ar.configService.GetConfigByKey(ctx, EditAccepted)
+	if err != nil {
+		return err
+	}
+	addActivity := &entity.Activity{
+		UserID:           act.UserID,
+		TriggerUserID:    converter.StringToInt64(act.TriggerUserID),
+		ObjectID:         act.ObjectID,
+		OriginalObjectID: act.OriginalObjectID,
+		ActivityType:     cfg.ID,
+		Rank:             cfg.GetIntValue(),
+		HasRank:          1,
+		RevisionID:       converter.StringToInt64(act.RevisionID),
+	}
+
+	_, err = ar.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {
+		session = session.Context(ctx)
+
+		user := &entity.User{}
+		exist, err := session.ID(addActivity.UserID).ForUpdate().Get(user)
+		if err != nil {
+			return nil, err
+		}
+		if !exist {
+			return nil, fmt.Errorf("user not exist")
+		}
+
+		existsActivity := &entity.Activity{}
+		exist, err = session.
+			And(builder.Eq{"user_id": addActivity.UserID}).
+			And(builder.Eq{"activity_type": addActivity.ActivityType}).
+			And(builder.Eq{"revision_id": addActivity.RevisionID}).
+			Get(existsActivity)
+		if err != nil {
+			return nil, err
+		}
+		if exist {
+			return nil, nil
+		}
+
+		err = ar.userRankRepo.ChangeUserRank(ctx, session, addActivity.UserID, user.Rank, addActivity.Rank)
+		if err != nil {
+			return nil, err
+		}
+
+		_, err = session.Insert(addActivity)
+		if err != nil {
+			return nil, err
+		}
+		return nil, nil
+	})
+	if err != nil {
+		return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return nil
+}
diff --git a/internal/repo/provider.go b/internal/repo/provider.go
index 041b6c87..3a517120 100644
--- a/internal/repo/provider.go
+++ b/internal/repo/provider.go
@@ -76,6 +76,7 @@ var ProviderSetRepo = wire.NewSet(
 	activity.NewAnswerActivityRepo,
 	activity.NewUserActiveActivityRepo,
 	activity.NewActivityRepo,
+	activity.NewReviewActivityRepo,
 	tag.NewTagRepo,
 	tag_common.NewTagCommonRepo,
 	tag.NewTagRelRepo,
diff --git a/internal/schema/activity.go b/internal/schema/activity.go
index 66a6b188..2ec837aa 100644
--- a/internal/schema/activity.go
+++ b/internal/schema/activity.go
@@ -101,3 +101,12 @@ type ObjectTimelineTag struct {
 	Recommend       bool   `json:"recommend"`
 	Reserved        bool   `json:"reserved"`
 }
+
+// PassReviewActivity pass review activity
+type PassReviewActivity struct {
+	UserID           string `json:"user_id"`
+	TriggerUserID    string `json:"trigger_user_id"`
+	ObjectID         string `json:"object_id"`
+	OriginalObjectID string `json:"original_object_id"`
+	RevisionID       string `json:"revision_id"`
+}
diff --git a/internal/service/activity/review_active.go b/internal/service/activity/review_active.go
new file mode 100644
index 00000000..0f0a9c24
--- /dev/null
+++ b/internal/service/activity/review_active.go
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package activity
+
+import (
+	"context"
+
+	"github.com/apache/incubator-answer/internal/schema"
+)
+
+// ReviewActivityRepo interface
+type ReviewActivityRepo interface {
+	Review(ctx context.Context, sct *schema.PassReviewActivity) (err error)
+}
diff --git a/internal/service/activity_type/activity_type.go b/internal/service/activity_type/activity_type.go
index b41d0770..5db98041 100644
--- a/internal/service/activity_type/activity_type.go
+++ b/internal/service/activity_type/activity_type.go
@@ -31,6 +31,7 @@ const (
 	AnswerAccepted    = "answer.accepted"
 	AnswerAccept      = "answer.accept"
 	CommentVoteUp     = "comment.vote_up"
+	EditAccepted      = "edit.accepted"
 )
 
 var (
@@ -70,5 +71,6 @@ var (
 		AnswerAccepted:    "action_activity_type.accepted",
 		AnswerAccept:      "action_activity_type.accept",
 		CommentVoteUp:     "action_activity_type.upvote",
+		EditAccepted:      "action_activity_type.edit",
 	}
 )
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index 715d30cc..b69a0568 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -31,6 +31,7 @@ import (
 	"github.com/apache/incubator-answer/internal/base/translator"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
+	"github.com/apache/incubator-answer/internal/service/activity"
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
 	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
 	"github.com/apache/incubator-answer/internal/service/notice_queue"
@@ -66,6 +67,7 @@ type RevisionService struct {
 	activityQueueService     activity_queue.ActivityQueueService
 	reportRepo               report_common.ReportRepo
 	reviewService            *review.ReviewService
+	reviewActivity           activity.ReviewActivityRepo
 }
 
 func NewRevisionService(
@@ -82,6 +84,7 @@ func NewRevisionService(
 	activityQueueService activity_queue.ActivityQueueService,
 	reportRepo report_common.ReportRepo,
 	reviewService *review.ReviewService,
+	reviewActivity activity.ReviewActivityRepo,
 ) *RevisionService {
 	return &RevisionService{
 		revisionRepo:             revisionRepo,
@@ -97,6 +100,7 @@ func NewRevisionService(
 		activityQueueService:     activityQueueService,
 		reportRepo:               reportRepo,
 		reviewService:            reviewService,
+		reviewActivity:           reviewActivity,
 	}
 }
 
@@ -148,6 +152,28 @@ func (rs *RevisionService) RevisionAudit(ctx context.Context, req *schema.Revisi
 			return saveErr
 		}
 		err = rs.revisionRepo.UpdateStatus(ctx, req.ID, entity.RevisionReviewPassStatus, req.UserID)
+		if err != nil {
+			return err
+		}
+		err = rs.reviewActivity.Review(ctx, &schema.PassReviewActivity{
+			UserID:           revisioninfo.UserID,
+			TriggerUserID:    req.UserID,
+			ObjectID:         revisioninfo.ObjectID,
+			OriginalObjectID: "0",
+			RevisionID:       revisioninfo.ID,
+		})
+		if err != nil {
+			log.Errorf("add review activity failed: %v", err)
+		}
+
+		msg := &schema.NotificationMsg{
+			TriggerUserID:  req.UserID,
+			ReceiverUserID: revisioninfo.UserID,
+			Type:           schema.NotificationTypeAchievement,
+			ObjectID:       revisioninfo.ObjectID,
+			ObjectType:     objectType,
+		}
+		rs.notificationQueueService.Send(ctx, msg)
 		return
 	}
 

From d0fac4e7c104770d666f136241c1512a100a3f34 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 21 Mar 2024 11:31:34 +0800
Subject: [PATCH 108/114] fix: xss link

---
 ui/src/pages/Questions/Detail/components/Alert/index.tsx  | 2 +-
 ui/src/pages/Review/components/FlagContent/index.tsx      | 4 +++-
 ui/src/pages/Users/Personal/components/UserInfo/index.tsx | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/src/pages/Questions/Detail/components/Alert/index.tsx b/ui/src/pages/Questions/Detail/components/Alert/index.tsx
index 14973373..bee8ece2 100644
--- a/ui/src/pages/Questions/Detail/components/Alert/index.tsx
+++ b/ui/src/pages/Questions/Detail/components/Alert/index.tsx
@@ -32,7 +32,7 @@ const Index: FC<Props> = ({ data }) => {
     <Alert className="mb-4" variant={data.level}>
       {data.level === 'info' ? (
         <div>
-          {data.msg.indexOf('http') > -1 ? (
+          {data.msg.startsWith('http') ? (
             <p>
               {data.description}{' '}
               <a href={data.msg} className="alert-exist">
diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsx
index 43f3bbfc..f1d56032 100644
--- a/ui/src/pages/Review/components/FlagContent/index.tsx
+++ b/ui/src/pages/Review/components/FlagContent/index.tsx
@@ -158,13 +158,15 @@ const Index: FC<IProps> = ({ refreshCount }) => {
                 reason?.content_type &&
                 (reason?.reason_type !== 60 ? (
                   <span> {flagItemData?.reason_content}</span>
-                ) : (
+                ) : flagItemData.reason_content?.startsWith('http') ? (
                   <a href={flagItemData.reason_content} className="alert-exist">
                     <strong>
                       {' '}
                       {t('show_exist', { keyPrefix: 'question_detail' })}
                     </strong>
                   </a>
+                ) : (
+                  <strong> {flagItemData?.reason_content}</strong>
                 ))}
             </p>
           </Stack>
diff --git a/ui/src/pages/Users/Personal/components/UserInfo/index.tsx b/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
index dee5662f..07cc20b0 100644
--- a/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
+++ b/ui/src/pages/Users/Personal/components/UserInfo/index.tsx
@@ -128,7 +128,7 @@ const Index: FC<Props> = ({ data }) => {
                   <a
                     className="link-secondary"
                     href={
-                      data.website?.includes('http')
+                      data.website?.startsWith('http')
                         ? data.website
                         : `http://${data.website}`
                     }>

From eb6dc3e3dc4fd79f18e1b9c9d6726c90fb5098a9 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Thu, 21 Mar 2024 15:52:21 +0800
Subject: [PATCH 109/114] fix: add REACT_APP_BASE_URL

---
 ui/.env.production | 1 +
 ui/src/App.tsx     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/.env.production b/ui/.env.production
index 33d84710..5e1007e7 100644
--- a/ui/.env.production
+++ b/ui/.env.production
@@ -2,3 +2,4 @@ TSC_COMPILE_ON_ERROR=true
 ESLINT_NO_DEV_ERRORS=true
 PUBLIC_URL = /
 REACT_APP_API_URL = /
+REACT_APP_BASE_URL = ""
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index c15c1771..affac7a9 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -25,7 +25,9 @@ import '@/utils/pluginKit';
 import routes from '@/router';
 
 function App() {
-  const router = createBrowserRouter(routes);
+  const router = createBrowserRouter(routes, {
+    basename: process.env.REACT_APP_BASE_URL,
+  });
   return <RouterProvider router={router} />;
 }
 

From 2c8bcbfd7b9773ef30e0d605c0b50608d9169f03 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 22 Mar 2024 15:31:25 +0800
Subject: [PATCH 110/114] feat: test add basename

---
 ui/package.json                    |  2 +-
 ui/src/components/Header/index.tsx | 24 +++++++++++++-----------
 ui/src/router/alias.ts             |  2 ++
 ui/src/utils/floppyNavigation.ts   |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ui/package.json b/ui/package.json
index 63a1f85d..e10d6e7c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -2,7 +2,7 @@
   "name": "answer-static",
   "version": "0.1.0",
   "private": true,
-  "homepage": "/",
+  "homepage": "/test",
   "scripts": {
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsx
index 2f31af38..b58a36e3 100644
--- a/ui/src/components/Header/index.tsx
+++ b/ui/src/components/Header/index.tsx
@@ -249,24 +249,26 @@ const Header: FC = () => {
               </Nav>
             ) : (
               <>
-                <Button
-                  variant="link"
-                  className={classnames('me-2', {
+                <Link
+                  className={classnames('me-2 btn btn-link', {
                     'link-light': navbarStyle === 'theme-colored',
                     'link-primary': navbarStyle !== 'theme-colored',
                   })}
                   onClick={() => floppyNavigation.storageLoginRedirect()}
-                  href={userCenter.getLoginUrl()}>
+                  to={userCenter.getLoginUrl()}>
                   {t('btns.login')}
-                </Button>
+                </Link>
                 {loginSetting.allow_new_registrations && (
-                  <Button
-                    variant={
-                      navbarStyle === 'theme-colored' ? 'light' : 'primary'
-                    }
-                    href={userCenter.getSignUpUrl()}>
+                  <Link
+                    className={classnames(
+                      'btn',
+                      navbarStyle === 'theme-colored'
+                        ? 'btn-light'
+                        : 'btn-primary',
+                    )}
+                    to={userCenter.getSignUpUrl()}>
                     {t('btns.signup')}
-                  </Button>
+                  </Link>
                 )}
               </>
             )}
diff --git a/ui/src/router/alias.ts b/ui/src/router/alias.ts
index 5a155969..050f6c74 100644
--- a/ui/src/router/alias.ts
+++ b/ui/src/router/alias.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+export const REACT_BASE_PATH = process.env.REACT_APP_BASE_URL || '';
+
 export const RouteAlias = {
   home: '/',
   login: '/users/login',
diff --git a/ui/src/utils/floppyNavigation.ts b/ui/src/utils/floppyNavigation.ts
index 45758b31..308d2fac 100644
--- a/ui/src/utils/floppyNavigation.ts
+++ b/ui/src/utils/floppyNavigation.ts
@@ -137,7 +137,7 @@ const navigate = (to: string | number, config: NavigateConfig = {}) => {
     } else if (handler === 'replace') {
       window.location.replace(to);
     } else if (typeof handler === 'function') {
-      handler(to, config.options);
+      handler(to === '/test' ? '/' : to, config.options);
     }
   }
   if (typeof to === 'number' && typeof handler === 'function') {

From 299c57190436a81f1cc98b57153a25246f8d3ade Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Fri, 22 Mar 2024 18:34:46 +0800
Subject: [PATCH 111/114] fix: a tag check basename

---
 ui/src/components/Header/index.tsx            | 25 ++++++++++---------
 ui/src/components/PageTags/index.tsx          |  8 ++++--
 ui/src/pages/Admin/Answers/index.tsx          |  8 +++---
 ui/src/pages/Admin/Questions/index.tsx        |  6 ++---
 .../Install/components/FifthStep/index.tsx    | 10 +++++---
 .../Ask/components/SearchQuestion/index.tsx   |  5 ++--
 ui/src/pages/Questions/EditAnswer/index.tsx   |  8 +++---
 7 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/ui/src/components/Header/index.tsx b/ui/src/components/Header/index.tsx
index b58a36e3..2757f6c1 100644
--- a/ui/src/components/Header/index.tsx
+++ b/ui/src/components/Header/index.tsx
@@ -24,7 +24,6 @@ import {
   Nav,
   Form,
   FormControl,
-  Button,
   Col,
 } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
@@ -175,24 +174,26 @@ const Header: FC = () => {
               />
             ) : (
               <>
-                <Button
-                  variant="link"
-                  className={classnames('me-2', {
+                <Link
+                  className={classnames('me-2 btn btn-link', {
                     'link-light': navbarStyle === 'theme-colored',
                     'link-primary': navbarStyle !== 'theme-colored',
                   })}
                   onClick={() => floppyNavigation.storageLoginRedirect()}
-                  href={userCenter.getLoginUrl()}>
+                  to={userCenter.getLoginUrl()}>
                   {t('btns.login')}
-                </Button>
+                </Link>
                 {loginSetting.allow_new_registrations && (
-                  <Button
-                    variant={
-                      navbarStyle === 'theme-colored' ? 'light' : 'primary'
-                    }
-                    href={userCenter.getSignUpUrl()}>
+                  <Link
+                    className={classnames(
+                      'btn',
+                      navbarStyle === 'theme-colored'
+                        ? 'btn-light'
+                        : 'btn-primary',
+                    )}
+                    to={userCenter.getSignUpUrl()}>
                     {t('btns.signup')}
-                  </Button>
+                  </Link>
                 )}
               </>
             )}
diff --git a/ui/src/components/PageTags/index.tsx b/ui/src/components/PageTags/index.tsx
index 6bed2125..5d3dd5d7 100644
--- a/ui/src/components/PageTags/index.tsx
+++ b/ui/src/components/PageTags/index.tsx
@@ -20,6 +20,7 @@
 import { FC, useEffect, useLayoutEffect } from 'react';
 import { Helmet } from 'react-helmet-async';
 
+import { REACT_BASE_PATH } from '@/router/alias';
 import { brandingStore, pageTagStore, siteInfoStore } from '@/stores';
 import { getCurrentLang } from '@/utils/localize';
 
@@ -76,7 +77,7 @@ const Index: FC = () => {
       <link
         rel="icon"
         type="image/png"
-        href={favicon || square_icon || '/favicon.ico'}
+        href={favicon || square_icon || `${REACT_BASE_PATH}/favicon.ico`}
       />
       <link rel="icon" type="image/png" sizes="192x192" href={square_icon} />
       <link rel="apple-touch-icon" type="image/png" href={square_icon} />
@@ -84,7 +85,10 @@ const Index: FC = () => {
       {keywords && <meta name="keywords" content={keywords} />}
       {description && <meta name="description" content={description} />}
       {doInsertCustomCSS && (
-        <link rel="stylesheet" href={`${process.env.PUBLIC_URL}/custom.css`} />
+        <link
+          rel="stylesheet"
+          href={`${process.env.PUBLIC_URL}${REACT_BASE_PATH}/custom.css`}
+        />
       )}
     </Helmet>
   );
diff --git a/ui/src/pages/Admin/Answers/index.tsx b/ui/src/pages/Admin/Answers/index.tsx
index 091fe2db..c05aa77e 100644
--- a/ui/src/pages/Admin/Answers/index.tsx
+++ b/ui/src/pages/Admin/Answers/index.tsx
@@ -19,7 +19,7 @@
 
 import { FC } from 'react';
 import { Form, Table, Stack } from 'react-bootstrap';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams, Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import classNames from 'classnames';
@@ -110,8 +110,8 @@ const Answers: FC = () => {
             return (
               <tr key={li.id}>
                 <td>
-                  <a
-                    href={pathFactory.answerLanding({
+                  <Link
+                    to={pathFactory.answerLanding({
                       questionId: li.question_id,
                       slugTitle: li.question_info.url_title,
                       answerId: li.id,
@@ -120,7 +120,7 @@ const Answers: FC = () => {
                     className="text-break text-wrap"
                     rel="noreferrer">
                     {li.question_info.title}
-                  </a>
+                  </Link>
                   {li.accepted === 2 && (
                     <Icon
                       name="check-circle-fill"
diff --git a/ui/src/pages/Admin/Questions/index.tsx b/ui/src/pages/Admin/Questions/index.tsx
index 0488a08b..254aeaec 100644
--- a/ui/src/pages/Admin/Questions/index.tsx
+++ b/ui/src/pages/Admin/Questions/index.tsx
@@ -109,13 +109,13 @@ const Questions: FC = () => {
             return (
               <tr key={li.id}>
                 <td>
-                  <a
-                    href={pathFactory.questionLanding(li.id, li.url_title)}
+                  <Link
+                    to={pathFactory.questionLanding(li.id, li.url_title)}
                     target="_blank"
                     className="text-break text-wrap"
                     rel="noreferrer">
                     {li.title}
-                  </a>
+                  </Link>
                   {li.accepted_answer_id > 0 && (
                     <Icon
                       name="check-circle-fill"
diff --git a/ui/src/pages/Install/components/FifthStep/index.tsx b/ui/src/pages/Install/components/FifthStep/index.tsx
index 7a9061f9..4ec99a5c 100644
--- a/ui/src/pages/Install/components/FifthStep/index.tsx
+++ b/ui/src/pages/Install/components/FifthStep/index.tsx
@@ -21,6 +21,7 @@ import { FC } from 'react';
 import { Button } from 'react-bootstrap';
 import { useTranslation, Trans } from 'react-i18next';
 
+import { REACT_BASE_PATH } from '@/router/alias';
 import Progress from '../Progress';
 
 interface Props {
@@ -37,15 +38,18 @@ const Index: FC<Props> = ({ visible, siteUrl = '' }) => {
       <p>
         <Trans i18nKey="install.ready_description">
           If you ever feel like changing more settings, visit
-          <a href={`${siteUrl}/users/login`}> admin section</a>; find it in the
-          site menu.
+          <a href={`${siteUrl}${REACT_BASE_PATH}/users/login`}>
+            {' '}
+            admin section
+          </a>
+          ; find it in the site menu.
         </Trans>
       </p>
       <p>{t('good_luck')}</p>
 
       <div className="d-flex align-items-center justify-content-between">
         <Progress step={5} />
-        <Button href={siteUrl}>{t('done')}</Button>
+        <Button href={`${siteUrl}${REACT_BASE_PATH}`}>{t('done')}</Button>
       </div>
     </div>
   );
diff --git a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
index 96b2b0ac..0f1f527a 100644
--- a/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
+++ b/ui/src/pages/Questions/Ask/components/SearchQuestion/index.tsx
@@ -20,6 +20,7 @@
 import { memo } from 'react';
 import { Accordion, ListGroup } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { Icon } from '@/components';
 import { pathFactory } from '@/router/pathFactory';
@@ -45,10 +46,10 @@ const SearchQuestion = ({ similarQuestions }) => {
               return (
                 <ListGroup.Item
                   action
-                  as="a"
+                  as={Link}
                   className="link-dark text-wrap text-break"
                   key={item.id}
-                  href={pathFactory.questionLanding(item.id, item.url_title)}
+                  to={pathFactory.questionLanding(item.id, item.url_title)}
                   target="_blank">
                   <span
                     className={`${
diff --git a/ui/src/pages/Questions/EditAnswer/index.tsx b/ui/src/pages/Questions/EditAnswer/index.tsx
index fbb3e327..a76a7bd0 100644
--- a/ui/src/pages/Questions/EditAnswer/index.tsx
+++ b/ui/src/pages/Questions/EditAnswer/index.tsx
@@ -19,7 +19,7 @@
 
 import React, { useState, useRef, useEffect, useLayoutEffect } from 'react';
 import { Row, Col, Form, Button, Card } from 'react-bootstrap';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useParams, useNavigate, Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import dayjs from 'dayjs';
@@ -217,12 +217,12 @@ const Index = () => {
       <h3 className="mb-4">{t('title')}</h3>
       <Row>
         <Col className="page-main flex-auto">
-          <a
-            href={pathFactory.questionLanding(qid, data?.question.url_title)}
+          <Link
+            to={pathFactory.questionLanding(qid, data?.question.url_title)}
             target="_blank"
             rel="noreferrer">
             <h5 className="mb-3">{data?.question.title}</h5>
-          </a>
+          </Link>
 
           <div className="question-content-wrap">
             <div

From 7946cea31d6efb5adb64bc9c3b32b814387b58bf Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Mon, 25 Mar 2024 15:40:43 +0800
Subject: [PATCH 112/114] fix: base url

---
 ui/src/components/Share/index.tsx   | 5 +++--
 ui/src/pages/Install/index.tsx      | 3 ++-
 ui/src/pages/Users/Logout/index.tsx | 4 ++--
 ui/src/router/alias.ts              | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/Share/index.tsx b/ui/src/components/Share/index.tsx
index 0cd46f36..203a72d6 100644
--- a/ui/src/components/Share/index.tsx
+++ b/ui/src/components/Share/index.tsx
@@ -24,6 +24,7 @@ import { useTranslation } from 'react-i18next';
 import { FacebookShareButton, TwitterShareButton } from 'next-share';
 import copy from 'copy-to-clipboard';
 
+import { BASE_ORIGIN } from '@/router/alias';
 import { loggedUserInfoStore } from '@/stores';
 
 interface IProps {
@@ -42,8 +43,8 @@ const Index: FC<IProps> = ({ type, qid, aid, title }) => {
   const { t } = useTranslation();
   let baseUrl =
     type === 'question'
-      ? `${window.location.origin}/questions/${qid}`
-      : `${window.location.origin}/questions/${qid}/${aid}`;
+      ? `${BASE_ORIGIN}/questions/${qid}`
+      : `${BASE_ORIGIN}/questions/${qid}/${aid}`;
   if (user.id) {
     baseUrl = `${baseUrl}?shareUserId=${user.username}`;
   }
diff --git a/ui/src/pages/Install/index.tsx b/ui/src/pages/Install/index.tsx
index 69723d29..39d24d09 100644
--- a/ui/src/pages/Install/index.tsx
+++ b/ui/src/pages/Install/index.tsx
@@ -31,6 +31,7 @@ import {
 } from '@/services';
 import { Storage, handleFormError, scrollToDocTop } from '@/utils';
 import { CURRENT_LANG_STORAGE_KEY } from '@/common/constants';
+import { BASE_ORIGIN } from '@/router/alias';
 
 import {
   FirstStep,
@@ -94,7 +95,7 @@ const Index: FC = () => {
       errorMsg: '',
     },
     site_url: {
-      value: window.location.origin,
+      value: BASE_ORIGIN,
       isInvalid: false,
       errorMsg: '',
     },
diff --git a/ui/src/pages/Users/Logout/index.tsx b/ui/src/pages/Users/Logout/index.tsx
index 9da6e59d..5561c16f 100644
--- a/ui/src/pages/Users/Logout/index.tsx
+++ b/ui/src/pages/Users/Logout/index.tsx
@@ -25,7 +25,7 @@ import { usePageTags } from '@/hooks';
 import { logout } from '@/services';
 import { loggedUserInfoStore } from '@/stores';
 import Storage from '@/utils/storage';
-import { RouteAlias } from '@/router/alias';
+import { RouteAlias, BASE_ORIGIN } from '@/router/alias';
 import { REDIRECT_PATH_STORAGE_KEY } from '@/common/constants';
 
 const Index = () => {
@@ -43,7 +43,7 @@ const Index = () => {
         const redirect =
           Storage.get(REDIRECT_PATH_STORAGE_KEY) || RouteAlias.home;
         Storage.remove(REDIRECT_PATH_STORAGE_KEY);
-        window.location.replace(`${window.location.origin}${redirect}`);
+        window.location.replace(`${BASE_ORIGIN}${redirect}`);
       });
     }
     // auto height of container
diff --git a/ui/src/router/alias.ts b/ui/src/router/alias.ts
index 050f6c74..5f765b22 100644
--- a/ui/src/router/alias.ts
+++ b/ui/src/router/alias.ts
@@ -19,6 +19,8 @@
 
 export const REACT_BASE_PATH = process.env.REACT_APP_BASE_URL || '';
 
+export const BASE_ORIGIN = `${window.location.origin}${REACT_BASE_PATH}`;
+
 export const RouteAlias = {
   home: '/',
   login: '/users/login',

From 571c2b1a19d6d2c29bc1cfed52a44b9cbab91d75 Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 26 Mar 2024 10:47:46 +0800
Subject: [PATCH 113/114] fix: naviage add base path

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

diff --git a/ui/src/utils/floppyNavigation.ts b/ui/src/utils/floppyNavigation.ts
index 308d2fac..30be62ca 100644
--- a/ui/src/utils/floppyNavigation.ts
+++ b/ui/src/utils/floppyNavigation.ts
@@ -19,7 +19,7 @@
 
 import type { NavigateFunction } from 'react-router-dom';
 
-import { RouteAlias } from '@/router/alias';
+import { RouteAlias, REACT_BASE_PATH } from '@/router/alias';
 import Storage from '@/utils/storage';
 import { REDIRECT_PATH_STORAGE_KEY } from '@/common/constants';
 import { getLoginUrl } from '@/utils/userCenter';
@@ -133,8 +133,22 @@ const navigate = (to: string | number, config: NavigateConfig = {}) => {
       handler = 'replace';
     }
     if (handler === 'href') {
+      if (
+        to.startsWith('/') &&
+        !to.startsWith('//') &&
+        !to.startsWith(REACT_BASE_PATH)
+      ) {
+        to = `${REACT_BASE_PATH}${to}`;
+      }
       window.location.href = to;
     } else if (handler === 'replace') {
+      if (
+        to.startsWith('/') &&
+        !to.startsWith('//') &&
+        !to.startsWith(REACT_BASE_PATH)
+      ) {
+        to = `${REACT_BASE_PATH}${to}`;
+      }
       window.location.replace(to);
     } else if (typeof handler === 'function') {
       handler(to === '/test' ? '/' : to, config.options);

From 92eec140d76cbb2e82da2b3877007a8498b106ed Mon Sep 17 00:00:00 2001
From: shuai <lishuailing@sifou.com>
Date: Tue, 26 Mar 2024 11:28:56 +0800
Subject: [PATCH 114/114] fix: navigate function add path conditions

---
 ui/src/utils/floppyNavigation.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/utils/floppyNavigation.ts b/ui/src/utils/floppyNavigation.ts
index 30be62ca..69ba4e88 100644
--- a/ui/src/utils/floppyNavigation.ts
+++ b/ui/src/utils/floppyNavigation.ts
@@ -151,7 +151,14 @@ const navigate = (to: string | number, config: NavigateConfig = {}) => {
       }
       window.location.replace(to);
     } else if (typeof handler === 'function') {
-      handler(to === '/test' ? '/' : to, config.options);
+      if (to === '/test') {
+        to = '/';
+      }
+
+      if (to !== '/test' && to.startsWith('/test')) {
+        to = to.replace('/test', '');
+      }
+      handler(to, config.options);
     }
   }
   if (typeof to === 'number' && typeof handler === 'function') {