Merge branch 'feat/0.5.0/timeline_ai' of git.backyard.segmentfault.com:opensource/answer into feat/0.5.0/timeline_ai

internal/schema/activity.go

@@ -42,11 +42,12 @@ type ActObjectTimeline struct {
 
 // ActObjectInfo act object info
 type ActObjectInfo struct {
-	Title      string `json:"title"`
-	ObjectType string `json:"object_type"`
-	QuestionID string `json:"question_id"`
-	AnswerID   string `json:"answer_id"`
-	Username   string `json:"username"`
+	Title       string `json:"title"`
+	ObjectType  string `json:"object_type"`
+	QuestionID  string `json:"question_id"`
+	AnswerID    string `json:"answer_id"`
+	Username    string `json:"username"`
+	DisplayName string `json:"display_name"`
 }
 
 // GetObjectTimelineDetailReq get object timeline detail request

internal/schema/siteinfo_schema.go

@@ -8,8 +8,8 @@ import (
 // SiteGeneralReq site general request
 type SiteGeneralReq struct {
 	Name             string `validate:"required,gt=1,lte=128" form:"name" json:"name"`
-	ShortDescription string `validate:"required,gt=3,lte=255" form:"short_description" json:"short_description"`
-	Description      string `validate:"required,gt=3,lte=2000" form:"description" json:"description"`
+	ShortDescription string `validate:"omitempty,gt=3,lte=255" form:"short_description" json:"short_description"`
+	Description      string `validate:"omitempty,gt=3,lte=2000" form:"description" json:"description"`
 	SiteUrl          string `validate:"required,gt=1,lte=512,url" form:"site_url" json:"site_url"`
 	ContactEmail     string `validate:"required,gt=1,lte=512,email" form:"contact_email" json:"contact_email"`
 }

internal/service/activity/activity.go

@@ -80,6 +80,7 @@ func (as *ActivityService) GetObjectTimeline(ctx context.Context, req *schema.Ge
 		}
 		if exist {
 			resp.ObjectInfo.Username = userBasicInfo.Username
+			resp.ObjectInfo.DisplayName = userBasicInfo.DisplayName
 		}
 	}