nyne/nysoure
1
0
Fork 0
mirror of https://github.com/wgh136/nysoure.git synced 2025-09-27 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix comment activity api.

Browse Source
This commit is contained in:
nyne
2025-07-04 16:07:52 +08:00
parent 6365827748
commit 549c2d48d6
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/model/activity.go
View File

@@ -1,8 +1,9 @@
package model package model
import ( import (
"gorm.io/gorm"
"time" "time"
"gorm.io/gorm"
) )
type ActivityType uint type ActivityType uint
@@ -26,6 +27,6 @@ type ActivityView struct {
Time time.Time `json:"time"` Time time.Time `json:"time"`
Type ActivityType `json:"type"` Type ActivityType `json:"type"`
User UserView `json:"user"` User UserView `json:"user"`
Comment *CommentWithResourceView `json:"comment,omitempty"` Comment *CommentView `json:"comment,omitempty"`
Resource *ResourceView `json:"resource,omitempty"` Resource *ResourceView `json:"resource,omitempty"`
} }

14
server/service/activity.go
View File

@@ -20,19 +20,17 @@ func GetActivityList(page int) ([]model.ActivityView, int, error) {
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
var comment *model.CommentWithResourceView var comment *model.CommentView
var resource *model.ResourceView var resource *model.ResourceView
if activity.Type == model.ActivityTypeNewComment { switch activity.Type {
case model.ActivityTypeNewComment:
c, err := dao.GetCommentByID(activity.RefID) c, err := dao.GetCommentByID(activity.RefID)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
r, err := dao.GetResourceByID(c.RefID) comment = c.ToView()
if err != nil { comment.Content, comment.ContentTruncated = restrictCommentLength(c.Content)
return nil, 0, err case model.ActivityTypeNewResource, model.ActivityTypeUpdateResource:
}
comment = c.ToViewWithResource(&r)
} else if activity.Type == model.ActivityTypeNewResource || activity.Type == model.ActivityTypeUpdateResource {
r, err := dao.GetResourceByID(activity.RefID) r, err := dao.GetResourceByID(activity.RefID)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err