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(menu): update admin menu settings to include questions, tags, and advanced options
kumfof05f1eb80d10
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex 8435cf31..22a70f29 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -1,8 +1,28 @@+//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 !wireinjectpackage answercmddiff --git a/go.mod b/go.modindex 52d64c73..d2430295 100644--- a/go.mod+++ b/go.mod@@ -37,6 +37,7 @@ require (github.com/grokify/html-strip-tags-go v0.1.0github.com/jinzhu/copier v0.4.0github.com/jinzhu/now v1.1.5+ github.com/joho/godotenv v1.5.1github.com/lib/pq v1.10.9github.com/microcosm-cc/bluemonday v1.0.27github.com/mozillazg/go-pinyin v0.20.0@@ -117,7 +118,6 @@ require (github.com/hashicorp/golang-lru/v2 v2.0.7 // indirectgithub.com/hashicorp/hcl v1.0.0 // indirectgithub.com/inconshreveable/mousetrap v1.1.0 // indirect- github.com/joho/godotenv v1.5.1 // indirectgithub.com/josharian/intern v1.0.0 // indirectgithub.com/json-iterator/go v1.1.12 // indirectgithub.com/klauspost/cpuid/v2 v2.2.8 // indirectdiff --git a/internal/base/constant/site_type.go b/internal/base/constant/site_type.goindex 65b487c5..6106b190 100644--- a/internal/base/constant/site_type.go+++ b/internal/base/constant/site_type.go@@ -31,4 +31,7 @@ const (SiteTypeTheme = "theme"SiteTypePrivileges = "privileges"SiteTypeUsers = "users"+ SiteTypeAdvanced = "advanced"+ SiteTypeQuestions = "questions"+ SiteTypeTags = "tags")diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.goindex e76b02cc..99c89b77 100644--- a/internal/controller/answer_controller.go+++ b/internal/controller/answer_controller.go@@ -242,7 +242,7 @@ func (ac *AnswerController) AddAnswer(ctx *gin.Context) {return}- write, err := ac.siteInfoCommonService.GetSiteWrite(ctx)+ write, err := ac.siteInfoCommonService.GetSiteQuestion(ctx)if err != nil {handler.HandleResponse(ctx, err, nil)returndiff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.goindex a336fb24..8035275a 100644--- a/internal/controller/siteinfo_controller.go+++ b/internal/controller/siteinfo_controller.go@@ -87,7 +87,15 @@ func (sc *SiteInfoController) GetSiteInfo(ctx *gin.Context) {if err != nil {log.Error(err)}- resp.Write, err = sc.siteInfoService.GetSiteWrite(ctx)+ resp.Questions, err = sc.siteInfoService.GetSiteQuestion(ctx)+ if err != nil {+ log.Error(err)+ }+ resp.Tags, err = sc.siteInfoService.GetSiteTag(ctx)+ if err != nil {+ log.Error(err)+ }+ resp.Advanced, err = sc.siteInfoService.GetSiteAdvanced(ctx)if err != nil {log.Error(err)}diff --git a/internal/controller_admin/siteinfo_controller.go b/internal/controller_admin/siteinfo_controller.goindex 8a92daba..bbab9794 100644--- a/internal/controller_admin/siteinfo_controller.go+++ b/internal/controller_admin/siteinfo_controller.go@@ -82,16 +82,42 @@ func (sc *SiteInfoController) GetSiteBranding(ctx *gin.Context) {handler.HandleResponse(ctx, err, resp)}-// GetSiteWrite get site interface-// @Summary get site interface-// @Description get site interface+// GetSiteTag get site tags setting+// @Summary get site tags setting+// @Description get site tags setting+// @Security ApiKeyAuth+// @Tags admin+// @Produce json+// @Success 200 {object} handler.RespBody{data=schema.SiteTagsResp}+// @Router /answer/admin/api/siteinfo/tag [get]+func (sc *SiteInfoController) GetSiteTag(ctx *gin.Context) {+ resp, err := sc.siteInfoService.GetSiteTag(ctx)+ handler.HandleResponse(ctx, err, resp)+}++// GetSiteQuestion get site questions setting+// @Summary get site questions setting+// @Description get site questions setting+// @Security ApiKeyAuth+// @Tags admin+// @Produce json+// @Success 200 {object} handler.RespBody{data=schema.SiteQuestionsResp}+// @Router /answer/admin/api/siteinfo/question [get]+func (sc *SiteInfoController) GetSiteQuestion(ctx *gin.Context) {+ resp, err := sc.siteInfoService.GetSiteQuestion(ctx)+ handler.HandleResponse(ctx, err, resp)+}++// GetSiteAdvanced get site advanced setting+// @Summary get site advanced setting+// @Description get site advanced setting// @Security ApiKeyAuth// @Tags admin// @Produce json-// @Success 200 {object} handler.RespBody{data=schema.SiteWriteResp}-// @Router /answer/admin/api/siteinfo/write [get]-func (sc *SiteInfoController) GetSiteWrite(ctx *gin.Context) {- resp, err := sc.siteInfoService.GetSiteWrite(ctx)+// @Success 200 {object} handler.RespBody{data=schema.SiteAdvancedResp}+// @Router /answer/admin/api/siteinfo/advanced [get]+func (sc *SiteInfoController) GetSiteAdvanced(ctx *gin.Context) {+ resp, err := sc.siteInfoService.GetSiteAdvanced(ctx)handler.HandleResponse(ctx, err, resp)}@@ -288,23 +314,61 @@ func (sc *SiteInfoController) UpdateBranding(ctx *gin.Context) {handler.HandleResponse(ctx, saveErr, nil)}-// UpdateSiteWrite update site write info-// @Summary update site write info-// @Description update site write info+// UpdateSiteQuestion update site question settings+// @Summary update site question settings+// @Description update site question settings+// @Security ApiKeyAuth+// @Tags admin+// @Produce json+// @Param data body schema.SiteQuestionsReq true "questions settings"+// @Success 200 {object} handler.RespBody{}+// @Router /answer/admin/api/siteinfo/question [put]+func (sc *SiteInfoController) UpdateSiteQuestion(ctx *gin.Context) {+ req := &schema.SiteQuestionsReq{}+ if handler.BindAndCheck(ctx, req) {+ return+ }++ resp, err := sc.siteInfoService.SaveSiteQuestions(ctx, req)+ handler.HandleResponse(ctx, err, resp)+}++// UpdateSiteTag update site tag settings+// @Summary update site tag settings+// @Description update site tag settings// @Security ApiKeyAuth// @Tags admin// @Produce json-// @Param data body schema.SiteWriteReq true "write info"+// @Param data body schema.SiteTagsReq true "tags settings"// @Success 200 {object} handler.RespBody{}-// @Router /answer/admin/api/siteinfo/write [put]-func (sc *SiteInfoController) UpdateSiteWrite(ctx *gin.Context) {- req := &schema.SiteWriteReq{}+// @Router /answer/admin/api/siteinfo/tag [put]+func (sc *SiteInfoController) UpdateSiteTag(ctx *gin.Context) {+ req := &schema.SiteTagsReq{}if handler.BindAndCheck(ctx, req) {return}req.UserID = middleware.GetLoginUserIDFromContext(ctx)- resp, err := sc.siteInfoService.SaveSiteWrite(ctx, req)+ resp, err := sc.siteInfoService.SaveSiteTags(ctx, req)+ handler.HandleResponse(ctx, err, resp)+}++// UpdateSiteAdvanced update site advanced info+// @Summary update site advanced info+// @Description update site advanced info+// @Security ApiKeyAuth+// @Tags admin+// @Produce json+// @Param data body schema.SiteAdvancedReq true "advanced settings"+// @Success 200 {object} handler.RespBody{}+// @Router /answer/admin/api/siteinfo/advanced [put]+func (sc *SiteInfoController) UpdateSiteAdvanced(ctx *gin.Context) {+ req := &schema.SiteAdvancedReq{}+ if handler.BindAndCheck(ctx, req) {+ return+ }++ resp, err := sc.siteInfoService.SaveSiteAdvanced(ctx, req)handler.HandleResponse(ctx, err, resp)}diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.goindex 9fda8c34..783332df 100644--- a/internal/migrations/migrations.go+++ b/internal/migrations/migrations.go@@ -105,6 +105,7 @@ var migrations = []Migration{NewMigration("v1.6.0", "move user config to interface", moveUserConfigToInterface, true),NewMigration("v1.7.0", "add optional tags", addOptionalTags, true),NewMigration("v1.7.2", "expand avatar column length", expandAvatarColumnLength, false),+ NewMigration("v1.8.0", "change admin menu", updateAdminMenuSettings, true),}func GetMigrations() []Migration {diff --git a/internal/migrations/v30.go b/internal/migrations/v30.gonew file mode 100644index 00000000..5d5d5223--- /dev/null+++ b/internal/migrations/v30.go@@ -0,0 +1,173 @@+/*+ * 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"+ "encoding/json"++ "github.com/apache/answer/internal/base/constant"+ "github.com/apache/answer/internal/base/reason"+ "github.com/apache/answer/internal/entity"+ "github.com/apache/answer/internal/schema"+ "github.com/segmentfault/pacman/errors"+ "xorm.io/builder"+ "xorm.io/xorm"+)++func updateAdminMenuSettings(ctx context.Context, x *xorm.Engine) (err error) {+ err = splitWriteMenu(ctx, x)+ if err != nil {+ return+ }+ return+}++// splitWriteMenu splits the site write settings into advanced, questions, and tags settings+func splitWriteMenu(ctx context.Context, x *xorm.Engine) error {+ var (+ siteInfo = &entity.SiteInfo{}+ siteInfoAdvanced = &entity.SiteInfo{}+ siteInfoQuestions = &entity.SiteInfo{}+ siteInfoTags = &entity.SiteInfo{}+ )+ exist, err := x.Context(ctx).Where(builder.Eq{"type": constant.SiteTypeWrite}).Get(siteInfo)+ if err != nil {+ err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return err+ }+ if !exist {+ return nil+ }+ siteWrite := &schema.SiteWriteResp{}+ if err := json.Unmarshal([]byte(siteInfo.Content), siteWrite); err != nil {+ return err+ }+ // site advanced settings+ siteAdvanced := &schema.SiteAdvancedResp{+ MaxImageSize: siteWrite.MaxImageSize,+ MaxAttachmentSize: siteWrite.MaxAttachmentSize,+ MaxImageMegapixel: siteWrite.MaxImageMegapixel,+ AuthorizedImageExtensions: siteWrite.AuthorizedImageExtensions,+ AuthorizedAttachmentExtensions: siteWrite.AuthorizedAttachmentExtensions,+ }+ // site questions settings+ siteQuestions := &schema.SiteQuestionsResp{+ MinimumContent: siteWrite.MinimumContent,+ RestrictAnswer: siteWrite.RestrictAnswer,+ }+ // site tags settings+ siteTags := &schema.SiteTagsResp{+ ReservedTags: siteWrite.ReservedTags,+ RecommendTags: siteWrite.RecommendTags,+ MinimumTags: siteWrite.MinimumTags,+ RequiredTag: siteWrite.RequiredTag,+ }++ // save site settings+ // save advanced settings+ existsAdvanced, err := x.Context(ctx).Where(builder.Eq{"type": constant.SiteTypeWrite}).Get(siteInfoAdvanced)+ if err != nil {+ return err+ }+ advancedContent, err := json.Marshal(siteAdvanced)+ if err != nil {+ return err+ }+ if existsAdvanced {+ _, err = x.Context(ctx).ID(siteInfoAdvanced.ID).Update(&entity.SiteInfo{+ Type: constant.SiteTypeAdvanced,+ Content: string(advancedContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ } else {+ _, err = x.Context(ctx).Insert(&entity.SiteInfo{+ Type: constant.SiteTypeAdvanced,+ Content: string(advancedContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ }++ // save questions settings+ existsQuestions, err := x.Context(ctx).Where(builder.Eq{"type": constant.SiteTypeQuestions}).Get(siteInfoQuestions)+ if err != nil {+ return err+ }+ questionsContent, err := json.Marshal(siteQuestions)+ if err != nil {+ return err+ }+ if existsQuestions {+ _, err = x.Context(ctx).ID(siteInfoQuestions.ID).Update(&entity.SiteInfo{+ Type: constant.SiteTypeQuestions,+ Content: string(questionsContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ } else {+ _, err = x.Context(ctx).Insert(&entity.SiteInfo{+ Type: constant.SiteTypeQuestions,+ Content: string(questionsContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ }++ // save tags settings+ existsTags, err := x.Context(ctx).Where(builder.Eq{"type": constant.SiteTypeTags}).Get(siteInfoTags)+ if err != nil {+ return err+ }+ tagsContent, err := json.Marshal(siteTags)+ if err != nil {+ return err+ }+ if existsTags {+ _, err = x.Context(ctx).ID(siteInfoTags.ID).Update(&entity.SiteInfo{+ Type: constant.SiteTypeTags,+ Content: string(tagsContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ } else {+ _, err = x.Context(ctx).Insert(&entity.SiteInfo{+ Type: constant.SiteTypeTags,+ Content: string(tagsContent),+ Status: 1,+ })+ if err != nil {+ return err+ }+ }++ return nil+}diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.goindex 1191492b..d717bc9d 100644--- a/internal/router/answer_api_router.go+++ b/internal/router/answer_api_router.go@@ -347,8 +347,14 @@ func (a *AnswerAPIRouter) RegisterAnswerAdminAPIRouter(r *gin.RouterGroup) {r.PUT("/siteinfo/interface", a.adminSiteInfoController.UpdateInterface)r.GET("/siteinfo/branding", a.adminSiteInfoController.GetSiteBranding)r.PUT("/siteinfo/branding", a.adminSiteInfoController.UpdateBranding)- r.GET("/siteinfo/write", a.adminSiteInfoController.GetSiteWrite)- r.PUT("/siteinfo/write", a.adminSiteInfoController.UpdateSiteWrite)++ r.GET("/siteinfo/question", a.adminSiteInfoController.GetSiteQuestion)+ r.PUT("/siteinfo/question", a.adminSiteInfoController.UpdateSiteQuestion)+ r.GET("/siteinfo/tag", a.adminSiteInfoController.GetSiteTag)+ r.PUT("/siteinfo/tag", a.adminSiteInfoController.UpdateSiteTag)+ r.GET("/siteinfo/advanced", a.adminSiteInfoController.GetSiteAdvanced)+ r.PUT("/siteinfo/advanced", a.adminSiteInfoController.UpdateSiteAdvanced)+r.GET("/siteinfo/legal", a.adminSiteInfoController.GetSiteLegal)r.PUT("/siteinfo/legal", a.adminSiteInfoController.UpdateSiteLegal)r.GET("/siteinfo/seo", a.adminSiteInfoController.GetSeo)diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.goindex 9eb919a0..deacf08f 100644--- a/internal/schema/siteinfo_schema.go+++ b/internal/schema/siteinfo_schema.go@@ -89,21 +89,47 @@ type SiteWriteReq struct {UserID string `json:"-"`}-func (s *SiteWriteResp) GetMaxImageSize() int64 {+type SiteWriteResp SiteWriteReq++// SiteQuestionsReq site questions settings request+type SiteQuestionsReq struct {+ MinimumContent int `validate:"omitempty,gte=0,lte=65535" json:"min_content"`+ RestrictAnswer bool `validate:"omitempty" json:"restrict_answer"`+}++// SiteAdvancedReq site advanced settings request+type SiteAdvancedReq struct {+ MaxImageSize int `validate:"omitempty,gt=0" json:"max_image_size"`+ MaxAttachmentSize int `validate:"omitempty,gt=0" json:"max_attachment_size"`+ MaxImageMegapixel int `validate:"omitempty,gt=0" json:"max_image_megapixel"`+ AuthorizedImageExtensions []string `validate:"omitempty" json:"authorized_image_extensions"`+ AuthorizedAttachmentExtensions []string `validate:"omitempty" json:"authorized_attachment_extensions"`+}++// SiteTagsReq site tags settings request+type SiteTagsReq struct {+ ReservedTags []*SiteWriteTag `validate:"omitempty,dive" json:"reserved_tags"`+ RecommendTags []*SiteWriteTag `validate:"omitempty,dive" json:"recommend_tags"`+ MinimumTags int `validate:"omitempty,gte=0,lte=5" json:"min_tags"`+ RequiredTag bool `validate:"omitempty" json:"required_tag"`+ UserID string `json:"-"`+}++func (s *SiteAdvancedResp) GetMaxImageSize() int64 {if s.MaxImageSize <= 0 {return constant.DefaultMaxImageSize}return int64(s.MaxImageSize) * 1024 * 1024}-func (s *SiteWriteResp) GetMaxAttachmentSize() int64 {+func (s *SiteAdvancedResp) GetMaxAttachmentSize() int64 {if s.MaxAttachmentSize <= 0 {return constant.DefaultMaxAttachmentSize}return int64(s.MaxAttachmentSize) * 1024 * 1024}-func (s *SiteWriteResp) GetMaxImageMegapixel() int {+func (s *SiteAdvancedResp) GetMaxImageMegapixel() int {if s.MaxImageMegapixel <= 0 {return constant.DefaultMaxImageMegapixel}@@ -238,8 +264,9 @@ type ThemeOption struct {Value string `json:"value"`}-// SiteWriteResp site write response-type SiteWriteResp SiteWriteReq+type SiteQuestionsResp SiteQuestionsReq+type SiteAdvancedResp SiteAdvancedReq+type SiteTagsResp SiteTagsReq// SiteLegalResp site write responsetype SiteLegalResp SiteLegalReq@@ -262,7 +289,9 @@ type SiteInfoResp struct {CustomCssHtml *SiteCustomCssHTMLResp `json:"custom_css_html"`SiteSeo *SiteSeoResp `json:"site_seo"`SiteUsers *SiteUsersResp `json:"site_users"`- Write *SiteWriteResp `json:"site_write"`+ Advanced *SiteAdvancedResp `json:"site_advanced"`+ Questions *SiteQuestionsResp `json:"site_questions"`+ Tags *SiteTagsResp `json:"site_tags"`Legal *SiteLegalSimpleResp `json:"site_legal"`Version string `json:"version"`Revision string `json:"revision"`diff --git a/internal/service/mock/siteinfo_repo_mock.go b/internal/service/mock/siteinfo_repo_mock.goindex 0a1b31e8..b809d8ae 100644--- a/internal/service/mock/siteinfo_repo_mock.go+++ b/internal/service/mock/siteinfo_repo_mock.go@@ -22,7 +22,6 @@ import (type MockSiteInfoRepo struct {ctrl *gomock.Controllerrecorder *MockSiteInfoRepoMockRecorder- isgomock struct{}}// MockSiteInfoRepoMockRecorder is the mock recorder for MockSiteInfoRepo.@@ -53,7 +52,7 @@ func (m *MockSiteInfoRepo) GetByType(ctx context.Context, siteType string) (*ent}// GetByType indicates an expected call of GetByType.-func (mr *MockSiteInfoRepoMockRecorder) GetByType(ctx, siteType any) *gomock.Call {+func (mr *MockSiteInfoRepoMockRecorder) GetByType(ctx, siteType interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByType", reflect.TypeOf((*MockSiteInfoRepo)(nil).GetByType), ctx, siteType)}@@ -68,7 +67,7 @@ func (m *MockSiteInfoRepo) IsBrandingFileUsed(ctx context.Context, filePath stri}// IsBrandingFileUsed indicates an expected call of IsBrandingFileUsed.-func (mr *MockSiteInfoRepoMockRecorder) IsBrandingFileUsed(ctx, filePath any) *gomock.Call {+func (mr *MockSiteInfoRepoMockRecorder) IsBrandingFileUsed(ctx, filePath interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsBrandingFileUsed", reflect.TypeOf((*MockSiteInfoRepo)(nil).IsBrandingFileUsed), ctx, filePath)}@@ -82,7 +81,7 @@ func (m *MockSiteInfoRepo) SaveByType(ctx context.Context, siteType string, data}// SaveByType indicates an expected call of SaveByType.-func (mr *MockSiteInfoRepoMockRecorder) SaveByType(ctx, siteType, data any) *gomock.Call {+func (mr *MockSiteInfoRepoMockRecorder) SaveByType(ctx, siteType, data interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveByType", reflect.TypeOf((*MockSiteInfoRepo)(nil).SaveByType), ctx, siteType, data)}@@ -91,7 +90,6 @@ func (mr *MockSiteInfoRepoMockRecorder) SaveByType(ctx, siteType, data any) *gomtype MockSiteInfoCommonService struct {ctrl *gomock.Controllerrecorder *MockSiteInfoCommonServiceMockRecorder- isgomock struct{}}// MockSiteInfoCommonServiceMockRecorder is the mock recorder for MockSiteInfoCommonService.@@ -120,7 +118,7 @@ func (m *MockSiteInfoCommonService) FormatAvatar(ctx context.Context, originalAv}// FormatAvatar indicates an expected call of FormatAvatar.-func (mr *MockSiteInfoCommonServiceMockRecorder) FormatAvatar(ctx, originalAvatarData, email, userStatus any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) FormatAvatar(ctx, originalAvatarData, email, userStatus interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FormatAvatar", reflect.TypeOf((*MockSiteInfoCommonService)(nil).FormatAvatar), ctx, originalAvatarData, email, userStatus)}@@ -134,11 +132,26 @@ func (m *MockSiteInfoCommonService) FormatListAvatar(ctx context.Context, userLi}// FormatListAvatar indicates an expected call of FormatListAvatar.-func (mr *MockSiteInfoCommonServiceMockRecorder) FormatListAvatar(ctx, userList any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) FormatListAvatar(ctx, userList interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FormatListAvatar", reflect.TypeOf((*MockSiteInfoCommonService)(nil).FormatListAvatar), ctx, userList)}+// GetSiteAdvanced mocks base method.+func (m *MockSiteInfoCommonService) GetSiteAdvanced(ctx context.Context) (*schema.SiteAdvancedResp, error) {+ m.ctrl.T.Helper()+ ret := m.ctrl.Call(m, "GetSiteAdvanced", ctx)+ ret0, _ := ret[0].(*schema.SiteAdvancedResp)+ ret1, _ := ret[1].(error)+ return ret0, ret1+}++// GetSiteAdvanced indicates an expected call of GetSiteAdvanced.+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteAdvanced(ctx interface{}) *gomock.Call {+ mr.mock.ctrl.T.Helper()+ return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteAdvanced", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteAdvanced), ctx)+}+// GetSiteBranding mocks base method.func (m *MockSiteInfoCommonService) GetSiteBranding(ctx context.Context) (*schema.SiteBrandingResp, error) {m.ctrl.T.Helper()@@ -149,7 +162,7 @@ func (m *MockSiteInfoCommonService) GetSiteBranding(ctx context.Context) (*schem}// GetSiteBranding indicates an expected call of GetSiteBranding.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteBranding(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteBranding(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteBranding", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteBranding), ctx)}@@ -164,7 +177,7 @@ func (m *MockSiteInfoCommonService) GetSiteCustomCssHTML(ctx context.Context) (*}// GetSiteCustomCssHTML indicates an expected call of GetSiteCustomCssHTML.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteCustomCssHTML(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteCustomCssHTML(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteCustomCssHTML", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteCustomCssHTML), ctx)}@@ -179,7 +192,7 @@ func (m *MockSiteInfoCommonService) GetSiteGeneral(ctx context.Context) (*schema}// GetSiteGeneral indicates an expected call of GetSiteGeneral.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteGeneral(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteGeneral(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteGeneral", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteGeneral), ctx)}@@ -193,7 +206,7 @@ func (m *MockSiteInfoCommonService) GetSiteInfoByType(ctx context.Context, siteT}// GetSiteInfoByType indicates an expected call of GetSiteInfoByType.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteInfoByType(ctx, siteType, resp any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteInfoByType(ctx, siteType, resp interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteInfoByType", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteInfoByType), ctx, siteType, resp)}@@ -208,7 +221,7 @@ func (m *MockSiteInfoCommonService) GetSiteInterface(ctx context.Context) (*sche}// GetSiteInterface indicates an expected call of GetSiteInterface.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteInterface(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteInterface(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteInterface", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteInterface), ctx)}@@ -223,7 +236,7 @@ func (m *MockSiteInfoCommonService) GetSiteLegal(ctx context.Context) (*schema.S}// GetSiteLegal indicates an expected call of GetSiteLegal.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteLegal(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteLegal(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteLegal", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteLegal), ctx)}@@ -238,11 +251,26 @@ func (m *MockSiteInfoCommonService) GetSiteLogin(ctx context.Context) (*schema.S}// GetSiteLogin indicates an expected call of GetSiteLogin.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteLogin(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteLogin(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteLogin", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteLogin), ctx)}+// GetSiteQuestion mocks base method.+func (m *MockSiteInfoCommonService) GetSiteQuestion(ctx context.Context) (*schema.SiteQuestionsResp, error) {+ m.ctrl.T.Helper()+ ret := m.ctrl.Call(m, "GetSiteQuestion", ctx)+ ret0, _ := ret[0].(*schema.SiteQuestionsResp)+ ret1, _ := ret[1].(error)+ return ret0, ret1+}++// GetSiteQuestion indicates an expected call of GetSiteQuestion.+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteQuestion(ctx interface{}) *gomock.Call {+ mr.mock.ctrl.T.Helper()+ return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteQuestion", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteQuestion), ctx)+}+// GetSiteSeo mocks base method.func (m *MockSiteInfoCommonService) GetSiteSeo(ctx context.Context) (*schema.SiteSeoResp, error) {m.ctrl.T.Helper()@@ -253,11 +281,26 @@ func (m *MockSiteInfoCommonService) GetSiteSeo(ctx context.Context) (*schema.Sit}// GetSiteSeo indicates an expected call of GetSiteSeo.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteSeo(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteSeo(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteSeo", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteSeo), ctx)}+// GetSiteTag mocks base method.+func (m *MockSiteInfoCommonService) GetSiteTag(ctx context.Context) (*schema.SiteTagsResp, error) {+ m.ctrl.T.Helper()+ ret := m.ctrl.Call(m, "GetSiteTag", ctx)+ ret0, _ := ret[0].(*schema.SiteTagsResp)+ ret1, _ := ret[1].(error)+ return ret0, ret1+}++// GetSiteTag indicates an expected call of GetSiteTag.+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteTag(ctx interface{}) *gomock.Call {+ mr.mock.ctrl.T.Helper()+ return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteTag", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteTag), ctx)+}+// GetSiteTheme mocks base method.func (m *MockSiteInfoCommonService) GetSiteTheme(ctx context.Context) (*schema.SiteThemeResp, error) {m.ctrl.T.Helper()@@ -268,7 +311,7 @@ func (m *MockSiteInfoCommonService) GetSiteTheme(ctx context.Context) (*schema.S}// GetSiteTheme indicates an expected call of GetSiteTheme.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteTheme(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteTheme(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteTheme", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteTheme), ctx)}@@ -283,7 +326,7 @@ func (m *MockSiteInfoCommonService) GetSiteUsers(ctx context.Context) (*schema.S}// GetSiteUsers indicates an expected call of GetSiteUsers.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteUsers(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteUsers(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteUsers", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteUsers), ctx)}@@ -298,7 +341,7 @@ func (m *MockSiteInfoCommonService) GetSiteWrite(ctx context.Context) (*schema.S}// GetSiteWrite indicates an expected call of GetSiteWrite.-func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteWrite(ctx any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) GetSiteWrite(ctx interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSiteWrite", reflect.TypeOf((*MockSiteInfoCommonService)(nil).GetSiteWrite), ctx)}@@ -312,7 +355,7 @@ func (m *MockSiteInfoCommonService) IsBrandingFileUsed(ctx context.Context, file}// IsBrandingFileUsed indicates an expected call of IsBrandingFileUsed.-func (mr *MockSiteInfoCommonServiceMockRecorder) IsBrandingFileUsed(ctx, filePath any) *gomock.Call {+func (mr *MockSiteInfoCommonServiceMockRecorder) IsBrandingFileUsed(ctx, filePath interface{}) *gomock.Call {mr.mock.ctrl.T.Helper()return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsBrandingFileUsed", reflect.TypeOf((*MockSiteInfoCommonService)(nil).IsBrandingFileUsed), ctx, filePath)}diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.goindex 557a5db1..3a730634 100644--- a/internal/service/question_common/question.go+++ b/internal/service/question_common/question.go@@ -900,7 +900,7 @@ func (qs *QuestionCommon) tryToGetQuestionIDFromMsg(ctx context.Context, closeMs}func (qs *QuestionCommon) GetMinimumContentLength(ctx context.Context) (int, error) {- siteInfo, err := qs.siteInfoService.GetSiteWrite(ctx)+ siteInfo, err := qs.siteInfoService.GetSiteQuestion(ctx)if err != nil {return 6, err}diff --git a/internal/service/siteinfo/siteinfo_service.go b/internal/service/siteinfo/siteinfo_service.goindex 1eb18706..48060663 100644--- a/internal/service/siteinfo/siteinfo_service.go+++ b/internal/service/siteinfo/siteinfo_service.go@@ -103,17 +103,14 @@ func (s *SiteInfoService) GetSiteUsers(ctx context.Context) (resp *schema.SiteUsreturn s.siteInfoCommonService.GetSiteUsers(ctx)}-// GetSiteWrite get site info write-func (s *SiteInfoService) GetSiteWrite(ctx context.Context) (resp *schema.SiteWriteResp, err error) {- resp = &schema.SiteWriteResp{}- siteInfo, exist, err := s.siteInfoRepo.GetByType(ctx, constant.SiteTypeWrite)+// GetSiteTag get site info write+func (s *SiteInfoService) GetSiteTag(ctx context.Context) (resp *schema.SiteTagsResp, err error) {+ resp = &schema.SiteTagsResp{}+ _, err = s.siteInfoCommonService.GetSiteTag(ctx)if err != nil {log.Error(err)return resp, nil}- if exist {- _ = json.Unmarshal([]byte(siteInfo.Content), resp)- }resp.RecommendTags, err = s.tagCommonService.GetSiteWriteRecommendTag(ctx)if err != nil {@@ -126,6 +123,16 @@ func (s *SiteInfoService) GetSiteWrite(ctx context.Context) (resp *schema.SiteWrreturn resp, nil}+// GetSiteQuestion get site questions settings+func (s *SiteInfoService) GetSiteQuestion(ctx context.Context) (resp *schema.SiteQuestionsResp, err error) {+ return s.siteInfoCommonService.GetSiteQuestion(ctx)+}++// GetSiteAdvanced get site advanced settings+func (s *SiteInfoService) GetSiteAdvanced(ctx context.Context) (resp *schema.SiteAdvancedResp, err error) {+ return s.siteInfoCommonService.GetSiteAdvanced(ctx)+}+// GetSiteLegal get site legal infofunc (s *SiteInfoService) GetSiteLegal(ctx context.Context) (resp *schema.SiteLegalResp, err error) {return s.siteInfoCommonService.GetSiteLegal(ctx)@@ -182,8 +189,30 @@ func (s *SiteInfoService) SaveSiteBranding(ctx context.Context, req *schema.Sitereturn s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeBranding, data)}-// SaveSiteWrite save site configuration about write-func (s *SiteInfoService) SaveSiteWrite(ctx context.Context, req *schema.SiteWriteReq) (resp any, err error) {+// SaveSiteAdvanced save site advanced configuration+func (s *SiteInfoService) SaveSiteAdvanced(ctx context.Context, req *schema.SiteAdvancedReq) (resp any, err error) {+ content, _ := json.Marshal(req)+ data := &entity.SiteInfo{+ Type: constant.SiteTypeAdvanced,+ Content: string(content),+ Status: 1,+ }+ return nil, s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeAdvanced, data)+}++// SaveSiteQuestions save site questions configuration+func (s *SiteInfoService) SaveSiteQuestions(ctx context.Context, req *schema.SiteQuestionsReq) (resp any, err error) {+ content, _ := json.Marshal(req)+ data := &entity.SiteInfo{+ Type: constant.SiteTypeQuestions,+ Content: string(content),+ Status: 1,+ }+ return nil, s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeQuestions, data)+}++// SaveSiteTags save site tags configuration+func (s *SiteInfoService) SaveSiteTags(ctx context.Context, req *schema.SiteTagsReq) (resp any, err error) {recommendTags, reservedTags := make([]string, 0), make([]string, 0)recommendTagMapping, reservedTagMapping := make(map[string]bool), make(map[string]bool)for _, tag := range req.ReservedTags {@@ -210,11 +239,11 @@ func (s *SiteInfoService) SaveSiteWrite(ctx context.Context, req *schema.SiteWricontent, _ := json.Marshal(req)data := &entity.SiteInfo{- Type: constant.SiteTypeWrite,+ Type: constant.SiteTypeTags,Content: string(content),Status: 1,}- return nil, s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeWrite, data)+ return nil, s.siteInfoRepo.SaveByType(ctx, constant.SiteTypeTags, data)}// SaveSiteLegal save site legal configurationdiff --git a/internal/service/siteinfo_common/siteinfo_service.go b/internal/service/siteinfo_common/siteinfo_service.goindex 8a4b1366..5c1c790a 100644--- a/internal/service/siteinfo_common/siteinfo_service.go+++ b/internal/service/siteinfo_common/siteinfo_service.go@@ -51,6 +51,9 @@ type SiteInfoCommonService interface {FormatAvatar(ctx context.Context, originalAvatarData, email string, userStatus int) *schema.AvatarInfoFormatListAvatar(ctx context.Context, userList []*entity.User) (userID2AvatarMapping map[string]*schema.AvatarInfo)GetSiteWrite(ctx context.Context) (resp *schema.SiteWriteResp, err error)+ GetSiteAdvanced(ctx context.Context) (resp *schema.SiteAdvancedResp, err error)+ GetSiteQuestion(ctx context.Context) (resp *schema.SiteQuestionsResp, err error)+ GetSiteTag(ctx context.Context) (resp *schema.SiteTagsResp, err error)GetSiteLegal(ctx context.Context) (resp *schema.SiteLegalResp, err error)GetSiteLogin(ctx context.Context) (resp *schema.SiteLoginResp, err error)GetSiteCustomCssHTML(ctx context.Context) (resp *schema.SiteCustomCssHTMLResp, err error)@@ -167,6 +170,33 @@ func (s *siteInfoCommonService) GetSiteWrite(ctx context.Context) (resp *schema.return resp, nil}+// GetSiteAdvanced get site info advanced+func (s *siteInfoCommonService) GetSiteAdvanced(ctx context.Context) (resp *schema.SiteAdvancedResp, err error) {+ resp = &schema.SiteAdvancedResp{}+ if err = s.GetSiteInfoByType(ctx, constant.SiteTypeAdvanced, resp); err != nil {+ return nil, err+ }+ return resp, nil+}++// GetSiteQuestion get site info question+func (s *siteInfoCommonService) GetSiteQuestion(ctx context.Context) (resp *schema.SiteQuestionsResp, err error) {+ resp = &schema.SiteQuestionsResp{}+ if err = s.GetSiteInfoByType(ctx, constant.SiteTypeQuestions, resp); err != nil {+ return nil, err+ }+ return resp, nil+}++// GetSiteTag get site info tag+func (s *siteInfoCommonService) GetSiteTag(ctx context.Context) (resp *schema.SiteTagsResp, err error) {+ resp = &schema.SiteTagsResp{}+ if err = s.GetSiteInfoByType(ctx, constant.SiteTypeTags, resp); err != nil {+ return nil, err+ }+ return resp, nil+}+// GetSiteLegal get site info writefunc (s *siteInfoCommonService) GetSiteLegal(ctx context.Context) (resp *schema.SiteLegalResp, err error) {resp = &schema.SiteLegalResp{}diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.goindex 9ca8e100..0da9f6fd 100644--- a/internal/service/tag_common/tag_common.go+++ b/internal/service/tag_common/tag_common.go@@ -270,7 +270,7 @@ func (ts *TagCommonService) GetTagListByNames(ctx context.Context, tagNames []st}func (ts *TagCommonService) ExistRecommend(ctx context.Context, tags []*schema.TagItem) (bool, error) {- taginfo, err := ts.siteInfoService.GetSiteWrite(ctx)+ taginfo, err := ts.siteInfoService.GetSiteTag(ctx)if err != nil {return false, err}@@ -295,7 +295,7 @@ func (ts *TagCommonService) ExistRecommend(ctx context.Context, tags []*schema.T}func (ts *TagCommonService) GetMinimumTags(ctx context.Context) (int, error) {- siteInfo, err := ts.siteInfoService.GetSiteWrite(ctx)+ siteInfo, err := ts.siteInfoService.GetSiteTag(ctx)if err != nil {return 1, err}@@ -469,7 +469,7 @@ func (ts *TagCommonService) TagsFormatRecommendAndReserved(ctx context.Context,if len(tagList) == 0 {return}- tagConfig, err := ts.siteInfoService.GetSiteWrite(ctx)+ tagConfig, err := ts.siteInfoService.GetSiteTag(ctx)if err != nil {log.Error(err)return@@ -485,7 +485,7 @@ func (ts *TagCommonService) tagFormatRecommendAndReserved(ctx context.Context, tif tag == nil {return}- tagConfig, err := ts.siteInfoService.GetSiteWrite(ctx)+ tagConfig, err := ts.siteInfoService.GetSiteTag(ctx)if err != nil {log.Error(err)returndiff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.goindex 8dea746c..58f80846 100644--- a/internal/service/uploader/upload.go+++ b/internal/service/uploader/upload.go@@ -109,12 +109,12 @@ func (us *uploaderService) UploadAvatarFile(ctx *gin.Context, userID string) (urreturn url, nil}- siteWrite, err := us.siteInfoService.GetSiteWrite(ctx)+ siteAdvanced, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}- ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteWrite.GetMaxImageSize())+ ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteAdvanced.GetMaxImageSize())file, fileHeader, err := ctx.Request.FormFile("file")if err != nil {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)@@ -201,12 +201,12 @@ func (us *uploaderService) UploadPostFile(ctx *gin.Context, userID string) (return url, nil}- siteWrite, err := us.siteInfoService.GetSiteWrite(ctx)+ siteAdvanced, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}- ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteWrite.GetMaxImageSize())+ ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteAdvanced.GetMaxImageSize())file, fileHeader, err := ctx.Request.FormFile("file")if err != nil {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)@@ -214,7 +214,7 @@ func (us *uploaderService) UploadPostFile(ctx *gin.Context, userID string) (defer func() {_ = file.Close()}()- if checker.IsUnAuthorizedExtension(fileHeader.Filename, siteWrite.AuthorizedImageExtensions) {+ if checker.IsUnAuthorizedExtension(fileHeader.Filename, siteAdvanced.AuthorizedImageExtensions) {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)}@@ -239,7 +239,7 @@ func (us *uploaderService) UploadPostAttachment(ctx *gin.Context, userID string)return url, nil}- resp, err := us.siteInfoService.GetSiteWrite(ctx)+ resp, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}@@ -277,12 +277,12 @@ func (us *uploaderService) UploadBrandingFile(ctx *gin.Context, userID string) (return url, nil}- siteWrite, err := us.siteInfoService.GetSiteWrite(ctx)+ siteAdvanced, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}- ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteWrite.GetMaxImageSize())+ ctx.Request.Body = http.MaxBytesReader(ctx.Writer, ctx.Request.Body, siteAdvanced.GetMaxImageSize())file, fileHeader, err := ctx.Request.FormFile("file")if err != nil {return "", errors.BadRequest(reason.RequestFormatError).WithError(err)@@ -311,7 +311,7 @@ func (us *uploaderService) uploadImageFile(ctx *gin.Context, file *multipart.Filif err != nil {return "", err}- siteWrite, err := us.siteInfoService.GetSiteWrite(ctx)+ siteAdvanced, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}@@ -328,7 +328,7 @@ func (us *uploaderService) uploadImageFile(ctx *gin.Context, file *multipart.Fil_ = src.Close()}()- if !checker.DecodeAndCheckImageFile(filePath, siteWrite.GetMaxImageMegapixel()) {+ if !checker.DecodeAndCheckImageFile(filePath, siteAdvanced.GetMaxImageMegapixel()) {return "", errors.BadRequest(reason.UploadFileUnsupportedFileFormat)}@@ -364,17 +364,17 @@ func (us *uploaderService) uploadAttachmentFile(ctx *gin.Context, file *multiparfunc (us *uploaderService) tryToUploadByPlugin(ctx *gin.Context, source plugin.UploadSource) (url string, err error) {- siteWrite, err := us.siteInfoService.GetSiteWrite(ctx)+ siteAdvanced, err := us.siteInfoService.GetSiteAdvanced(ctx)if err != nil {return "", err}cond := plugin.UploadFileCondition{Source: source,- MaxImageSize: siteWrite.MaxImageSize,- MaxAttachmentSize: siteWrite.MaxAttachmentSize,- MaxImageMegapixel: siteWrite.MaxImageMegapixel,- AuthorizedImageExtensions: siteWrite.AuthorizedImageExtensions,- AuthorizedAttachmentExtensions: siteWrite.AuthorizedAttachmentExtensions,+ MaxImageSize: siteAdvanced.MaxImageSize,+ MaxAttachmentSize: siteAdvanced.MaxAttachmentSize,+ MaxImageMegapixel: siteAdvanced.MaxImageMegapixel,+ AuthorizedImageExtensions: siteAdvanced.AuthorizedImageExtensions,+ AuthorizedAttachmentExtensions: siteAdvanced.AuthorizedAttachmentExtensions,}_ = plugin.CallStorage(func(fn plugin.Storage) error {resp := fn.UploadFile(ctx, cond)