A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(object): return 404 page when user, tag and question not found.
LinkinStars7ec0272a726b
diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.goindex 894b4930..5922bff4 100644--- a/internal/controller/template_controller.go+++ b/internal/controller/template_controller.go@@ -404,22 +404,17 @@ func (tc *TemplateController) UserInfo(ctx *gin.Context) {req := &schema.GetOtherUserInfoByUsernameReq{}req.Username = usernameuserinfo, err := tc.templateRenderController.UserInfo(ctx, req)-if err != nil {tc.Page404(ctx)return}- if !userinfo.Has {- tc.Page404(ctx)- return- }siteInfo := tc.SiteInfo(ctx)siteInfo.Canonical = fmt.Sprintf("%s/users/%s", siteInfo.General.SiteUrl, username)siteInfo.Title = fmt.Sprintf("%s - %s", username, siteInfo.General.Name)tc.html(ctx, http.StatusOK, "homepage.html", siteInfo, gin.H{"userinfo": userinfo,- "bio": template.HTML(userinfo.Info.BioHTML),+ "bio": template.HTML(userinfo.BioHTML),})}diff --git a/internal/controller/template_render/userinfo.go b/internal/controller/template_render/userinfo.goindex e10e2dfa..2186fac5 100644--- a/internal/controller/template_render/userinfo.go+++ b/internal/controller/template_render/userinfo.go@@ -5,6 +5,6 @@ import ("golang.org/x/net/context")-func (q *TemplateRenderController) UserInfo(ctx context.Context, req *schema.GetOtherUserInfoByUsernameReq) (resp *schema.GetOtherUserInfoResp, err error) {+func (q *TemplateRenderController) UserInfo(ctx context.Context, req *schema.GetOtherUserInfoByUsernameReq) (resp *schema.GetOtherUserInfoByUsernameResp, err error) {return q.userService.GetOtherUserInfoByUsername(ctx, req.Username)}diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.goindex 308568c8..40b160d1 100644--- a/internal/schema/user_schema.go+++ b/internal/schema/user_schema.go@@ -386,7 +386,6 @@ type GetOtherUserInfoByUsernameReq struct {type GetOtherUserInfoResp struct {Info *GetOtherUserInfoByUsernameResp `json:"info"`- Has bool `json:"has"`}type UserChangeEmailSendCodeReq struct {diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.goindex 23424d2c..b37e9099 100644--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@ -148,7 +148,7 @@ func (qs *QuestionCommon) Info(ctx context.Context, questionID string, loginUserreturn showinfo, err}if !has {- return showinfo, errors.BadRequest(reason.QuestionNotFound)+ return showinfo, errors.NotFound(reason.QuestionNotFound)}showinfo = qs.ShowFormat(ctx, dbinfo)diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.goindex 1fb118ec..db28ef09 100644--- a/internal/service/tag/tag_service.go+++ b/internal/service/tag/tag_service.go@@ -102,7 +102,7 @@ func (ts *TagService) GetTagInfo(ctx context.Context, req *schema.GetTagInfoReq)return nil, err}if !exist {- return nil, errors.BadRequest(reason.TagNotFound)+ return nil, errors.NotFound(reason.TagNotFound)}resp = &schema.GetTagResp{}@@ -113,7 +113,7 @@ func (ts *TagService) GetTagInfo(ctx context.Context, req *schema.GetTagInfoReq)return nil, err}if !exist {- return nil, errors.BadRequest(reason.TagNotFound)+ return nil, errors.NotFound(reason.TagNotFound)}resp.MainTagSlugName = tagInfo.SlugName}diff --git a/internal/service/user_service.go b/internal/service/user_service.goindex e7bd4374..6ca26620 100644--- a/internal/service/user_service.go+++ b/internal/service/user_service.go@@ -86,19 +86,17 @@ func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID st}func (us *UserService) GetOtherUserInfoByUsername(ctx context.Context, username string) (- resp *schema.GetOtherUserInfoResp, err error,+ resp *schema.GetOtherUserInfoByUsernameResp, err error,) {userInfo, exist, err := us.userRepo.GetByUsername(ctx, username)if err != nil {return nil, err}- resp = &schema.GetOtherUserInfoResp{}if !exist {- return resp, nil+ return nil, errors.NotFound(reason.UserNotFound)}- resp.Has = true- resp.Info = &schema.GetOtherUserInfoByUsernameResp{}- resp.Info.GetFromUserEntity(userInfo)+ resp = &schema.GetOtherUserInfoByUsernameResp{}+ resp.GetFromUserEntity(userInfo)return resp, nil}diff --git a/ui/template/homepage.html b/ui/template/homepage.htmlindex 2c82f20b..0f9c2a92 100644--- a/ui/template/homepage.html+++ b/ui/template/homepage.html@@ -3,28 +3,28 @@<div class="justify-content-center row"><div class="col-xxl-7 col-lg-8 col-sm-12"><div class="d-flex flex-column flex-md-row mb-4">- <a href="/users/{{.userinfo.Info.Username}}"><img- src="{{.userinfo.Info.Avatar}}"+ <a href="/users/{{.userinfo.Username}}"><img+ src="{{.userinfo.Avatar}}"width="160px" height="160px" class="rounded" alt="" /></a><div class="ms-0 ms-md-4 mt-4 mt-md-0"><div class="d-flex align-items-center mb-2">- <a class="link-dark h3 mb-0" href="/users/{{.userinfo.Info.Username}}">{{.userinfo.Info.DisplayName}}</a>+ <a class="link-dark h3 mb-0" href="/users/{{.userinfo.Username}}">{{.userinfo.DisplayName}}</a></div>- <div class="text-secondary mb-4">@{{.userinfo.Info.Username}}</div>+ <div class="text-secondary mb-4">@{{.userinfo.Username}}</div><div class="d-flex flex-wrap mb-3"><div class="me-3">- <strong class="fs-5">{{.userinfo.Info.Rank}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_reputation"}}</span>+ <strong class="fs-5">{{.userinfo.Rank}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_reputation"}}</span></div><div class="me-3">- <strong class="fs-5">{{.userinfo.Info.AnswerCount}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_answers"}}</span>+ <strong class="fs-5">{{.userinfo.AnswerCount}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_answers"}}</span></div><div>- <strong class="fs-5">{{.userinfo.Info.QuestionCount}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_questions"}}</span>+ <strong class="fs-5">{{.userinfo.QuestionCount}}</strong><span class="text-secondary"> {{translator $.language "ui.personal.x_questions"}}</span></div></div>- {{if .userinfo.Info.Website }}- <div class="d-flex align-items-center"><i class="br bi-house-door-fill me-2"></i><a class="link-secondary" href="{{.userinfo.Info.Website}}">{{.userinfo.Info.Website}}</a></div>+ {{if .userinfo.Website }}+ <div class="d-flex align-items-center"><i class="br bi-house-door-fill me-2"></i><a class="link-secondary" href="{{.userinfo.Website}}">{{.userinfo.Website}}</a></div>{{else}}{{end}}<div class="d-flex text-secondary"></div>