huanghaosheng/VLoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:使isLiked可以正确获取，并修复了时间会负值的bug

Browse Source
This commit is contained in:
Leon
2025-12-16 18:49:26 +08:00
parent 68b4550c56
commit 882204ca93
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/feed/handler.go
View File

@@ -1,6 +1,7 @@
package feed package feed
import ( import (
"feedsystem_video_go/internal/middleware"
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -27,7 +28,11 @@ func (f *FeedHandler) ListLatest(c *gin.Context) {
if req.LatestTime > 0 { if req.LatestTime > 0 {
latestTime = time.Unix(req.LatestTime, 0) latestTime = time.Unix(req.LatestTime, 0)
} }
feedItems, err := f.service.ListLatest(c.Request.Context(), req.Limit, latestTime) viewerAccountID, err := middleware.GetAccountID(c)
if err != nil {
viewerAccountID = 0
}
feedItems, err := f.service.ListLatest(c.Request.Context(), req.Limit, latestTime, viewerAccountID)
if err != nil { if err != nil {
c.JSON(500, gin.H{"error": err.Error()}) c.JSON(500, gin.H{"error": err.Error()})
return return
@@ -44,7 +49,11 @@ func (f *FeedHandler) ListLikesCount(c *gin.Context) {
if req.Limit <= 0 || req.Limit > 50 { if req.Limit <= 0 || req.Limit > 50 {
req.Limit = 10 req.Limit = 10
} }
feedItems, err := f.service.ListLikesCount(c.Request.Context(), req.Limit, req.LikesCount) viewerAccountID, err := middleware.GetAccountID(c)
if err != nil {
viewerAccountID = 0
}
feedItems, err := f.service.ListLikesCount(c.Request.Context(), req.Limit, req.LikesCount, viewerAccountID)
if err != nil { if err != nil {
c.JSON(500, gin.H{"error": err.Error()}) c.JSON(500, gin.H{"error": err.Error()})
return return

34
internal/feed/service.go
View File

@@ -15,23 +15,28 @@ func NewFeedService(repo *FeedRepository, likeRepo *video.LikeRepository) *FeedS
return &FeedService{repo: repo, likeRepo: likeRepo} return &FeedService{repo: repo, likeRepo: likeRepo}
} }
func (f *FeedService) ListLatest(ctx context.Context, limit int, latestBefore time.Time) (ListLatestResponse, error) { func (f *FeedService) ListLatest(ctx context.Context, limit int, latestBefore time.Time, viewerAccountID uint) (ListLatestResponse, error) {
videos, err := f.repo.ListLatest(ctx, limit, latestBefore) videos, err := f.repo.ListLatest(ctx, limit, latestBefore)
if err != nil { if err != nil {
return ListLatestResponse{}, err return ListLatestResponse{}, err
} }
var nextTime time.Time var nextTime int64
if len(videos) > 0 { if len(videos) > 0 {
nextTime = videos[len(videos)-1].CreateTime nextTime = videos[len(videos)-1].CreateTime.Unix()
} else { } else {
nextTime = time.Time{} nextTime = 0
} }
hasMore := len(videos) == limit hasMore := len(videos) == limit
feedVideos := make([]FeedVideoItem, 0, len(videos)) feedVideos := make([]FeedVideoItem, 0, len(videos))
for _, video := range videos { for _, video := range videos {
isLiked, err := f.likeRepo.IsLiked(ctx, video.ID, video.AuthorID) var isLiked bool
if err != nil { if viewerAccountID == 0 {
return ListLatestResponse{}, err isLiked = false
} else {
isLiked, err = f.likeRepo.IsLiked(ctx, video.ID, viewerAccountID)
if err != nil {
return ListLatestResponse{}, err
}
} }
feedVideos = append(feedVideos, FeedVideoItem{ feedVideos = append(feedVideos, FeedVideoItem{
ID: video.ID, ID: video.ID,
@@ -47,13 +52,13 @@ func (f *FeedService) ListLatest(ctx context.Context, limit int, latestBefore ti
} }
resp := ListLatestResponse{ resp := ListLatestResponse{
VideoList: feedVideos, VideoList: feedVideos,
NextTime: nextTime.Unix(), NextTime: nextTime,
HasMore: hasMore, HasMore: hasMore,
} }
return resp, nil return resp, nil
} }
func (f *FeedService) ListLikesCount(ctx context.Context, limit int, likesCountBefore int64) (ListLikesCountResponse, error) { func (f *FeedService) ListLikesCount(ctx context.Context, limit int, likesCountBefore int64, viewerAccountID uint) (ListLikesCountResponse, error) {
videos, err := f.repo.ListLikesCount(ctx, limit, likesCountBefore) videos, err := f.repo.ListLikesCount(ctx, limit, likesCountBefore)
if err != nil { if err != nil {
return ListLikesCountResponse{}, err return ListLikesCountResponse{}, err
@@ -67,9 +72,14 @@ func (f *FeedService) ListLikesCount(ctx context.Context, limit int, likesCountB
hasMore := len(videos) == limit hasMore := len(videos) == limit
feedVideos := make([]FeedVideoItem, 0, len(videos)) feedVideos := make([]FeedVideoItem, 0, len(videos))
for _, video := range videos { for _, video := range videos {
isLiked, err := f.likeRepo.IsLiked(ctx, video.ID, video.AuthorID) var isLiked bool
if err != nil { if viewerAccountID == 0 {
return ListLikesCountResponse{}, err isLiked = false
} else {
isLiked, err = f.likeRepo.IsLiked(ctx, video.ID, viewerAccountID)
if err != nil {
return ListLikesCountResponse{}, err
}
} }
feedVideos = append(feedVideos, FeedVideoItem{ feedVideos = append(feedVideos, FeedVideoItem{
ID: video.ID, ID: video.ID,