Hypernet/Interactive
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix list post cannot get reaction list

Browse Source
This commit is contained in:
LittleSheep 2024-05-19 20:15:28 +08:00
parent d75131cab4
commit c656dc184a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/posts.go
View File

@ -42,7 +42,7 @@ func FilterPostReply(tx *gorm.DB, replyTo ...uint) *gorm.DB {
} }
func FilterPostWithPublishedAt(tx *gorm.DB, date time.Time) *gorm.DB { func FilterPostWithPublishedAt(tx *gorm.DB, date time.Time) *gorm.DB {
return tx.Where("published_at <= ? AND published_at IS NULL", date) return tx.Where("published_at <= ? OR published_at IS NULL", date)
} }
func GetPostWithAlias(alias string, ignoreLimitation ...bool) (models.Post, error) { func GetPostWithAlias(alias string, ignoreLimitation ...bool) (models.Post, error) {
@ -141,12 +141,12 @@ func ListPostReactions(id uint) (map[string]int64, error) {
}), nil }), nil
} }
func ListPost(tx *gorm.DB, take int, offset int, noReact ...bool) ([]models.Post, error) { func ListPost(tx *gorm.DB, take int, offset int, noReact ...bool) ([]*models.Post, error) {
if take > 20 { if take > 20 {
take = 20 take = 20
} }
var items []models.Post var items []*models.Post
if err := tx. if err := tx.
Limit(take).Offset(offset). Limit(take).Offset(offset).
Order("created_at DESC"). Order("created_at DESC").
@ -159,7 +159,7 @@ func ListPost(tx *gorm.DB, take int, offset int, noReact ...bool) ([]models.Post
return items, err return items, err
} }
idx := lo.Map(items, func(item models.Post, index int) uint { idx := lo.Map(items, func(item *models.Post, index int) uint {
return item.ID return item.ID
}) })
@ -171,14 +171,14 @@ func ListPost(tx *gorm.DB, take int, offset int, noReact ...bool) ([]models.Post
} }
if err := database.C.Model(&models.Reaction{}). if err := database.C.Model(&models.Reaction{}).
Select("post_id as post_id, symbol, COUNT(id) as count"). Select("post_id, symbol, COUNT(id) as count").
Where("post_id IN (?)", idx). Where("post_id IN (?)", idx).
Group("post_id, symbol"). Group("post_id, symbol").
Scan(&reactions).Error; err != nil { Scan(&reactions).Error; err != nil {
return items, err return items, err
} }
itemMap := lo.SliceToMap(items, func(item models.Post) (uint, models.Post) { itemMap := lo.SliceToMap(items, func(item *models.Post) (uint, *models.Post) {
return item.ID, item return item.ID, item
}) })