diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go index 978ab23b3..d8e6c744b 100644 --- a/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@ -277,7 +277,7 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database, avatarMiddleware := middleware.NewAvatarMiddleware(serviceConf, uploaderService) shortIDMiddleware := middleware.NewShortIDMiddleware(siteInfoCommonService) templateRenderController := templaterender.NewTemplateRenderController(questionService, userService, tagService, answerService, commentService, siteInfoCommonService, questionRepo) - templateController := controller.NewTemplateController(templateRenderController, siteInfoCommonService, eventQueueService, userService) + templateController := controller.NewTemplateController(templateRenderController, siteInfoCommonService, eventQueueService, userService, questionService) templateRouter := router.NewTemplateRouter(templateController, templateRenderController, siteInfoController, authUserMiddleware) connectorController := controller.NewConnectorController(siteInfoCommonService, emailService, userExternalLoginService) userCenterLoginService := user_external_login2.NewUserCenterLoginService(userRepo, userCommon, userExternalLoginRepo, userActiveActivityRepo, siteInfoCommonService) diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go index 56a38f006..5a63e6de1 100644 --- a/internal/controller/template_controller.go +++ b/internal/controller/template_controller.go @@ -22,6 +22,7 @@ package controller import ( "encoding/json" "fmt" + "github.com/apache/incubator-answer/internal/base/middleware" "github.com/apache/incubator-answer/internal/service/content" "github.com/apache/incubator-answer/internal/service/event_queue" "github.com/apache/incubator-answer/plugin" @@ -58,6 +59,7 @@ type TemplateController struct { siteInfoService siteinfo_common.SiteInfoCommonService eventQueueService event_queue.EventQueueService userService *content.UserService + questionService *content.QuestionService } // NewTemplateController new controller @@ -66,6 +68,7 @@ func NewTemplateController( siteInfoService siteinfo_common.SiteInfoCommonService, eventQueueService event_queue.EventQueueService, userService *content.UserService, + questionService *content.QuestionService, ) *TemplateController { script, css := GetStyle() return &TemplateController{ @@ -75,6 +78,7 @@ func NewTemplateController( siteInfoService: siteInfoService, eventQueueService: eventQueueService, userService: userService, + questionService: questionService, } } func GetStyle() (script []string, css string) { @@ -146,6 +150,14 @@ func (tc *TemplateController) Index(ctx *gin.Context) { return } + hotQuestionReq := &schema.QuestionPageReq{ + Page: 1, + PageSize: 6, + OrderCond: "hot", + InDays: 7, + } + hotQuestion, _, _ := tc.templateRenderController.Index(ctx, hotQuestionReq) + siteInfo := tc.SiteInfo(ctx) siteInfo.Canonical = siteInfo.General.SiteUrl @@ -156,10 +168,11 @@ func (tc *TemplateController) Index(ctx *gin.Context) { } siteInfo.Title = "" tc.html(ctx, http.StatusOK, "question.html", siteInfo, gin.H{ - "data": data, - "useTitle": UrlUseTitle, - "page": templaterender.Paginator(page, req.PageSize, count), - "path": "questions", + "data": data, + "useTitle": UrlUseTitle, + "page": templaterender.Paginator(page, req.PageSize, count), + "path": "questions", + "hotQuestion": hotQuestion, }) } @@ -177,6 +190,15 @@ func (tc *TemplateController) QuestionList(ctx *gin.Context) { tc.Page404(ctx) return } + + hotQuestionReq := &schema.QuestionPageReq{ + Page: 1, + PageSize: 6, + OrderCond: "hot", + InDays: 7, + } + hotQuestion, _, _ := tc.templateRenderController.Index(ctx, hotQuestionReq) + siteInfo := tc.SiteInfo(ctx) siteInfo.Canonical = fmt.Sprintf("%s/questions", siteInfo.General.SiteUrl) if page > 1 { @@ -190,13 +212,14 @@ func (tc *TemplateController) QuestionList(ctx *gin.Context) { } siteInfo.Title = fmt.Sprintf("%s - %s", translator.Tr(handler.GetLang(ctx), constant.QuestionsTitleTrKey), siteInfo.General.Name) tc.html(ctx, http.StatusOK, "question.html", siteInfo, gin.H{ - "data": data, - "useTitle": UrlUseTitle, - "page": templaterender.Paginator(page, req.PageSize, count), + "data": data, + "useTitle": UrlUseTitle, + "page": templaterender.Paginator(page, req.PageSize, count), + "hotQuestion": hotQuestion, }) } -func (tc *TemplateController) QuestionInfoeRdirect(ctx *gin.Context, siteInfo *schema.TemplateSiteInfoResp, correctTitle bool) (jump bool, url string) { +func (tc *TemplateController) QuestionInfoRedirect(ctx *gin.Context, siteInfo *schema.TemplateSiteInfoResp, correctTitle bool) (jump bool, url string) { questionID := ctx.Param("id") title := ctx.Param("title") answerID := uid.DeShortID(title) @@ -316,7 +339,7 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) { } siteInfo := tc.SiteInfo(ctx) - jump, jumpurl := tc.QuestionInfoeRdirect(ctx, siteInfo, correctTitle) + jump, jumpurl := tc.QuestionInfoRedirect(ctx, siteInfo, correctTitle) if jump { ctx.Redirect(http.StatusFound, jumpurl) return @@ -337,7 +360,6 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) { } // comments - objectIDs := []string{uid.DeShortID(id)} for _, answer := range answers { answerID := uid.DeShortID(answer.ID) @@ -348,6 +370,17 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) { tc.Page404(ctx) return } + + UrlUseTitle := false + if siteInfo.SiteSeo.Permalink == constant.PermalinkQuestionIDAndTitle || + siteInfo.SiteSeo.Permalink == constant.PermalinkQuestionIDAndTitleByShortID { + UrlUseTitle = true + } + + //related question + userID := middleware.GetLoginUserIDFromContext(ctx) + relatedQuestion, _, _ := tc.questionService.SimilarQuestion(ctx, id, userID) + siteInfo.Canonical = fmt.Sprintf("%s/questions/%s/%s", siteInfo.General.SiteUrl, id, encodeTitle) if siteInfo.SiteSeo.Permalink == constant.PermalinkQuestionID || siteInfo.SiteSeo.Permalink == constant.PermalinkQuestionIDByShortID { siteInfo.Canonical = fmt.Sprintf("%s/questions/%s", siteInfo.General.SiteUrl, id) @@ -389,7 +422,6 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) { item.Author.URL = fmt.Sprintf("%s/users/%s", siteInfo.General.SiteUrl, answer.UserInfo.Username) answerList = append(answerList, item) } - } jsonLD.MainEntity.SuggestedAnswer = answerList jsonLDStr, err := json.Marshal(jsonLD) @@ -405,12 +437,14 @@ func (tc *TemplateController) QuestionInfo(ctx *gin.Context) { siteInfo.Keywords = strings.Replace(strings.Trim(fmt.Sprint(tags), "[]"), " ", ",", -1) siteInfo.Title = fmt.Sprintf("%s - %s", detail.Title, siteInfo.General.Name) tc.html(ctx, http.StatusOK, "question-detail.html", siteInfo, gin.H{ - "id": id, - "answerid": answerid, - "detail": detail, - "answers": answers, - "comments": comments, - "noindex": detail.Show == entity.QuestionHide, + "id": id, + "answerid": answerid, + "detail": detail, + "answers": answers, + "comments": comments, + "noindex": detail.Show == entity.QuestionHide, + "useTitle": UrlUseTitle, + "relatedQuestion": relatedQuestion, }) } diff --git a/ui/template/hot-question.html b/ui/template/hot-question.html new file mode 100644 index 000000000..239819267 --- /dev/null +++ b/ui/template/hot-question.html @@ -0,0 +1,42 @@ + +{{define "hot-question"}} +
+
{{translator $.language "ui.question.hot_questions"}}
+
+ {{ range .hotQuestion }} + {{if $.useTitle }} + + {{else}} + + {{end}} +
{{ .Title }}
+ {{if ne 0 .AnswerCount}} +
+ + {{translator $.language "ui.question.x_answers" "count" .AnswerCount}} +
+ {{end}} + + {{ end }} +
+
+{{end}} diff --git a/ui/template/question-detail.html b/ui/template/question-detail.html index 2134a04f5..d0e6933d9 100644 --- a/ui/template/question-detail.html +++ b/ui/template/question-detail.html @@ -24,7 +24,11 @@

+ {{if $.useTitle }} + {{.detail.Title}} + {{else}} {{.detail.Title}} + {{end}}

@@ -116,7 +120,7 @@

{{.detail.AnswerCount}} Answers
{{range .answers}} -
+
{{formatLinkNofollow .HTML}}
@@ -192,8 +196,8 @@
{{.detail.AnswerCount}} Answers
{{end}}
-
- +
+ {{template "related-question" .}}
diff --git a/ui/template/question.html b/ui/template/question.html index 40c645edc..058645e5b 100644 --- a/ui/template/question.html +++ b/ui/template/question.html @@ -94,7 +94,9 @@
-
+
+ {{template "hot-question" .}} +
{{template "footer" .}} diff --git a/ui/template/related-question.html b/ui/template/related-question.html new file mode 100644 index 000000000..c93ccc8da --- /dev/null +++ b/ui/template/related-question.html @@ -0,0 +1,42 @@ + +{{define "related-question"}} +
+
{{translator $.language "ui.related_question.title"}}
+
+ {{ range .relatedQuestion }} + {{if $.useTitle }} + + {{else}} + + {{end}} +
{{ .Title }}
+ {{if ne 0 .AnswerCount}} +
+ + {{ .AnswerCount }} {{translator $.language "ui.related_question.answers"}} +
+ {{end}} + + {{ end }} +
+
+{{end}}