Merge remote-tracking branch 'origin/feat/1.5.0/user' into test

LinkinStars · LinkinStars · commit 5b9c00c4a7bc · 2025-04-17T11:37:23.000+08:00
diff --git a/docs/swagger.json b/docs/swagger.json
@@ -5006,9 +5006,6 @@
         "/answer/api/v1/report": {
             "post": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
@@ -5048,9 +5045,6 @@
         "/answer/api/v1/report/review": {
             "put": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
@@ -5153,9 +5147,6 @@
         "/answer/api/v1/review/pending/post": {
             "put": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
@@ -6268,9 +6259,6 @@
         "/answer/api/v1/user/email/verification/send": {
             "post": {
                 "security": [
-                    {
-                        "ApiKeyAuth": []
-                    },
                     {
                         "ApiKeyAuth": []
                     }
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
@@ -565,7 +565,7 @@ backend:
         name:
           other: First Link
         desc:
-          other: First dirst added a link to another post.
+          other: First added a link to another post.
       first_reaction:
         name:
           other: First Reaction
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
@@ -564,7 +564,7 @@ backend:
         name:
           other: 第一个链接
         desc:
-          other: 第一个脏添加了一个链接到另一个帖子。
+          other: 第一次添加了一个链接到另一个帖子。
       first_reaction:
         name:
           other: 第一个响应
diff --git a/internal/base/constant/constant.go b/internal/base/constant/constant.go
@@ -29,3 +29,43 @@ var (
 	Revision  = ""
 	GoVersion = ""
 )
+
+var Timezones = []string{
+	// Americas
+	"America/New_York",
+	"America/Chicago",
+	"America/Los_Angeles",
+	"America/Toronto",
+	"America/Vancouver",
+	"America/Mexico_City",
+	"America/Sao_Paulo",
+	"America/Buenos_Aires",
+
+	// Europe
+	"Europe/London",
+	"Europe/Paris",
+	"Europe/Berlin",
+	"Europe/Madrid",
+	"Europe/Rome",
+	"Europe/Moscow",
+
+	// Asia
+	"Asia/Shanghai",
+	"Asia/Tokyo",
+	"Asia/Singapore",
+	"Asia/Dubai",
+	"Asia/Hong_Kong",
+	"Asia/Seoul",
+	"Asia/Bangkok",
+	"Asia/Kolkata",
+
+	// Pacific
+	"Australia/Sydney",
+	"Australia/Melbourne",
+	"Pacific/Auckland",
+
+	// Africa
+	"Africa/Cairo",
+	"Africa/Johannesburg",
+	"Africa/Lagos",
+}
diff --git a/internal/cli/build.go b/internal/cli/build.go
@@ -105,7 +105,7 @@ func newAnswerBuilder(buildDir, outputPath string, plugins []string, originalAns
 	if len(outputPath) == 0 {
 		outputPath = filepath.Join(parentDir, "new_answer")
 	}
-	material.outputPath = outputPath
+	material.outputPath, _ = filepath.Abs(outputPath)
 	material.plugins = formatPlugins(plugins)
 	material.answerModuleReplacement = os.Getenv("ANSWER_MODULE")
 	return &answerBuilder{
diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go
@@ -59,7 +59,6 @@ func NewReportController(
 // AddReport add report
 // @Summary add report
 // @Description add report <br> source (question, answer, comment, user)
-// @Security ApiKeyAuth
 // @Tags Report
 // @Accept json
 // @Produce json
@@ -130,7 +129,6 @@ func (rc *ReportController) GetUnreviewedReportPostPage(ctx *gin.Context) {
 // ReviewReport review report
 // @Summary review report
 // @Description review report
-// @Security ApiKeyAuth
 // @Tags Report
 // @Accept json
 // @Produce json
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
@@ -86,7 +86,6 @@ func (rc *ReviewController) GetUnreviewedPostPage(ctx *gin.Context) {
 // UpdateReview update review
 // @Summary update review
 // @Description update review
-// @Security ApiKeyAuth
 // @Tags Review
 // @Accept json
 // @Produce json
diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go
@@ -274,6 +274,10 @@ func (tc *TagController) GetTagWithPage(ctx *gin.Context) {
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	resp, err := tc.tagService.GetTagWithPage(ctx, req)
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
 	if pager.ValPageOutOfRange(resp.Count, req.Page, req.PageSize) {
 		handler.HandleResponse(ctx, errors.NotFound(reason.RequestFormatError), nil)
 		return
diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go
@@ -162,6 +162,11 @@ func (uc *UserController) UserEmailLogin(ctx *gin.Context) {
 	if !isAdmin {
 		uc.actionService.ActionRecordDel(ctx, entity.CaptchaActionPassword, ctx.ClientIP())
 	}
+	if resp.Status == constant.UserSuspended {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.UserSuspended),
+			&schema.ForbiddenResp{Type: schema.ForbiddenReasonTypeUserSuspended})
+		return
+	}
 	uc.setVisitCookies(ctx, resp.VisitToken, true)
 	handler.HandleResponse(ctx, nil, resp)
 }
@@ -335,7 +340,6 @@ func (uc *UserController) UserVerifyEmail(ctx *gin.Context) {
 // UserVerifyEmailSend godoc
 // @Summary UserVerifyEmailSend
 // @Description UserVerifyEmailSend
-// @Security ApiKeyAuth
 // @Tags User
 // @Accept json
 // @Produce json
diff --git a/internal/install/install_from_env.go b/internal/install/install_from_env.go
@@ -41,13 +41,14 @@ type Env struct {
 	DbFile      string `json:"db_file"`
 	Language    string `json:"lang"`
 
-	SiteName      string `json:"site_name"`
-	SiteURL       string `json:"site_url"`
-	ContactEmail  string `json:"contact_email"`
-	AdminName     string `json:"name"`
-	AdminPassword string `json:"password"`
-	AdminEmail    string `json:"email"`
-	LoginRequired bool   `json:"login_required"`
+	SiteName               string `json:"site_name"`
+	SiteURL                string `json:"site_url"`
+	ContactEmail           string `json:"contact_email"`
+	AdminName              string `json:"name"`
+	AdminPassword          string `json:"password"`
+	AdminEmail             string `json:"email"`
+	LoginRequired          bool   `json:"login_required"`
+	ExternalContentDisplay string `json:"external_content_display"`
 }
 
 func TryToInstallByEnv() (installByEnv bool, err error) {
@@ -61,20 +62,21 @@ func TryToInstallByEnv() (installByEnv bool, err error) {
 
 func loadEnv() (env *Env) {
 	return &Env{
-		AutoInstall:   os.Getenv("AUTO_INSTALL"),
-		DbType:        os.Getenv("DB_TYPE"),
-		DbUsername:    os.Getenv("DB_USERNAME"),
-		DbPassword:    os.Getenv("DB_PASSWORD"),
-		DbHost:        os.Getenv("DB_HOST"),
-		DbName:        os.Getenv("DB_NAME"),
-		DbFile:        os.Getenv("DB_FILE"),
-		Language:      os.Getenv("LANGUAGE"),
-		SiteName:      os.Getenv("SITE_NAME"),
-		SiteURL:       os.Getenv("SITE_URL"),
-		ContactEmail:  os.Getenv("CONTACT_EMAIL"),
-		AdminName:     os.Getenv("ADMIN_NAME"),
-		AdminPassword: os.Getenv("ADMIN_PASSWORD"),
-		AdminEmail:    os.Getenv("ADMIN_EMAIL"),
+		AutoInstall:            os.Getenv("AUTO_INSTALL"),
+		DbType:                 os.Getenv("DB_TYPE"),
+		DbUsername:             os.Getenv("DB_USERNAME"),
+		DbPassword:             os.Getenv("DB_PASSWORD"),
+		DbHost:                 os.Getenv("DB_HOST"),
+		DbName:                 os.Getenv("DB_NAME"),
+		DbFile:                 os.Getenv("DB_FILE"),
+		Language:               os.Getenv("LANGUAGE"),
+		SiteName:               os.Getenv("SITE_NAME"),
+		SiteURL:                os.Getenv("SITE_URL"),
+		ContactEmail:           os.Getenv("CONTACT_EMAIL"),
+		AdminName:              os.Getenv("ADMIN_NAME"),
+		AdminPassword:          os.Getenv("ADMIN_PASSWORD"),
+		AdminEmail:             os.Getenv("ADMIN_EMAIL"),
+		ExternalContentDisplay: os.Getenv("EXTERNAL_CONTENT_DISPLAY"),
 	}
 }
 
@@ -118,14 +120,15 @@ func initConfigAndDb(env *Env) (err error) {
 
 func initBaseInfo(env *Env) (err error) {
 	req := &InitBaseInfoReq{
-		Language:      env.Language,
-		SiteName:      env.SiteName,
-		SiteURL:       env.SiteURL,
-		ContactEmail:  env.ContactEmail,
-		AdminName:     env.AdminName,
-		AdminPassword: env.AdminPassword,
-		AdminEmail:    env.AdminEmail,
-		LoginRequired: env.LoginRequired,
+		Language:               env.Language,
+		SiteName:               env.SiteName,
+		SiteURL:                env.SiteURL,
+		ContactEmail:           env.ContactEmail,
+		AdminName:              env.AdminName,
+		AdminPassword:          env.AdminPassword,
+		AdminEmail:             env.AdminEmail,
+		LoginRequired:          env.LoginRequired,
+		ExternalContentDisplay: env.ExternalContentDisplay,
 	}
 	return requestAPI(req, "POST", "/installation/base-info", InitBaseInfo)
 }
diff --git a/internal/migrations/init.go b/internal/migrations/init.go
@@ -160,9 +160,28 @@ func (m *Mentor) initAdminUserRoleRel() {
 }
 
 func (m *Mentor) initSiteInfoInterface() {
+	now := time.Now()
+	zoneName, offset := now.In(time.Local).Zone()
+
+	localTimezone := "UTC"
+	for _, tz := range constant.Timezones {
+		loc, err := time.LoadLocation(tz)
+		if err != nil {
+			continue
+		}
+
+		tzNow := now.In(loc)
+		tzName, tzOffset := tzNow.Zone()
+
+		if tzName == zoneName && tzOffset == offset {
+			localTimezone = tz
+			break
+		}
+	}
+
 	interfaceData := map[string]string{
 		"language":  m.userData.Language,
-		"time_zone": "UTC",
+		"time_zone": localTimezone,
 	}
 	interfaceDataBytes, _ := json.Marshal(interfaceData)
 	_, m.err = m.engine.Context(m.ctx).Insert(&entity.SiteInfo{
@@ -452,5 +471,4 @@ func (m *Mentor) initDefaultBadges() {
 			return
 		}
 	}
-	return
 }
diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
@@ -404,6 +404,7 @@ func (qr *questionRepo) GetQuestionPage(ctx context.Context, page, pageSize int,
 	if showPending {
 		status = append(status, entity.QuestionStatusPending)
 	}
+	session.Select("question.*")
 	session.In("question.status", status)
 	if len(tagIDs) > 0 {
 		session.Join("LEFT", "tag_rel", "question.id = tag_rel.object_id")
@@ -442,6 +443,7 @@ func (qr *questionRepo) GetQuestionPage(ctx context.Context, page, pageSize int,
 		session.OrderBy("question.pin DESC, question.linked_count DESC, question.updated_at DESC")
 	}
 
+	session.GroupBy("question.id")
 	total, err = pager.Help(page, pageSize, &questionList, &entity.Question{}, session)
 	if err != nil {
 		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
@@ -26,6 +26,7 @@ import (
 	"time"
 
 	"github.com/apache/answer/internal/service/event_queue"
+	"github.com/apache/answer/plugin"
 
 	"github.com/apache/answer/internal/base/constant"
 	"github.com/apache/answer/internal/base/handler"
@@ -1313,7 +1314,35 @@ func (qs *QuestionService) GetQuestionsByTitle(ctx context.Context, title string
 	if len(title) == 0 {
 		return resp, nil
 	}
-	questions, err := qs.questionRepo.GetQuestionsByTitle(ctx, title, 10)
+	// check search plugin
+	var finder plugin.Search
+	_ = plugin.CallSearch(func(search plugin.Search) error {
+		finder = search
+		return nil
+	})
+
+	var questions []*entity.Question
+	if finder != nil {
+		// call search plugin if available
+		words := []string{title}
+		res, _, err := finder.SearchQuestions(ctx, &plugin.SearchBasicCond{
+			Words:    words,
+			Page:     1,
+			PageSize: 10,
+		})
+		if err != nil {
+			return resp, err
+		}
+		// get question ids from res
+		questionIDs := make([]string, 0)
+		for _, question := range res {
+			questionIDs = append(questionIDs, question.ID)
+		}
+		questions, err = qs.questionRepo.FindByID(ctx, questionIDs)
+	} else {
+		questions, err = qs.questionRepo.GetQuestionsByTitle(ctx, title, 10)
+	}
+
 	if err != nil {
 		return resp, err
 	}
diff --git a/ui/src/pages/Questions/Detail/index.scss b/ui/src/pages/Questions/Detail/index.scss
@@ -24,6 +24,9 @@
       border-color: transparent;
 
       &:hover {
+        [data-bs-theme='dark'] & {
+          background-color: var(--bs-gray-800);
+        }
         background-color: var(--bs-gray-100);
       }
 
diff --git a/ui/src/router/routes.ts b/ui/src/router/routes.ts
@@ -54,7 +54,9 @@ const routes: RouteNode[] = [
       if (!gr.ok) {
         return gr;
       }
-      return guard.notForbidden();
+      return {
+        ok: true,
+      };
     },
     children: [
       // question and answer
@@ -309,7 +311,7 @@ const routes: RouteNode[] = [
         path: '/users/account-suspended',
         page: 'pages/Users/Suspended',
         guard: () => {
-          return guard.forbidden();
+          return guard.notLogged();
         },
       },
       {
diff --git a/ui/src/utils/guard.ts b/ui/src/utils/guard.ts
diff --git a/ui/src/utils/request.ts b/ui/src/utils/request.ts

Original file line number	Diff line number	Diff line change
`@@ -5006,9 +5006,6 @@`
`5006`	`5006`	`"/answer/api/v1/report": {`
`5007`	`5007`	`"post": {`
`5008`	`5008`	`"security": [`
`5009`		`- {`
`5010`		`- "ApiKeyAuth": []`
`5011`		`- },`
`5012`	`5009`	`{`
`5013`	`5010`	`"ApiKeyAuth": []`
`5014`	`5011`	`}`
`@@ -5048,9 +5045,6 @@`
`5048`	`5045`	`"/answer/api/v1/report/review": {`
`5049`	`5046`	`"put": {`
`5050`	`5047`	`"security": [`
`5051`		`- {`
`5052`		`- "ApiKeyAuth": []`
`5053`		`- },`
`5054`	`5048`	`{`
`5055`	`5049`	`"ApiKeyAuth": []`
`5056`	`5050`	`}`
`@@ -5153,9 +5147,6 @@`
`5153`	`5147`	`"/answer/api/v1/review/pending/post": {`
`5154`	`5148`	`"put": {`
`5155`	`5149`	`"security": [`
`5156`		`- {`
`5157`		`- "ApiKeyAuth": []`
`5158`		`- },`
`5159`	`5150`	`{`
`5160`	`5151`	`"ApiKeyAuth": []`
`5161`	`5152`	`}`
`@@ -6268,9 +6259,6 @@`
`6268`	`6259`	`"/answer/api/v1/user/email/verification/send": {`
`6269`	`6260`	`"post": {`
`6270`	`6261`	`"security": [`
`6271`		`- {`
`6272`		`- "ApiKeyAuth": []`
`6273`		`- },`
`6274`	`6262`	`{`
`6275`	`6263`	`"ApiKeyAuth": []`
`6276`	`6264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func newAnswerBuilder(buildDir, outputPath string, plugins []string, originalAns`
`105`	`105`	`if len(outputPath) == 0 {`
`106`	`106`	`outputPath = filepath.Join(parentDir, "new_answer")`
`107`	`107`	`}`
`108`		`- material.outputPath = outputPath`
	`108`	`+ material.outputPath, _ = filepath.Abs(outputPath)`
`109`	`109`	`material.plugins = formatPlugins(plugins)`
`110`	`110`	`material.answerModuleReplacement = os.Getenv("ANSWER_MODULE")`
`111`	`111`	`return &answerBuilder{`